Changeset 12 for trunk/pbs_drmaa/session.c

Timestamp:

04/20/11 17:20:29 (13 years ago)

Author:

mmamonski

Message:

version 1.0.7 release candidate

File:

• trunk/pbs_drmaa/session.c (modified) (8 diffs, 1 prop)

trunk/pbs_drmaa/session.c

@@ -1 @@
-/* $Id: session.c 385 2011-01-04 18:24:05Z mamonski $ */
+/* $Id$ */
 /*
  *  FedStage DRMAA for PBS Pro
@@ -53 +53 @@
                 __attribute__ ((unused))
 #       endif
-        = "$Id: session.c 385 2011-01-04 18:24:05Z mamonski $";
+        = "$Id$";
 #endif
 
@@ -213 +213 @@
         fsd_conf_option_t *pbs_home;
         pbs_home = fsd_conf_dict_get(self->configuration, "pbs_home" );
-        if( pbs_home )
-         {
-                if( pbs_home->type == FSD_CONF_STRING )
-                 {
+
+        if( pbs_home && pbs_home->type == FSD_CONF_STRING )
+          {
                         struct stat statbuf;
                         char * volatile log_path;
@@ -222 +221 @@
                         
                         pbsself->pbs_home = pbs_home->val.string;
-                        fsd_log_debug(("pbs_home: %s",pbsself->pbs_home));
+                        fsd_log_info(("pbs_home: %s",pbsself->pbs_home));
                         pbsself->super_wait_thread = pbsself->super.wait_thread;
                         pbsself->super.wait_thread = pbsdrmaa_session_wait_thread;              
@@ -230 +229 @@
                         localtime_r(&pbsself->log_file_initial_time,&tm);
 
-                        if((log_path = fsd_asprintf("%s/server_logs/%04d%02d%02d",
-                                pbsself->pbs_home,       
-                                tm.tm_year + 1900,
-                                tm.tm_mon + 1,
-                                        tm.tm_mday)) == NULL) {
-                                fsd_exc_raise_fmt(FSD_ERRNO_INTERNAL_ERROR,"WT - Memory allocation wasn't possible");
-                        }
-
-                        if(stat(log_path,&statbuf) == -1) {
+                        log_path = fsd_asprintf("%s/server_logs/%04d%02d%02d",
+                                        pbsself->pbs_home,
+                                        tm.tm_year + 1900,
+                                        tm.tm_mon + 1,
+                                        tm.tm_mday);
+
+                        if(stat(log_path,&statbuf) == -1)
+                          {
                                 char errbuf[256] = "InternalError";
-                                (void)strerror_r(errno, errbuf, 256);
+                                (void)strerror_r(errno, errbuf, sizeof(errbuf));
                                 fsd_exc_raise_fmt(FSD_ERRNO_INTERNAL_ERROR,"stat error: %s",errbuf);
-                        }
+                          }
         
                         fsd_log_debug(("Log file %s size %d",log_path,(int) statbuf.st_size));
                         pbsself->log_file_initial_size = statbuf.st_size;
                         fsd_free(log_path);
-                 }
-                else
-                {
-                        pbsself->super.enable_wait_thread = false;
-                        pbsself->wait_thread_log = false;
-                        fsd_log_debug(("pbs_home not configured. Running standard wait_thread (pooling)."));
-                }
-         }
-
-
+          }
 
         pbsself->super_apply_configuration(self); /* call method from the superclass */
@@ -277 +266 @@
                 conn_lock = fsd_mutex_lock( &self->drm_connection_mutex );
 retry:
-
+/* TODO: query only for user's jobs pbs_selstat + ATTR_u */
 #ifdef PBS_PROFESSIONAL
                 status = pbs_statjob( pbsself->pbs_conn, NULL, NULL, NULL );
@@ -494 +483 @@
                         fsd_log_warning(( "no default queue set on PBS server" ));
                 else if( keep_completed == NULL && self->pbs_home == NULL )
-                        fsd_log_warning(( "PBS server is not configured to keep completed jobs\n"
+                        fsd_log_warning(( "Torque server is not configured to keep completed jobs\n"
                                                 "in Torque: set keep_completed parameter of default queue\n"
                                                 "  $ qmgr -c 'set queue batch keep_completed = 60'\n"
@@ -513 +502 @@
          }
         END_TRY
+
+        return result;
 #endif
+        fsd_log_warning(( "PBS Professional does not keep information about the completed jobs\n"
+                                " You must configure DRMAA to utilize log files in order to always get valid job exit status"
+                                ));
         return false;
 }