Changeset 10 for trunk/gridctl.php

Timestamp:

Jun 4, 2015, 9:48:05 PM (9 years ago)

Author:

gegorbet

Message:

fixes to allow simultaneous production/development jobs

File:

• trunk/gridctl.php (modified) (9 diffs)

trunk/gridctl.php

@@ -1 +1 @@
 <?php
-
-$us3bin = exec( "ls -d ~us3/bin" );
-include_once "$us3bin/listen-config.php";
-include "$us3bin/cleanup_aira.php";
-include "$us3bin/cleanup_gfac.php";
 
 // Global variables
@@ -74 +69 @@
    {
       $status_in  = $status;
-//write_log( "$loghdr status_in=$status_in" );
       $status     = aira_status( $gfacID, $status_in );
 if($status != $status_in )
@@ -155 +149 @@
       case "FINISHED":
       case "DONE":
-         if ( is_aira_job( $gfacID ) )
-         {
-            complete();
-         }
+//         if ( is_aira_job( $gfacID ) )
+//         {
+//            complete();
+//         }
       case "PROCESSING":
       default:
@@ -437 +431 @@
    global $us3_db;
    global $loghdr;
+   global $class_dir;
 
    // Double check that the gfacID exists
@@ -460 +455 @@
    if ( $requestID == 0 ) return;
 
-   if ( preg_match( "/US3-AIRA/i", $gfacID ) )
-   {
+   if ( preg_match( "/US3-A/i", $gfacID ) )
+   {
+      $me_devel  = preg_match( "/class_devel/", $class_dir );
+      $job_devel = preg_match( "/US3-ADEV/i", $gfacID );
+      if ( ( !$me_devel  &&  !$job_devel )  ||
+           (  $me_devel  &&   $job_devel ) )
+      {  // If job from appropriate Airavata server, process it
 //write_log( "$loghdr CALLING aira_cleanup()" );
-      aira_cleanup( $us3_db, $requestID, $gLink );
+         aira_cleanup( $us3_db, $requestID, $gLink );
+      }
 //write_log( "$loghdr RTN FR aira_cleanup()" );
    }
@@ -625 +626 @@
    global $cluster;
 
-   if ( preg_match( "/US3-AIRA/i", $gfacID )  &&
+   if ( preg_match( "/US3-A/i", $gfacID )  &&
         ! preg_match( "/juropa/i", $cluster ) )
    {
@@ -997 +998 @@
    global $self;
    global $loghdr;
+   global $class_dir;
 //echo "a_st: st_in$status_in : $gfacID\n";
    //$status_gw = standard_status( $status_in );
@@ -1002 +1004 @@
 //echo "a_st:  st_db=$status_gw\n";
    $status    = $status_gw;
-
-   if ( preg_match( "/US3-AIRA/i", $gfacID ) )
-   {
+   $me_devel  = preg_match( "/class_devel/", $class_dir );
+   $job_devel = preg_match( "/US3-ADEV/i", $gfacID );
+   $devmatch  = ( ( !$me_devel  &&  !$job_devel )  ||
+                  (  $me_devel  &&   $job_devel ) );
+
+//write_log( "$loghdr  gfacID=$gfacID  devmatch=$devmatch" );
+//write_log( "$loghdr   me_d=$me_devel  jo_d=$job_devel  cd=$class_dir" );
+   if ( preg_match( "/US3-A/i", $gfacID )  &&  $devmatch )
+   {  // Airavata job and development/production type is right
       $status_ex = getExperimentStatus( $gfacID );
+//write_log( "$loghdr status_ex $status_ex" );
 
       if ( $status_ex == 'COMPLETED' )
@@ -1047 +1056 @@
       }
 
-write_log( "$loghdr status/_in/_gw/_ex=$status/$status_in/$status_gw/$status_ex" );
+//write_log( "$loghdr status/_in/_gw/_ex=$status/$status_in/$status_gw/$status_ex" );
+//write_log( "  me_d=$me_devel jo_d=$job_devel dm=$devmatch cd=$class_dir" );
       if ( $status != $status_gw )
       {