Changeset 45 for trunk/pbs_drmaa/job.c

Timestamp:

11/28/11 15:02:58 (12 years ago)

Author:

mmamonski

Message:

version 1.0.11 - ready to try

File:

• trunk/pbs_drmaa/job.c (modified) (4 diffs)

trunk/pbs_drmaa/job.c

@@ -90 +90 @@
         TRY
          {
-                int try_count;
-                const int max_tries = 3;
+                int tries_left = session->max_retries_count;
+                int sleep_time = 1;
 
                 conn_lock = fsd_mutex_lock( &self->session->drm_connection_mutex );
 
                 /*TODO reconnect */
-                for( try_count=0;  try_count < max_tries;  try_count++ )
+                while ( true )
                  {
                         switch( action )
@@ -151 +151 @@
                          }
 
-                        if( rc == PBSE_NONE )
-                                break;
-                        else if( rc == PBSE_INTERNAL )
+retry_connect:
+                        if ( rc == PBSE_NONE )
+                                break;
+                        else if (( rc == PBSE_INTERNAL || rc == PBSE_PROTOCOL || rc == PBSE_EXPIRED) && (tries_left--))
                          {
-                                /*
-                                 * In PBS Pro pbs_sigjob raises internal server error (PBSE_INTERNAL)
-                                 * when job just changed its state to running.
-                                 */
-                                fsd_log_debug(( "repeating request (%d of %d)",
-                                                        try_count+2, max_tries ));
-                                sleep( 1 );
+                                if (rc == PBSE_PROTOCOL || rc == PBSE_EXPIRED)
+                                 {
+                                        if ( session->pbs_conn >= 0)
+                                                pbs_disconnect( session->pbs_conn );
+
+                                        sleep( sleep_time++ );
+
+                                        session->pbs_conn = pbs_connect( session->super.contact );
+
+                                        if (session->pbs_conn < 0)
+                                                goto retry_connect;
+
+                                        fsd_log_info(( "pbs_connect(%s) =%d", session->super.contact, session->pbs_conn ));
+                                 }
+                                else /* PBSE_INTERNAL */
+                                 {
+                                        /*
+                                         * In PBS Pro pbs_sigjob raises internal server error (PBSE_INTERNAL)
+                                         * when job just changed its state to running.
+                                         */
+                                        sleep( sleep_time++ );
+                                 }
+                                fsd_log_debug(( "repeating request (%d of %d)", tries_left, session->max_retries_count));
                          }
                         else
                                 pbsdrmaa_exc_raise_pbs( apicall );
-                 } /* end for */
+                 } /* end while */
          }
         FINALLY
@@ -184 +201 @@
         struct batch_status *volatile status = NULL;
         pbsdrmaa_session_t *session = (pbsdrmaa_session_t*)self->session;
+        int tries_left = session->max_retries_count;
+        int sleep_time = 1;
 
         fsd_log_enter(( "({job_id=%s})", self->job_id ));
@@ -229 +248 @@
                                         if ( session->pbs_conn >= 0 )
                                                 pbs_disconnect( session->pbs_conn );
-                                        sleep(1);
+retry_connect:
+                                        sleep(sleep_time++);
                                         session->pbs_conn = pbs_connect( session->super.contact );
                                         if( session->pbs_conn < 0 )
-                                                pbsdrmaa_exc_raise_pbs( "pbs_connect" );
+                                         {
+                                                if (tries_left--)
+                                                        goto retry_connect;
+                                                else
+                                                        pbsdrmaa_exc_raise_pbs( "pbs_connect" );
+                                         }
                                         else
                                          {
-                                                fsd_log_error(("retry:"));
                                                 goto retry;
                                          }