Changeset 53 for trunk

Timestamp:

01/07/12 22:35:59 (13 years ago)

Author:

mmamonski

Message:

on site fixies

Location:

trunk/pbs_drmaa

Files:

• session.c (modified) (4 diffs)
• submit.c (modified) (4 diffs)

trunk/pbs_drmaa/session.c

@@ -22 +22 @@
 #endif
 
+#include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
@@ -115 +116 @@
                 self->max_retries_count = 3;
                 self->wait_thread_sleep_time = 1;
+                self->job_exit_status_file_prefix = NULL;
 
                 self->super.load_configuration( &self->super, "pbs_drmaa" );
@@ -136 +138 @@
                  }
 
-                 self->job_exit_status_file_prefix = NULL;
          }
         EXCEPT_DEFAULT
@@ -294 +295 @@
           }
 
-        if (mkdir(pbsself->job_exit_status_file_prefix, 0600) == -1 && errno != EEXIST) /* TODO it would be much better to do stat before */
+        fsd_log_debug(("Trying to create state directory: %s", pbsself->job_exit_status_file_prefix));
+
+        if (mkdir(pbsself->job_exit_status_file_prefix, 0700) == -1 && errno != EEXIST) /* TODO it would be much better to do stat before */
           {
-                fsd_log_warning("Failed to create job state directory: %s.  Valid job exit status may not be available in some cases.", pbsself->job_exit_status_file_prefix)
+                fsd_log_warning(("Failed to create job state directory: %s. Valid job exit status may not be available in some cases.", pbsself->job_exit_status_file_prefix));
           }
 

trunk/pbs_drmaa/submit.c

@@ -336 +336 @@
                 if( wd != NULL )
                         script_len += strlen("cd ") + strlen(wd) + strlen("; ");
-                script_len += strlen("exec ") + strlen(executable);
+                script_len += strlen(executable);
                 if( argv != NULL )
                         for( i = argv;  *i != NULL;  i++ )
@@ -342 +342 @@
                 if( input_path != NULL )
                         script_len += strlen(" <") + strlen(input_path);
-                if (((pbsdrmaa_session_t)self->session)->job_exit_status_file_prefix)
-                        script_len += strlen("; echo $? >") + strlen(((pbsdrmaa_session_t)self->session)->job_exit_status_file_prefix) + strlen("/$PBS_JOBID.exitcode");
+                if (((pbsdrmaa_session_t *)self->session)->job_exit_status_file_prefix)
+                        script_len += strlen("; echo $? >") + strlen(((pbsdrmaa_session_t *)self->session)->job_exit_status_file_prefix) + strlen("/$PBS_JOBID.exitcode");
          }
 
@@ -353 +353 @@
                 if( wd != NULL )
                         s += sprintf( s, "cd %s; ", wd );
-                s += sprintf( s, "exec %s", executable );
+                s += sprintf( s, "%s", executable );
                 if( argv != NULL )
                         for( i = argv;  *i != NULL;  i++ )
@@ -359 +359 @@
                 if( input_path != NULL )
                         s += sprintf( s, " <%s", input_path );
-                if (((pbsdrmaa_session_t)self->session)->job_exit_status_file_prefix)
-                        s += sprintf( s, "; echo $? >%s/$PBS_JOBID.exitcode", ((pbsdrmaa_session_t)self->session)->job_exit_status_file_prefix);
+                if (((pbsdrmaa_session_t *)self->session)->job_exit_status_file_prefix)
+                        s += sprintf( s, "; echo $? >%s/$PBS_JOBID.exitcode", ((pbsdrmaa_session_t *)self->session)->job_exit_status_file_prefix);
 
                 fsd_assert( s == script+script_len );