Changeset 31 for trunk/cleanup.php

Timestamp:

Oct 13, 2017, 9:37:16 PM (7 years ago)

Author:

gegorbet

Message:

global-fit and jetstream,stampede2 mods

File:

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

trunk/cleanup.php

@@ -225 +225 @@
    if ( file_exists( $fn_stdout  ) ) $stdout   = file_get_contents( $fn_stdout  );
    if ( file_exists( $fn_tarfile ) ) $tarfile  = file_get_contents( $fn_tarfile );
+write_log( "$me(0):  length contents stderr,stdout,tarfile -- "
+ . strlen($stderr) . "," . strlen($stdout) . "," . strlen($tarfile) );
    // If stdout,stderr have no content, retry after delay
    if ( strlen( $stdout ) == 0  ||  strlen( $stderr ) == 0 )
@@ -870 +872 @@
    global $status;
    $is_us3iab  = preg_match( "/us3iab/", $cluster );
+   $is_jetstr  = preg_match( "/jetstream/", $cluster );
 
    // Figure out remote directory
@@ -881 +884 @@
    {
       // For "-local", recompute remote work directory
-      $cmd = "ssh us3@$cluster.uthscsa.edu 'ls -d ~us3/lims/work/local' 2/dev/null";
+      $clushost = "$cluster.uthscsa.edu";
+      $lworkdir = "~us3/lims/work/local";
+      if ( $is_jetstr )
+      {
+         $clushost = "js-157-184.jetstream-cloud.org";
+         $lworkdir = "/N/us3_cluster/work/local";
+      }
+      $cmd         = "ssh us3@$clushost 'ls -d $lworkdir' 2/dev/null";
       exec( $cmd, $output, $stat );
       $work_remote = $output[ 0 ];
@@ -891 +901 @@
       $pwd = chdir( "$work/$gfacID" );
 
-      $cmd = "scp us3@$cluster.uthscsa.edu:$remoteDir/output/analysis-results.tar . 2>&1";
+      $cmd = "scp us3@$clushost:$remoteDir/output/analysis-results.tar . 2>&1";
 
       exec( $cmd, $output, $stat );
@@ -897 +907 @@
          write_log( "$me: Bad exec:\n$cmd\n" . implode( "\n", $output ) );
 
-      $cmd = "scp us3@$cluster.uthscsa.edu:$remoteDir/stdout . 2>&1";
+      $cmd = "scp us3@$clushost:$remoteDir/stdout . 2>&1";
 
       exec( $cmd, $output, $stat );
@@ -910 +920 @@
       }
 
-      $cmd = "scp us3@$cluster.uthscsa.edu:$remoteDir/stderr . 2>&1";
+      $cmd = "scp us3@$clushost:$remoteDir/stderr . 2>&1";
 
       exec( $cmd, $output, $stat );