Changeset 25 for trunk/cleanup_gfac.php

Timestamp:

Jan 13, 2017, 1:30:29 PM (8 years ago)

Author:

gegorbet

Message:

merge us3iab/airavata gridctl code

File:

• trunk/cleanup_gfac.php (modified) (6 diffs)

trunk/cleanup_gfac.php

@@ -159 +159 @@
 //write_log( "$me:     db=$db; requestID=$requestID; status=$status; cluster=$cluster" );
 
-   if ( $cluster == 'bcf-local'  ||  $cluster == 'alamo-local' )
-   {
-      $clushost = $cluster;
-      $clushost = preg_replace( "/\-local/", "", $clushost );
+//   if ( $cluster == 'bcf-local'  ||  $cluster == 'alamo-local' )
+   if ( preg_match( "/\-local/", $cluster )  ||
+        preg_match( "/us3iab/",  $cluster ) )
+   {
+//      $clushost = $cluster;
+//      $clushost = preg_replace( "/\-local/", "", $clushost );
+      $parts    = explode( "-", $cluster );
+      $clushost = $parts[ 0 ];
       get_local_files( $gfac_link, $clushost, $requestID, $id, $gfacID );
-   }
+write_log( "$me:     clushost=$clushost  reqID=$requestID get_local_files() gfacID=$gfacID" );
+   }
+else
+write_log( "$me:     NO get_local_files()" );
 
    $query = "SELECT id, stderr, stdout, tarfile FROM analysis " .
@@ -328 +335 @@
    file_put_contents( $message_filename, $message_log, FILE_APPEND );
   // mysql_close( $gfac_link );
-//write_log( "$me: *messages.txt written" );
+write_log( "$me: *messages.txt written" );
 
    /////////
@@ -346 +353 @@
       return( -1 );
    }
-//write_log( "$me: HPCAnalysisResult stderr,stdout updated" );
 
    // Save the tarfile and expand it
@@ -368 +374 @@
    chdir( "$work/$gfacID" );
 
-   $f = fopen( "analysis.tar", "w" );
+   $f = fopen( "analysis-results.tar", "w" );
    fwrite( $f, $tarfile );
    fclose( $f );
-write_log( "$me: analysis.tar file written to work dir" );
+//write_log( "$me: analysis-results.tar file written to work dir" );
 
    $tar_out = array();
-   exec( "tar -xf analysis.tar 2>&1", $tar_out, $err );
+   exec( "tar -xf analysis-results.tar 2>&1", $tar_out, $err );
 
    if ( $err != 0 )
@@ -461 +467 @@
                   "noiseGUID='$noiseGUID'," .
                   "modelGUID='$modelGUID'," .
-                  "editedDataID=1, "        .
+                  "editedDataID=2, "        .
                   "modelID=1, "             .
                   "noiseType='$type',"      .
@@ -670 +676 @@
    mail_to_user( "success", "" );
 }
-
 ?>