Changeset 85 for trunk/pbs_drmaa/pbs_conn.c

Timestamp:

01/17/13 18:44:15 (11 years ago)

Author:

mmamonski

Message:

PBS DRMAA autoclose connection

File:

• trunk/pbs_drmaa/pbs_conn.c (modified) (32 diffs)

trunk/pbs_drmaa/pbs_conn.c

@@ -28 +28 @@
 #include <drmaa_utils/iter.h>
 #include <drmaa_utils/conf.h>
-#include <drmaa_utils/session.h>
 #include <drmaa_utils/datetime.h>
 
+#include <pbs_drmaa/session.h>
 #include <pbs_drmaa/pbs_conn.h>
 #include <pbs_drmaa/util.h>
@@ -53 +53 @@
 static void pbsdrmaa_pbs_holdjob( pbsdrmaa_pbs_conn_t *self,  char *job_id );
 
-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);
-
+static void pbsdrmaa_pbs_connection_autoclose_thread_loop( pbsdrmaa_pbs_conn_t *self, bool reconnect);
+
+
+static void check_reconnect( pbsdrmaa_pbs_conn_t *self, bool reconnect);
+
+static void start_autoclose_thread( pbsdrmaa_pbs_conn_t *self );
+
+static void stop_autoclose_thread( pbsdrmaa_pbs_conn_t *self );
+
+
+#if defined PBS_PROFESSIONAL && defined PBSE_HISTJOBID
+        #define IS_MISSING_JOB (pbs_errno == PBSE_UNKJOBID || pbs_errno == PBSE_HISTJOBID)
+#else
+        #define IS_MISSING_JOB (pbs_errno == PBSE_UNKJOBID)
+#endif
 #define IS_TRANSIENT_ERROR (pbs_errno == PBSE_PROTOCOL || pbs_errno == PBSE_EXPIRED || pbs_errno == PBSOLDE_PROTOCOL || pbs_errno == PBSOLDE_EXPIRED)
 
-        
 pbsdrmaa_pbs_conn_t * 
-pbsdrmaa_pbs_conn_new( pbsdrmaa_session_t *session, char *server )
+pbsdrmaa_pbs_conn_new( fsd_drmaa_session_t *session, const char *server )
 {
         pbsdrmaa_pbs_conn_t *volatile self = NULL;
@@ -84 +94 @@
 
                 self->connection_fd = -1;
-                self->last_usage = time(NULL);
 
                 /*ignore SIGPIPE - otherwise pbs_disconnect cause the program to exit */
                 signal(SIGPIPE, SIG_IGN);       
 
-                pbsdrmaa_pbs_reconnect_internal(self, false);
+                check_reconnect(self, false);
           }
         EXCEPT_DEFAULT
@@ -100 +109 @@
                         if (self->connection_fd != -1)
                                 pbs_disconnect(self->connection_fd);
+                        stop_autoclose_thread(self);
                   }
                         
@@ -110 +120 @@
         return self;
 }
-
 
 void
@@ -148 +157 @@
         TRY
          {
-                conn_lock = fsd_mutex_lock(&self->session->super.drm_connection_mutex);
-
-                pbsdrmaa_pbs_reconnect_internal(self, false);
+                conn_lock = fsd_mutex_lock(&self->session->drm_connection_mutex);
+
+                check_reconnect(self, false);
 
 retry:
@@ -162 +171 @@
                         if (IS_TRANSIENT_ERROR && first_try)
                          {
-                                pbsdrmaa_pbs_reconnect_internal(self, true);
+                                check_reconnect(self, true);
                                 first_try = false;
                                 goto retry;
@@ -168 +177 @@
                         else
                          {
-                                pbsdrmaa_exc_raise_pbs( "pbs_submit");
+                                pbsdrmaa_exc_raise_pbs( "pbs_submit", self->connection_fd);
                          }
                  }
@@ -180 +189 @@
          {
                 if(conn_lock)
-                        conn_lock = fsd_mutex_unlock(&self->session->super.drm_connection_mutex);
+                        conn_lock = fsd_mutex_unlock(&self->session->drm_connection_mutex);
          }
         END_TRY
@@ -202 +211 @@
         TRY
          {
-                conn_lock = fsd_mutex_lock(&self->session->super.drm_connection_mutex);
-
-                pbsdrmaa_pbs_reconnect_internal(self, false);
+                conn_lock = fsd_mutex_lock(&self->session->drm_connection_mutex);
+
+                check_reconnect(self, false);
 
 retry:
@@ -213 +222 @@
                 if(status == NULL)
                  {
-                        fsd_log_error(( "pbs_statjob failed, pbs_errno = %d", pbs_errno ));
-                        if (IS_TRANSIENT_ERROR && first_try)
-                         {
-                                pbsdrmaa_pbs_reconnect_internal(self, true);
+                        if (IS_MISSING_JOB)
+                         {
+                                fsd_log_info(( "missing job = %s (code=%d)", job_id, pbs_errno ));
+                         }
+                        else if (IS_TRANSIENT_ERROR && first_try)
+                         {
+                                fsd_log_error(( "pbs_statjob failed, pbs_errno = %d", pbs_errno ));
+                                check_reconnect(self, true);
                                 first_try = false;
                                 goto retry;
@@ -222 +235 @@
                         else
                          {
-                                pbsdrmaa_exc_raise_pbs( "pbs_statjob");
+                                pbsdrmaa_exc_raise_pbs( "pbs_statjob", self->connection_fd);
                          }
                  }
@@ -236 +249 @@
          {
                 if(conn_lock)
-                        conn_lock = fsd_mutex_unlock(&self->session->super.drm_connection_mutex);
+                        conn_lock = fsd_mutex_unlock(&self->session->drm_connection_mutex);
          }
         END_TRY
@@ -266 +279 @@
         TRY
          {
-                conn_lock = fsd_mutex_lock(&self->session->super.drm_connection_mutex);
-
-                pbsdrmaa_pbs_reconnect_internal(self, false);
+                conn_lock = fsd_mutex_lock(&self->session->drm_connection_mutex);
+
+                check_reconnect(self, false);
 
 retry:
@@ -280 +293 @@
                         if (IS_TRANSIENT_ERROR && first_try)
                          {
-                                pbsdrmaa_pbs_reconnect_internal(self, true);
+                                check_reconnect(self, true);
                                 first_try = false;
                                 goto retry;
@@ -286 +299 @@
                         else
                          {
-                                pbsdrmaa_exc_raise_pbs( "pbs_sigjob");
+                                pbsdrmaa_exc_raise_pbs( "pbs_sigjob", self->connection_fd);
                          }
                  }
@@ -297 +310 @@
          {
                 if(conn_lock)
-                        conn_lock = fsd_mutex_unlock(&self->session->super.drm_connection_mutex);
+                        conn_lock = fsd_mutex_unlock(&self->session->drm_connection_mutex);
          }
         END_TRY
@@ -318 +331 @@
         TRY
          {
-                conn_lock = fsd_mutex_lock(&self->session->super.drm_connection_mutex);
-
-                pbsdrmaa_pbs_reconnect_internal(self, false);
+                conn_lock = fsd_mutex_lock(&self->session->drm_connection_mutex);
+
+                check_reconnect(self, false);
 
 retry:
@@ -332 +345 @@
                         if (IS_TRANSIENT_ERROR && first_try)
                          {
-                                pbsdrmaa_pbs_reconnect_internal(self, true);
+                                check_reconnect(self, true);
                                 first_try = false;
                                 goto retry;
@@ -338 +351 @@
                         else
                          {
-                                pbsdrmaa_exc_raise_pbs( "pbs_deljob");
+                                pbsdrmaa_exc_raise_pbs( "pbs_deljob", self->connection_fd);
                          }
                  }
@@ -349 +362 @@
          {
                 if(conn_lock)
-                        conn_lock = fsd_mutex_unlock(&self->session->super.drm_connection_mutex);
+                        conn_lock = fsd_mutex_unlock(&self->session->drm_connection_mutex);
          }
         END_TRY
@@ -369 +382 @@
         TRY
          {
-                conn_lock = fsd_mutex_lock(&self->session->super.drm_connection_mutex);
-
-                pbsdrmaa_pbs_reconnect_internal(self, false);
+                conn_lock = fsd_mutex_lock(&self->session->drm_connection_mutex);
+
+                check_reconnect(self, false);
 
 retry:
@@ -383 +396 @@
                         if (IS_TRANSIENT_ERROR && first_try)
                          {
-                                pbsdrmaa_pbs_reconnect_internal(self, true);
+                                check_reconnect(self, true);
                                 first_try = false;
                                 goto retry;
@@ -389 +402 @@
                         else
                          {
-                                pbsdrmaa_exc_raise_pbs( "pbs_rlsjob");
+                                pbsdrmaa_exc_raise_pbs( "pbs_rlsjob", self->connection_fd);
                          }
                  }
@@ -400 +413 @@
          {
                 if(conn_lock)
-                        conn_lock = fsd_mutex_unlock(&self->session->super.drm_connection_mutex);
+                        conn_lock = fsd_mutex_unlock(&self->session->drm_connection_mutex);
          }
         END_TRY
@@ -420 +433 @@
         TRY
          {
-                conn_lock = fsd_mutex_lock(&self->session->super.drm_connection_mutex);
-
-                pbsdrmaa_pbs_reconnect_internal(self, false);
+                conn_lock = fsd_mutex_lock(&self->session->drm_connection_mutex);
+
+                check_reconnect(self, false);
 
 retry:
@@ -434 +447 @@
                         if (IS_TRANSIENT_ERROR && first_try)
                          {
-                                pbsdrmaa_pbs_reconnect_internal(self, true);
+                                check_reconnect(self, true);
                                 first_try = false;
                                 goto retry;
@@ -440 +453 @@
                         else
                          {
-                                pbsdrmaa_exc_raise_pbs( "pbs_holdjob");
+                                pbsdrmaa_exc_raise_pbs( "pbs_holdjob", self->connection_fd);
                          }
                  }
@@ -451 +464 @@
          {
                 if(conn_lock)
-                        conn_lock = fsd_mutex_unlock(&self->session->super.drm_connection_mutex);
+                        conn_lock = fsd_mutex_unlock(&self->session->drm_connection_mutex);
          }
         END_TRY
@@ -460 +473 @@
 
 void 
-pbsdrmaa_pbs_reconnect_internal( pbsdrmaa_pbs_conn_t *self, bool force_reconnect)
-{
-        int tries_left = self->session->max_retries_count;
+check_reconnect( pbsdrmaa_pbs_conn_t *self, bool force_reconnect)
+{
+        int tries_left = ((pbsdrmaa_session_t *)self->session)->max_retries_count;
         int sleep_time = 1;
 
@@ -476 +489 @@
                 else
                  {
+                        stop_autoclose_thread(self);
                         pbs_disconnect(self->connection_fd);
                         self->connection_fd = -1;
                  }
           }
+
+
 
 retry_connect: /* Life... */
@@ -492 +508 @@
         
         if( self->connection_fd < 0 )
-                pbsdrmaa_exc_raise_pbs( "pbs_connect" );
+                pbsdrmaa_exc_raise_pbs( "pbs_connect", self->connection_fd );
         
         fsd_log_return(("(%d)", self->connection_fd));
 }
 
+
+static void start_autoclose_thread( pbsdrmaa_pbs_conn_t *self )
+{
+
+
+}
+
+static void stop_autoclose_thread( pbsdrmaa_pbs_conn_t *self )
+{
+
+
+}
+