Changeset 30 for trunk

Timestamp:

10/17/11 02:10:44 (14 years ago)

Author:

mmamonski

Message:

log reader cont...

File:

• trunk/pbs_drmaa/log_reader.c (modified) (9 diffs)

trunk/pbs_drmaa/log_reader.c

@@ -217 +217 @@
                                                 fsd_log_debug(("WT - Date changed. Closing log file"));
                                                 self->date_changed = true;
+                                                fsd_free(line);
+                                                break;
                                          }
 
@@ -232 +234 @@
                                                                 event_type = pbsdrmaa_event_0010;
                                                         else
+                                                         {
+                                                                fsd_free(line);
                                                                 break; /*we are interested only in the above log messages */
+                                                         }
                                                  }
                                                 else if ( field_id == PBSDRMAA_FLD_ID_SRC)
@@ -241 +246 @@
                                                  {
                                                         if (strncmp(field_token, "Job", 3) != 0)
+                                                         {
+                                                                fsd_free(line);
                                                                 break; /* we are interested only in job events */
+                                                         }
                                                  }
                                                 else if (field_id == PBSDRMAA_FLD_ID_OBJ_ID)
@@ -258 +266 @@
                                                                  {
                                                                         fsd_log_debug(("WT - Unknown job: %s", event_jobid)); /* Not a DRMAA job */
+                                                                        fsd_free(line);
                                                                         break;
                                                                  }
@@ -278 +287 @@
                                                                 char *p_queue = NULL;
 
+                                                                fsd_log_info(("WT - Detected queued of job %s", job->job_id));
+
                                                                 if ((p_queue = strstr(msg,"queue =")) == NULL)
                                                                         fsd_exc_raise_fmt(FSD_ERRNO_INTERNAL_ERROR,"No queue attribute found in log line = %s", line);
 
-                                                        /* != Job deleted and Job to be deleted*/
-#ifdef PBS_PROFESSIONAL
-                                                        if      (field[4] != 't' && field[10] != 'd')
-                                                         {
-#else
-                                                        if (field[4] != 'd')
-                                                         {
-#endif
-                                                                struct_state.value = fsd_asprintf("%c",field[n]);
+                                                                attribs = pbsdrmaa_add_attr(attribs, PBSDRMAA_JOB_STATE, "Q");
+                                                                attribs = pbsdrmaa_add_attr(attribs, PBSDRMAA_QUEUE, p_queue + 7);
+                                                         }
+                                                        else if (event_type == pbsdrmaa_event_0008 && strncmp(msg, "Job Run", 7) == 0)
+                                                        {
+                                                                /*
+                                                                 * Running
+                                                                 * Torque: 10/11/2011 14:48:23;0008;PBS_Server;Job;15545337.batch.grid.cyf-kr.edu.pl;Job Run at request of root@batch.grid.cyf-kr.edu.pl
+                                                                 * PBS Pro: 10/11/2011 14:43:31;0008;Server@nova;Job;2127218.nova;Job Run at request of Scheduler@nova.wcss.wroc.pl on exec_vnode (wn698:ncpus=3:mem=2048000kb)+(wn700:ncpus=3:mem=2048000kb)
+                                                                 */
+                                                                char timestamp_unix[64];
+
+                                                                fsd_log_info(("WT - Detected start of job %s", job->job_id));
+
                                                                 (void)pbsdrmaa_parse_log_timestamp(event_timestamp, timestamp_unix, sizeof(timestamp_unix));
 
@@ -322 +338 @@
                                                                 char timestamp_unix[64];
 
+                                                                fsd_log_info(("WT - Detected deletion of job %s", job->job_id));
+
                                                                 (void)pbsdrmaa_parse_log_timestamp(event_timestamp, timestamp_unix, sizeof(timestamp_unix));
 
@@ -333 +351 @@
                                                                 else
                                                                  {
+                                                                        job->release( job );
+                                                                        fsd_free(line);
                                                                         break; /* job was started, ignore, wait for Exit_status message */
                                                                  }
@@ -392 +412 @@
                                                         else
                                                         {
+                                                                job->release( job );
+                                                                fsd_free(line);
                                                                 break; /* ignore other job events*/
                                                         }
@@ -435 +457 @@
 
                                  } /* end of while getline loop */
+
 
                                  { /* poll on log file */