Changeset 10 for trunk/pbs_drmaa

Timestamp:

03/04/11 16:10:49 (14 years ago)

Author:

mmamonski

Message:

DRMAA utils - keep conf in PREFIX/etc, log_info all communication with Torque, do not log_error on timout and vector operations

Location:

trunk/pbs_drmaa

Files:

• job.c (modified) (5 diffs)
• session.c (modified) (1 diff)
• submit.c (modified) (1 diff)

trunk/pbs_drmaa/job.c

@@ -111 +111 @@
                                         rc = pbs_sigjob( session->pbs_conn, (char*)job_id,
                                                         "SIGSTOP", NULL );
+                                        fsd_log_info(("pbs_sigjob(%s, SIGSTOP) =%d", job_id, rc));
                                         if( rc == PBSE_NONE )
                                                 self->flags |= FSD_JOB_SUSPENDED;
@@ -118 +119 @@
                                         rc = pbs_sigjob( session->pbs_conn, (char*)job_id,
                                                         "SIGCONT", NULL );
+                                        fsd_log_info(("pbs_sigjob(%s, SIGCONT) =%d", job_id, rc));
                                         if( rc == PBSE_NONE )
                                                 self->flags &= ~FSD_JOB_SUSPENDED;
@@ -125 +127 @@
                                         rc = pbs_holdjob( session->pbs_conn, (char*)job_id,
                                                         USER_HOLD, NULL );
+                                        fsd_log_info(("pbs_sigjob(%s, SIGHOLD) =%d", job_id, rc));
                                         if( rc == PBSE_NONE )
                                                 self->flags |= FSD_JOB_HOLD;
@@ -132 +135 @@
                                         rc = pbs_rlsjob( session->pbs_conn, (char*)job_id,
                                                         USER_HOLD, NULL );
+                                        fsd_log_info(("pbs_rlsjob(%s) =%d", job_id, rc));
                                         if( rc == PBSE_NONE )
                                                 self->flags &= FSD_JOB_HOLD;
@@ -138 +142 @@
                                         apicall = "pbs_deljob";
                                         rc = pbs_deljob( session->pbs_conn, (char*)job_id, NULL );
+                                        fsd_log_info(("pbs_deljob(%s) =%d", job_id, rc));
                                         /* Torque:
                                          * deldelay=N -- delay between SIGTERM and SIGKILL (default 0) */

trunk/pbs_drmaa/session.c

@@ -121 +121 @@
 
                 self->pbs_conn = pbs_connect( self->super.contact );
-                fsd_log_debug(( "pbs_connect(%s) =%d", self->super.contact,
+                fsd_log_info(( "pbs_connect(%s) =%d", self->super.contact,
                                         self->pbs_conn ));
                 if( self->pbs_conn < 0 )

trunk/pbs_drmaa/submit.c

@@ -178 +178 @@
                                 (struct attropl*)pbs_attr, self->script_filename,
                                 self->destination_queue, NULL );
+
+                fsd_log_info(("pbs_submit() =%s", job_id));
+
                 if( job_id == NULL )
                 {