Changeset 71 for trunk/pbs_drmaa/job.c

Timestamp:

09/05/12 22:48:10 (12 years ago)

Author:

mmamonski

Message:

PBS Pro PBSE_HISTJOBID handled properlly

File:

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

trunk/pbs_drmaa/job.c

@@ -208 +208 @@
                 conn_lock = fsd_mutex_lock( &self->session->drm_connection_mutex );
 retry:
+                if (session->pbs_conn < 0) {
+                        fsd_log_info(("No connection with pbs. Reconnecting"));
+                        goto retry_connect;
+                }
+
 
 #ifdef PBS_PROFESSIONAL
@@ -226 +231 @@
 #else
 #  ifndef PBS_PROFESSIONAL_NO_LOG
-                        if ( pbs_errno != PBSE_UNKJOBID )
+                        if ( pbs_errno != PBSE_UNKJOBID && pbs_errno != PBSE_HISTJOBID )
                                 fsd_log_error(("pbs_statjob error: %d, %s", pbs_errno, pbse_to_txt(pbs_errno)));
                         else
                                 fsd_log_debug(("pbs_statjob error: %d, %s", pbs_errno, pbse_to_txt(pbs_errno)));
 #  else
-                        if ( pbs_errno != PBSE_UNKJOBID )
+                        if ( pbs_errno != PBSE_UNKJOBID && pbs_errno != PBSE_HISTJOBID )
                                 fsd_log_error(("pbs_statjob error: %d", pbs_errno));
                         else
@@ -241 +246 @@
                          {
                                 case PBSE_UNKJOBID:
+#ifdef PBS_PROFESSIONAL
+                                case PBSE_HISTJOBID:
+#endif
                                         break;
                                 case PBSE_PROTOCOL:
@@ -259 +267 @@
                                          {
                                                 if (tries_left--) {
-                                                        fsd_log_info(("%d tries left. Retrying...", tries_left));
+                                                        fsd_log_info(("Retrying... (%d tries left)", tries_left));
                                                         goto retry_connect;
                                                 } else {