Changeset 104

Timestamp:

05/18/16 15:51:27 (9 years ago)

Author:

pkopta

Message:

• few changes for PBS Pro

Location:

trunk/pbs_drmaa

Files:

• log_reader.c (modified) (2 diffs)
• pbs_attrib.h (modified) (2 diffs)

trunk/pbs_drmaa/log_reader.c

@@ -357 +357 @@
                                                                  {
                                                                         fsd_log_info(("WT - Job %s killed before entering running state (%d).", job->job_id, job->state));
+
+#ifdef PBS_PROFESSIONAL
+                                                                        attribs = pbsdrmaa_add_attr(attribs, PBSDRMAA_JOB_STATE, "F");
+#else
                                                                         attribs = pbsdrmaa_add_attr(attribs, PBSDRMAA_JOB_STATE, "C");
+#endif
+
                                                                         attribs = pbsdrmaa_add_attr(attribs, PBSDRMAA_MTIME, timestamp_unix);
                                                                         attribs = pbsdrmaa_add_attr(attribs, PBSDRMAA_EXIT_STATUS, "-101");
@@ -378 +384 @@
                                                                 char *token = NULL;
 
+#ifdef PBS_PBS_PROFESSIONAL
+                                                                attribs = pbsdrmaa_add_attr(attribs, PBSDRMAA_JOB_STATE, "F");
+#else
                                                                 attribs = pbsdrmaa_add_attr(attribs, PBSDRMAA_JOB_STATE, "C");
+#endif
                                                                 attribs = pbsdrmaa_add_attr(attribs, PBSDRMAA_MTIME, timestamp_unix);
 

trunk/pbs_drmaa/pbs_attrib.h

@@ -81 +81 @@
 #define PBSDRMAA_SERVER                 "server"
 #define PBSDRMAA_COMMENT                "comment"
-#define PBSDRMAA_EXIT_STATUS            "exit_status"
 #define PBSDRMAA_START_TIME             "start_time"
 #define PBSDRMAA_EXTENSION              "extension"
@@ -88 +87 @@
 #define PBSDRMAA_NODE_PROPERTIES        "pbsdrmaa.node_properties"
 #define PBSDRMAA_CUSTOM_RESOURCES       "pbsdrmaa.custom_resources"
+
+#ifdef PBS_PROFESSIONAL
+#       define PBSDRMAA_EXIT_STATUS             "Exit_status"
+#else
+#       define PBSDRMAA_EXIT_STATUS             "exit_status"
+#endif
 
 typedef enum {