Changeset 27

Timestamp:

Feb 7, 2017, 5:53:08 PM (8 years ago)

Author:

gegorbet

Message:

fixes for ssh-airavata to jureca

Location:

trunk

Files:

• cleanup.php (modified) (4 diffs)
• gridctl.php (modified) (1 diff)

trunk/cleanup.php

@@ -194 +194 @@
    $fn_stdout  = "Ultrascan.stdout";
    $fn_tarfile = "analysis-results.tar";
+   $secwait    = 10;
    $num_try    = 0;
 write_log( "$me: fn_tarfile=$fn_tarfile" );
    while ( ! file_exists( $fn_tarfile ) && $num_try < 3 )
    {
-      sleep( 10 );
+      sleep( $secwait );
       $num_try++;
+      $secwait   *= 2;
 write_log( "$me:  tar-exists: num_try=$num_try" );
    }
@@ -206 +208 @@
    foreach ( $ofiles as $ofile )
    {
-      if ( preg_match( "/^" . $gfacID . ".*stderr$/", $ofile ) )
+      if ( preg_match( "/^.*stderr$/", $ofile ) )
          $fn_stderr  = $ofile;
-      if ( preg_match( "/^" . $gfacID . ".*stdout$/", $ofile ) )
+      if ( preg_match( "/^.*stdout$/", $ofile ) )
          $fn_stdout  = $ofile;
 //write_log( "$me:    ofile=$ofile" );
@@ -925 +927 @@
    if ( file_exists( "stderr"  ) )
    {  // Filter stderr to not have libnnls debug lines
-      exec( "mv stderr stderr+nnls", $output, $stat );
-      exec( "grep -vi nnls stderr+nnls >stderr", $output, $stat );
+//      exec( "mv stderr stderr+nnls", $output, $stat );
+//      exec( "grep -vi nnls stderr+nnls >stderr", $output, $stat );
       $stderr  = file_get_contents( "stderr" );
    }
@@ -940 +942 @@
 
    $lense = strlen( $stderr );
-   if ( $lense > 1000000 )
+   if ( $lense > 10000000 )
    { // Replace exceptionally large stderr with smaller version
       exec( "mv stderr stderr-orig", $output, $stat );

trunk/gridctl.php

@@ -852 +852 @@
 
       case "C" :                      // Job has completed
+      case ""  :
         $status = 'COMPLETED';
         break;