Changeset 83 for trunk/pbs_drmaa

Timestamp:

01/07/13 17:03:23 (12 years ago)

Author:

mmamonski

Message:

PBS Sumbit API i single class

Location:

trunk/pbs_drmaa

Files:

• job.c (modified) (3 diffs)
• pbs_conn.c (modified) (5 diffs)

trunk/pbs_drmaa/job.c

@@ -319 +319 @@
         struct attrl *i = NULL;
         char pbs_state = 0;
-        int exit_status = -2;
+        int exit_status = -101;
         const char *cpu_usage = NULL;
         const char *mem_usage = NULL;
@@ -394 +394 @@
                 fsd_log_debug(( "pbs_state: %c", pbs_state ));
 
-        if( exit_status != -2 )
+        if( exit_status != -101 )
          {
                 fsd_log_debug(( "exit_status: %d", exit_status ));
                 self->exit_status = exit_status;
+
+                if (self->exit_status < 0)
+                 {
+                        self->exit_status = -1;
+                        fsd_log_error(("ExitStatus = %d, probably system problem, report job %s to the local administrator", exit_status, self->job_id));
+                 }
+
          }
         if(pbs_state){
@@ -405 +412 @@
                                 self->flags &= FSD_JOB_TERMINATED_MASK;
                                 self->flags |= FSD_JOB_TERMINATED;
-                                if (exit_status != -2) { /* has exit code */
+                                if (exit_status != -101) { /* has exit code */
                                         if( self->exit_status == 0) 
                                                 self->state = DRMAA_PS_DONE;

trunk/pbs_drmaa/pbs_conn.c

@@ -54 +54 @@
 
 static void pbsdrmaa_pbs_reconnect_internal( pbsdrmaa_pbs_conn_t *self, bool reconnect);
+
+static void pbsdrmaa_pbs_check_connect_internal( pbsdrmaa_pbs_conn_t *self, bool reconnect);
+
+#define IS_TRANSIENT_ERROR (pbs_errno == PBSE_PROTOCOL || pbs_errno == PBSE_EXPIRED || pbs_errno == PBSOLDE_PROTOCOL || pbs_errno == PBSOLDE_EXPIRED)
+
         
 pbsdrmaa_pbs_conn_t * 
@@ -80 +85 @@
                 self->connection_fd = -1;
                 self->last_usage = time(NULL);
-                
-                /*ignore SIGPIPE - otheriwse pbs_disconnect cause the program to exit */
+
+                /*ignore SIGPIPE - otherwise pbs_disconnect cause the program to exit */
                 signal(SIGPIPE, SIG_IGN);       
 
@@ -111 +116 @@
 {
         fsd_log_enter((""));
+
         TRY
         {
@@ -134 +140 @@
 pbsdrmaa_pbs_submit( pbsdrmaa_pbs_conn_t *self, struct attropl *attrib, char *script, char *destination )
 {
-
-
+        char *volatile job_id = NULL;
+        volatile bool first_try = true;
+        volatile bool conn_lock = false;
+
+        fsd_log_enter((""));
+
+        TRY
+         {
+                conn_lock = fsd_mutex_lock(&self->session->super.drm_connection_mutex);
+
+                pbsdrmaa_pbs_reconnect_internal(self, false);
+
+retry:
+                job_id = pbs_submit(self->connection_fd, attrib, script, destination, NULL);
+
+                fsd_log_info(("pbs_submit(%s, %s) = %s", script, destination, job_id));
+
+                if(job_id == NULL)
+                 {
+                        fsd_log_error(( "pbs_submit failed, pbs_errno = %d", pbs_errno ));
+                        if (IS_TRANSIENT_ERROR && first_try)
+                         {
+                                pbsdrmaa_pbs_reconnect_internal(self, true);
+                                first_try = false;
+                                goto retry;
+                         }
+                        else
+                         {
+                                pbsdrmaa_exc_raise_pbs( "pbs_submit");
+                         }
+                 }
+         }
+        EXCEPT_DEFAULT
+         {
+                fsd_free(job_id);
+                fsd_exc_reraise();
+         }
+        FINALLY
+         {
+                if(conn_lock)
+                        conn_lock = fsd_mutex_unlock(&self->session->super.drm_connection_mutex);
+         }
+        END_TRY
+
+
+        fsd_log_return(("%s", job_id));
+
+        return job_id;
 }
 
@@ -182 +234 @@
         int tries_left = self->session->max_retries_count;
         int sleep_time = 1;
-
 
         fsd_log_enter(("(%d)", self->connection_fd));