Changeset 120 for trunk/oarutils

Timestamp:

Dec 19, 2015, 2:31:48 PM (8 years ago)

Author:

g7moreau

Message:

• First implementation of fonctional return status code

File:

• trunk/oarutils/oar-parexec (modified) (4 diffs)

trunk/oarutils/oar-parexec

@@ -265 +265 @@
       $job_stderr = "2> $stderr-$job_name.stderr" if $stderr ne '' and $switchio;
 
-      my $job_nodefile = "/tmp/oar-parexec-$ENV{LOGNAME}-$ENV{OAR_JOB_ID}-$job_name";
-      my $job_pidfile  = "/tmp/oar-parexec-$ENV{LOGNAME}-$ENV{OAR_JOB_ID}-$job_name.pid";
+      my $job_nodefile   = "/tmp/oar-parexec-$ENV{LOGNAME}-$ENV{OAR_JOB_ID}-$job_name";
+      my $job_pidfile    = "/tmp/oar-parexec-$ENV{LOGNAME}-$ENV{OAR_JOB_ID}-$job_name.pid";
+      my $job_statusfile = "/tmp/oar-parexec-$ENV{LOGNAME}-$ENV{OAR_JOB_ID}-$job_name.status";
 
       $scheduled{$job_pid} = {
@@ -295 +296 @@
          }
 
+      $fh->print("echo 0 > $job_statusfile\n");
       $fh->print("(\n");
       $fh->print("$job_cmd\n");
-      $fh->print(") $job_stdout $job_stderr \&\n");
+      $fh->print(") $job_stdout $job_stderr || echo \$? > $job_statusfile \&\n");
       $fh->print("while [ \$(jobs -p | wc -l) -gt 0 ]\n");
       $fh->print("do\n");
@@ -303 +305 @@
       $fh->print("done\n");
 
+      $fh->print("OAR_SUBJOB_RETCODE=\$(cat $job_statusfile)\n");
+      $fh->print("rm -f $job_statusfile\n");
       $fh->print("rm -f $job_pidfile\n")  if $sig_transmit;
       $fh->print("rm -f $job_nodefile\n") if $job_np > 1;
-      $fh->print("exit\n");
+      $fh->print("exit \$OAR_SUBJOB_RETCODE\n");
       cede;
       }
@@ -316 +320 @@
          # non blocking PID test
          if (waitpid($job_pid, WNOHANG)) {
+            # get return status code
+            my $job_retcode0 = $? >> 8;
+            #print "ERREUR0 $job_pid $job_retcode0\n" if $job_retcode0;
+
             my $msg = sprintf "end   job %${job_name_maxlen}s / %5i at %s oar job %i on node %s\n",
                $scheduled{$job_pid}->{name},
                $job_pid, time, $ENV{OAR_JOB_ID}, $scheduled{$job_pid}->{ressource};
+
+            # Job error
+            $msg =~ s/^end\s+job/error:$job_retcode0 job/
+               if $job_retcode0 > 0 and $job_retcode0 != 99;
 
             # Job non finish, just suspend if received checkpoint signal