Changeset 27 for trunk


Ignore:
Timestamp:
Feb 7, 2017, 5:53:08 PM (8 years ago)
Author:
gegorbet
Message:

fixes for ssh-airavata to jureca

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/cleanup.php

    r26 r27  
    194194   $fn_stdout  = "Ultrascan.stdout";
    195195   $fn_tarfile = "analysis-results.tar";
     196   $secwait    = 10;
    196197   $num_try    = 0;
    197198write_log( "$me: fn_tarfile=$fn_tarfile" );
    198199   while ( ! file_exists( $fn_tarfile ) && $num_try < 3 )
    199200   {
    200       sleep( 10 );
     201      sleep( $secwait );
    201202      $num_try++;
     203      $secwait   *= 2;
    202204write_log( "$me:  tar-exists: num_try=$num_try" );
    203205   }
     
    206208   foreach ( $ofiles as $ofile )
    207209   {
    208       if ( preg_match( "/^" . $gfacID . ".*stderr$/", $ofile ) )
     210      if ( preg_match( "/^.*stderr$/", $ofile ) )
    209211         $fn_stderr  = $ofile;
    210       if ( preg_match( "/^" . $gfacID . ".*stdout$/", $ofile ) )
     212      if ( preg_match( "/^.*stdout$/", $ofile ) )
    211213         $fn_stdout  = $ofile;
    212214//write_log( "$me:    ofile=$ofile" );
     
    925927   if ( file_exists( "stderr"  ) )
    926928   {  // Filter stderr to not have libnnls debug lines
    927       exec( "mv stderr stderr+nnls", $output, $stat );
    928       exec( "grep -vi nnls stderr+nnls >stderr", $output, $stat );
     929//      exec( "mv stderr stderr+nnls", $output, $stat );
     930//      exec( "grep -vi nnls stderr+nnls >stderr", $output, $stat );
    929931      $stderr  = file_get_contents( "stderr" );
    930932   }
     
    940942
    941943   $lense = strlen( $stderr );
    942    if ( $lense > 1000000 )
     944   if ( $lense > 10000000 )
    943945   { // Replace exceptionally large stderr with smaller version
    944946      exec( "mv stderr stderr-orig", $output, $stat );
  • trunk/gridctl.php

    r26 r27  
    852852
    853853      case "C" :                      // Job has completed
     854      case ""  :
    854855        $status = 'COMPLETED';
    855856        break;
Note: See TracChangeset for help on using the changeset viewer.