Changeset 71 for trunk

Timestamp:

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

Author:

mmamonski

Message:

PBS Pro PBSE_HISTJOBID handled properlly

Location:

trunk/pbs_drmaa

Files:

• job.c (modified) (4 diffs)
• pbs_attrib.gperf (modified) (2 diffs)
• pbs_attrib.h (modified) (2 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 {

trunk/pbs_drmaa/pbs_attrib.gperf

@@ -71 +71 @@
 Resource_List.ncpus, t(PBSDRMAA_ATTR_NCPUS)
 Resource_List.software, t(PBSDRMAA_ATTR_SOFTWARE)
+Resource_List.place, t(PBSDRMAA_ATTR_PLACE)
+Resource_List.select, t(PBSDRMAA_ATTR_SELECT)
 Mail_Points, t(PBSDRMAA_ATTR_MAIL_POINTS)
 Output_Path, t(PBSDRMAA_ATTR_OUTPUT_PATH)
@@ -185 +187 @@
         { "Resource_List.ncpus", PBSDRMAA_ATTR_NCPUS, false },
         { "Resource_List.software", PBSDRMAA_ATTR_SOFTWARE, false },
+        { "Resource_List.place", PBSDRMAA_ATTR_PLACE, false },
+        { "Resource_List.select", PBSDRMAA_ATTR_SELECT, false },
         { "Mail_Points", PBSDRMAA_ATTR_MAIL_POINTS, false },
         { "Output_Path", PBSDRMAA_ATTR_OUTPUT_PATH, false },

trunk/pbs_drmaa/pbs_attrib.h

@@ -51 +51 @@
 #define PBSDRMAA_NODES                  "Resource_List.nodes"
 #define PBSDRMAA_SOFTWARE               "Resource_List.software"
+#define PBSDRMAA_PLACE                  "Resource_List.place"
+#define PBSDRMAA_SELECT                 "Resource_List.select"
 #define PBSDRMAA_PROCS                  "Resource_List.procs"
 #define PBSDRMAA_NCPUS                  "Resource_List.ncpus"
@@ -111 +113 @@
         PBSDRMAA_ATTR_NCPUS,
         PBSDRMAA_ATTR_SOFTWARE,
+        PBSDRMAA_ATTR_PLACE,
+        PBSDRMAA_ATTR_SELECT,
         PBSDRMAA_ATTR_MAIL_POINTS,
         PBSDRMAA_ATTR_OUTPUT_PATH,