Changeset 67 for trunk

Timestamp:

02/01/12 11:19:27 (12 years ago)

Author:

mmamonski

Message:

fixed retry semantics in pbs_submit

File:

• trunk/pbs_drmaa/submit.c (modified) (2 diffs)

trunk/pbs_drmaa/submit.c

@@ -210 +210 @@
                 if( job_id == NULL )
                 {
+                        fsd_log_error(( "pbs_submit failed, pbs_errno = %d", pbs_errno ));
                         if (pbs_errno == PBSE_PROTOCOL || pbs_errno == PBSE_EXPIRED || pbs_errno == PBSOLDE_PROTOCOL || pbs_errno == PBSOLDE_EXPIRED)
                          {
                                 pbsdrmaa_session_t *pbsself = (pbsdrmaa_session_t*)self->session;
+
+                                fsd_log_error(( "Protocol error. Retrying..." ));
+
                                 if (pbsself->pbs_conn >= 0 )
                                         pbs_disconnect( pbsself->pbs_conn );
@@ -218 +222 @@
                                 sleep(sleep_time++);
                                 pbsself->pbs_conn = pbs_connect( pbsself->super.contact );
-                                if( pbsself->pbs_conn < 0)
+                                if( pbsself->pbs_conn < 0) 
+                                 {
                                         if (tries_left--)
                                                 goto retry_connect;
                                         else
                                                 pbsdrmaa_exc_raise_pbs( "pbs_connect" );
+                                 }
                                 else
-                                        goto retry;
+                                 {
+                                        if (tries_left--)
+                                                goto retry;
+                                        else
+                                                pbsdrmaa_exc_raise_pbs( "pbs_submit" );
+                                 }
                          }
                         else