Changeset 28 for trunk


Ignore:
Timestamp:
May 16, 2017, 8:55:58 PM (8 years ago)
Author:
gegorbet
Message:

fixes for alamo-local and airavata EXECUTING status

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/cleanup.php

    r27 r28  
    197197   $num_try    = 0;
    198198write_log( "$me: fn_tarfile=$fn_tarfile" );
    199    while ( ! file_exists( $fn_tarfile ) && $num_try < 3 )
     199   while ( ! file_exists( $fn_tarfile )  && $num_try < 3 )
    200200   {
    201201      sleep( $secwait );
     
    873873   // Figure out remote directory
    874874   $remoteDir = sprintf( "$work_remote/$db-%06d", $requestID );
    875 write_log( "$me: is_us3iab=$is_us3iab  remoteDir=$remoteDir" );
     875//write_log( "$me: is_us3iab=$is_us3iab  remoteDir=$remoteDir" );
    876876
    877877   // Get stdout, stderr, output/analysis-results.tar
     
    880880   if ( $is_us3iab == 0 )
    881881   {
     882      // For "-local", recompute remote work directory
     883      $cmd = "ssh us3@$cluster.uthscsa.edu 'ls -d ~us3/lims/work/local' 2/dev/null";
     884      exec( $cmd, $output, $stat );
     885      $work_remote = $output[ 0 ];
     886      $remoteDir   = sprintf( "$work_remote/$db-%06d", $requestID );
     887write_log( "$me:  -LOCAL: remoteDir=$remoteDir" );
     888
    882889      // Figure out local working directory
    883890      if ( ! is_dir( "$work/$gfacID" ) ) mkdir( "$work/$gfacID", 0770 );
     
    942949
    943950   $lense = strlen( $stderr );
    944    if ( $lense > 10000000 )
     951   if ( $lense > 1000000 )
    945952   { // Replace exceptionally large stderr with smaller version
    946953      exec( "mv stderr stderr-orig", $output, $stat );
  • trunk/cluster_status.php

    r26 r28  
    176176   {
    177177      if ( preg_match( "/attlocal/", $org_domain ) )
    178          $clusters = array( "us3iab-devel" );
     178         $clusters = array( "us3iab-devel", "alamo-local" );
    179179      else
    180180         $clusters = array( "us3iab-node0" );
     
    209209            break;
    210210         }
     211         case 'alamo-local':
    211212         case 'alamo':
    212213         {
  • trunk/gridctl.php

    r27 r28  
    6161         continue;
    6262      }
     63   }
     64
     65   else if ( $me_devel )
     66   {  // Local (us3iab/-local) and class_devel:  skip processing
     67      continue;
    6368   }
    6469
     
    533538      $query   = "UPDATE analysis SET status='RUNNING' WHERE gfacID='$gfacID'";
    534539      $message = "Job status request reports job is RUNNING";
     540      break;
     541
     542    case 'EXECUTING'      :
     543      $message = "Job status request reports job is EXECUTING";
    535544      break;
    536545
     
    825834
    826835   $cmd    = "/usr/bin/qstat -a $gfacID 2>&1|tail -n 1";
     836//write_log( "$self cmd: $cmd" );
     837//write_log( "$self cluster: $cluster" );
     838//write_log( "$self gfacID: $gfacID" );
    827839   if ( ! preg_match( "/us3iab/", $cluster ) )
    828840   {
    829841      $system = "$cluster.uthscsa.edu";
    830842      $system = preg_replace( "/\-local/", "", $system );
     843//write_log( "$self system: $system" );
    831844      $cmd    = "/usr/bin/ssh -x us3@$system " . $cmd;
     845//write_log( "$self  cmd: $cmd" );
    832846   }
    833847
    834848   $result = exec( $cmd );
     849//write_log( "$self  result: $result" );
    835850
    836851   if ( $result == ""  ||  preg_match( "/^qstat: Unknown/", $result ) )
    837852   {
    838853      write_log( "$self get_local_status: Local job $gfacID unknown" );
    839 write_log( "$self get_local_status: result=$result" );
     854//write_log( "$self get_local_status: result=$result" );
    840855      return 'UNKNOWN';
    841856   }
     
    852867
    853868      case "C" :                      // Job has completed
    854       case ""  :
    855869        $status = 'COMPLETED';
    856870        break;
     
    985999      case 'SCHEDULED' :
    9861000      case 'submitted' :
     1001      case 'SUBMITTED' :
    9871002      case '' :
    9881003         $status      = 'SUBMITTED';
     
    11011116      }
    11021117
     1118      else if ( $status_ex == 'EXECUTING' )
     1119      {
     1120         $status    = standard_status( $status_gw );
     1121write_log( "$loghdr status/_in/_gw/_ex=$status/$status_in/$status_gw/$status_ex" );
     1122      }
     1123
    11031124      else
    11041125      {  // Experiment not COMPLETED/FINISHED/DONE: use experiment status
  • trunk/listen-config.php.template

    r26 r28  
    1313$class_dir_p = '/srv/www/htdocs/common/class/';        // Class dir for production
    1414$class_dir_d = '/srv/www/htdocs/common/class_devel/';  // Class dir for development
    15 $class_dir_l = '/srv/www/htdocs/common/class_local/';  // Class dir for development
     15$class_dir_l = '/srv/www/htdocs/common/class_local/';  // Class dir for local
    1616$class_dir   = $class_dir_p;                           // Class dir default
    1717
Note: See TracChangeset for help on using the changeset viewer.