Copyright update 2021

[tools/libbatch.git] / src / Slurm / BatchManager_Slurm.cxx

diff --git a/src/Slurm/BatchManager_Slurm.cxx b/src/Slurm/BatchManager_Slurm.cxx
index a415da4b6d94539f0a9edb752aafe01df32d3d29..1d6fe6f05b6d73e71689b4a771f8a94bf1a6a425 100644 (file)
--- a/src/Slurm/BatchManager_Slurm.cxx
+++ b/src/Slurm/BatchManager_Slurm.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2019  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -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;
@@ -236,8 +236,8 @@ namespace Batch {
 
     // If "squeue" failed, the job may be finished. In this case, try to query the job with
     // "sacct".
-    if (not found) {
-        string subCommand = "sacct -X -o State%-10 -n -j " + jobid.getReference();
+    if (! found) {
+        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;