Changeset 907 for branches/prototype-v0/zoo-project/zoo-services/utils/hpc/service.c

Timestamp:

May 4, 2019, 3:36:37 PM (5 years ago)

Author:

djay

Message:

Fix typo. Define StdErr? from FinalizeHPC1 service. make sure to call removeShmLock in case it has been created by the GetStatus? service.

File:

• branches/prototype-v0/zoo-project/zoo-services/utils/hpc/service.c (modified) (3 diffs)

branches/prototype-v0/zoo-project/zoo-services/utils/hpc/service.c

@@ -269 +269 @@
     }
     free(logPath);
-    // Run scontrol to check if the service execution ended.
+    // Run sacct to check if the service execution ended.
     // Store all the informations returned by scontrol command as a cfg file to
     // be parsed back by the ZOO-Kernel waiting for the execution of the remote
@@ -277 +277 @@
     map* tmpMap=getMapFromMaps(conf,configId->value,"remote_command_opt");
     char* command=(char*)malloc((126+strlen(tmpMap->value))*sizeof(char));
-    sprintf(command,"sacct --format=%s -p | grep \"%s\" | sed \"s:||:|None|:g;s:||:|:g\"",tmpMap->value,jobid->value);    
+    sprintf(command,"sacct --format=%s -p | grep \"%s\" | sed \"s:||:|None|:g;s:||:|None|:g\"",tmpMap->value,jobid->value);    
     if(ssh_exec(conf,command,ssh_get_cnt(conf))==0){
       free(command);
-      setMapInMaps(conf,"lenv","message",_("Failed to run scontrol remotely"));
+      setMapInMaps(conf,"lenv","message",_("Failed to run sacct remotely"));
       // TODO: check status in db and if available continue in other case return SERVICE_FAILED
       return SERVICE_FAILED;
@@ -315 +315 @@
         }
       }else{
+        free(logPath);
         setMapInMaps(conf,"lenv","message",_("Unable to access the downloaded execution log file"));
         return SERVICE_FAILED;
       }
+    }
+    tmpMap=getMapFromMaps(tmpMaps,"henv","JobId");
+    if(tmpMap!=NULL){
+      char* tmpStr=(char*)malloc((32)*sizeof(char));
+      sprintf(tmpStr,"slurm-%s.out",tmpMap->value);
+      addToMap(tmpMaps->content,"StdErr",tmpStr); 
+      free(tmpStr);
     }
     logPath=(char*)malloc((strlen(tmpPath->value)+strlen(jobid->value)+15)*sizeof(char));