Changeset 26 for trunk

Timestamp:

Jan 19, 2017, 12:01:07 PM (8 years ago)

Author:

gegorbet

Message:

various minor fixes/mods to gridctl

Location:

trunk

Files:

• cleanup.php (modified) (2 diffs)
• cluster_status.php (modified) (3 diffs)
• gridctl.php (modified) (3 diffs)
• listen-config.php.template (modified) (1 diff)
• manage-us3-pipe.php (modified) (4 diffs)
• update_notice.php (modified) (1 diff)

trunk/cleanup.php

@@ -195 +195 @@
    $fn_tarfile = "analysis-results.tar";
    $num_try    = 0;
-$len1 = strlen( $fn_tarfile );
-write_log( "$me: fn_tarfile=$fn_tarfile  len(tar)=$len1" );
+write_log( "$me: fn_tarfile=$fn_tarfile" );
    while ( ! file_exists( $fn_tarfile ) && $num_try < 3 )
    {
@@ -218 +217 @@
 else                          write_log( "$me: NOT FOUND: $fn_tarfile" );
 
+   $stderr   = '';
+   $stdout   = '';
+   $tarfile  = '';
    if ( file_exists( $fn_stderr  ) ) $stderr   = file_get_contents( $fn_stderr  );
    if ( file_exists( $fn_stdout  ) ) $stdout   = file_get_contents( $fn_stdout  );
    if ( file_exists( $fn_tarfile ) ) $tarfile  = file_get_contents( $fn_tarfile );
+   // If stdout,stderr have no content, retry after delay
+   if ( strlen( $stdout ) == 0  ||  strlen( $stderr ) == 0 )
+   {
+      sleep( 20 );
+      if ( file_exists( $fn_stderr  ) )
+         $stderr   = file_get_contents( $fn_stderr  );
+      if ( file_exists( $fn_stdout  ) )
+         $stdout   = file_get_contents( $fn_stdout  );
+   }
+
+write_log( "$me:  length contents stderr,stdout,tarfile -- "
+ . strlen($stderr) . "," . strlen($stdout) . "," . strlen($tarfile) );
 
    if ( $cluster == 'alamo'  || $cluster == 'alamo-local' )

trunk/cluster_status.php

@@ -4 +4 @@
 include "$us3bin/listen-config.php";
 
-if ( ! preg_match( "/localhost/", $dbhost ) )
+if ( ! preg_match( "/_local/", $class_dir ) )
 {
    $xml  = get_data();
@@ -18 +18 @@
 foreach ( $data as $item )
 {
-   update( $item[ 'cluster' ], $item[ 'queued' ], $item[ 'status' ], $item[ 'running' ] );
+   if ( ! preg_match( "/error/", $item[ 'running' ] ) )
+      update( $item[ 'cluster' ], $item[ 'queued' ], $item[ 'status' ], $item[ 'running' ] );
 }
 
@@ -170 +171 @@
    global $dbhost;
    global $org_domain;
-
-   if ( preg_match( "/localhost/", $dbhost ) )
+   global $class_dir;
+
+   if ( preg_match( "/_local/", $class_dir ) )
    {
       if ( preg_match( "/attlocal/", $org_domain ) )

trunk/gridctl.php

@@ -181 +181 @@
       case "FINISHED":
       case "DONE":
-         if ( is_aira_job( $gfacID ) )
+         if ( ! is_aira_job( $gfacID ) )
          {
             complete();
@@ -464 +464 @@
    global $us3_db;
    global $loghdr;
+   global $class_dir;
 
    // Double check that the gfacID exists
@@ -1049 +1050 @@
    global $self;
    global $loghdr;
+   global $class_dir;
 //echo "a_st: st_in$status_in : $gfacID\n";
    //$status_gw = standard_status( $status_in );

trunk/listen-config.php.template

@@ -13 +13 @@
 $class_dir_p = '/srv/www/htdocs/common/class/';        // Class dir for production
 $class_dir_d = '/srv/www/htdocs/common/class_devel/';  // Class dir for development
+$class_dir_l = '/srv/www/htdocs/common/class_local/';  // Class dir for development
 $class_dir   = $class_dir_p;                           // Class dir default
 

trunk/manage-us3-pipe.php

@@ -66 +66 @@
    if ( ! mysql_select_db( $db, $resource ) )
    {
-     write_log( "$self: Could not select DB $db" . mysql_error( $resource ) );
+     write_log( "$self: Could not select DB $db " . mysql_error( $resource ) );
      write_log( "$self process(): original msg - $msg" );
      return;
@@ -174 +174 @@
    if ( ! mysql_select_db( $db, $resource ) )
    {
-     write_log( "$self: Could not select DB $db" . mysql_error( $resource ) );
+     write_log( "$self: Could not select DB $db " . mysql_error( $resource ) );
      return;
    }
@@ -245 +245 @@
   if ( ! mysql_select_db( $gDB, $gLink ) )
   {
-    write_log( "$self: Could not select DB $gDB" . mysql_error( $gLink ) );
+    write_log( "$self: Could not select DB $gDB " . mysql_error( $gLink ) );
     return;
   }
@@ -356 +356 @@
    if ( ! mysql_select_db( $gDB, $gLink ) )
    {
-      write_log( "$self: Could not select DB $gDB" . mysql_error( $gLink ) );
+      write_log( "$self: Could not select DB $gDB " . mysql_error( $gLink ) );
       return;
    }

trunk/update_notice.php

@@ -10 +10 @@
 
 $s_cmd1 = "/usr/bin/svn info svn:$s_url1|grep Revision|cut -d ' ' -f2";
-$s_cmd2 = "/usr/bin/svn info svn:$s_url1|grep Revision|cut -d ' ' -f2";
+$s_cmd2 = "/usr/bin/svn info svn:$s_url2|grep Revision|cut -d ' ' -f2";
 
 $s_rev1 = exec( $s_cmd1 );