From b9a4492fac1d0d9e2aebb76cff9188a6cc0bc496 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 6 Oct 2020 20:09:04 +0300 Subject: [PATCH] bos #20157 Patch for SLURM --- src/Slurm/BatchManager_Slurm.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Slurm/BatchManager_Slurm.cxx b/src/Slurm/BatchManager_Slurm.cxx index 1c7f8d7..a1e28ed 100644 --- a/src/Slurm/BatchManager_Slurm.cxx +++ b/src/Slurm/BatchManager_Slurm.cxx @@ -64,7 +64,7 @@ namespace Batch { string cmdFile = buildCommandFile(job); // define command to submit batch - string subCommand = string("cd ") + workDir + "; sbatch " + cmdFile; + string subCommand = string("bash -l -c \\\"cd ") + workDir + "; sbatch " + cmdFile + "\\\""; string command = _protocol.getExecCommand(subCommand, _hostname, _username); command += " 2>&1"; LOG(command); @@ -203,7 +203,7 @@ namespace Batch { void BatchManager_Slurm::deleteJob(const JobId & jobid) { // define command to delete job - string subCommand = "scancel " + jobid.getReference(); + string subCommand = string("bash -l -c \\\"scancel ") + jobid.getReference() + "\\\""; string command = _protocol.getExecCommand(subCommand, _hostname, _username); LOG(command); @@ -217,7 +217,7 @@ namespace Batch { JobInfo BatchManager_Slurm::queryJob(const JobId & jobid) { // First try to query the job with "squeue" command - string subCommand = "squeue -h -o %T -j " + jobid.getReference() + " 2>/dev/null"; + string subCommand = string("bash -l -c \\\"squeue -h -o %T -j ") + jobid.getReference() + " 2>/dev/null" + "\\\""; string command = _protocol.getExecCommand(subCommand, _hostname, _username); LOG(command); string output; @@ -237,7 +237,7 @@ namespace Batch { // If "squeue" failed, the job may be finished. In this case, try to query the job with // "sacct". if (! found) { - string subCommand = "sacct -X -o State%-10 -n -j " + jobid.getReference(); + string subCommand = string("bash -l -c \\\"sacct -X -o State%-10 -n -j ") + jobid.getReference() + "\\\""; string command = _protocol.getExecCommand(subCommand, _hostname, _username); LOG(command); string output; -- 2.30.2