Changeset 27

Timestamp:

11/11/12 22:30:18 (12 years ago)

Author:

mmamonski

Message:

use job category first

File:

• trunk/ll_drmaa/job.c (modified) (6 diffs)

trunk/ll_drmaa/job.c

@@ -202 +202 @@
         self->last_update_time = time(NULL);
 
+        if( self->state >= DRMAA_PS_DONE )
+                fsd_cond_broadcast( &self->status_cond );
+
         fsd_log_return(( "" ));
 }
@@ -298 +301 @@
                                         self->state = DRMAA_PS_DONE;
                                         self->exit_status = 0;
+                                        fsd_cond_broadcast( &self->status_cond );
                                   }
                                 else if (llself->missing_time == 0)
@@ -303 +307 @@
                                         llself->missing_time = time(NULL);
                                         fsd_log_debug(("Job %s missing for the first time", self->job_id)); /* Job may not yet be visible in LL */
+                                        fsd_cond_broadcast( &self->status_cond );
                                  }
                                 else if (time(NULL) - llself->missing_time > LL_DRMAA_MAX_MISSING_TIME)
                                  {
-                                        fsd_log_error(("Job %s missing for more then %d seconds. Assuming failef", self->job_id, LL_DRMAA_MAX_MISSING_TIME)); 
+                                        fsd_log_error(("Job %s missing for more then %d seconds. Assuming failed", self->job_id, LL_DRMAA_MAX_MISSING_TIME)); 
                                         /* Job may not yet be visible in LL */
                                         self->state = DRMAA_PS_FAILED;
@@ -343 +348 @@
                         llself->read_job_info(self, step_state, hold_type);
 
-                        fsd_log_info(("LL State: %d -> DRMAA: %s", step_state, drmaa_job_ps_to_str(self->state)));
+                        fsd_log_info(("Job %s LL State: %d -> DRMAA: %s", self->job_id, step_state, drmaa_job_ps_to_str(self->state)));
                 }
         }
@@ -476 +481 @@
                 fprintf(fd,"# File created by LoadLeveler DRMAA. If no LL DRMAA applications are running you can delete this file\n");
 
+                /* job category */
+                value = jt->get_attr( jt, DRMAA_JOB_CATEGORY );
+                if( value )
+                        job_category = value;
+
+                {
+                        char * temp;
+                        fsd_conf_option_t *category_value = NULL;
+                        category_value = fsd_conf_dict_get( session->job_categories, job_category );
+                        if( category_value != NULL )
+                        {
+                                if( category_value->type != FSD_CONF_STRING )
+                                        fsd_exc_raise_fmt(
+                                                        FSD_ERRNO_INTERNAL_ERROR,
+                                                        "configuration error: job category should be string"
+                                                        );
+
+                                temp = fsd_strdup(category_value->val.string);
+                                temp = fsd_replace(temp,"@","\n# $"); /* infinite loop when try replace @ with # @ */
+                                temp = fsd_replace(temp,"# $","# @ ");
+
+                                fprintf(fd,"# Job category:%s\n", temp);
+                                fsd_log_debug(("Job category:\n%s",temp));
+                                fsd_free(temp);
+                        }
+                        else
+                        {
+                                if( value != NULL )
+                                        fsd_exc_raise_fmt(
+                                                        FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE,
+                                                        "invalid job category: %s", job_category
+                                                        );
+                        }
+                }
+
                 /* job name */
                 value = jt->get_attr( jt, DRMAA_JOB_NAME );
@@ -566 +606 @@
                 }
 
-                /* job category */
-                value = jt->get_attr( jt, DRMAA_JOB_CATEGORY );
-                if( value )
-                        job_category = value;
-
-                {
-                        char * temp;
-                        fsd_conf_option_t *category_value = NULL;
-                        category_value = fsd_conf_dict_get( session->job_categories, job_category );
-                        if( category_value != NULL )
-                        {
-                                if( category_value->type != FSD_CONF_STRING )
-                                        fsd_exc_raise_fmt(
-                                                        FSD_ERRNO_INTERNAL_ERROR,
-                                                        "configuration error: job category should be string"
-                                                        );
-
-                                temp = fsd_strdup(category_value->val.string);
-                                temp = fsd_replace(temp,"@","\n# $"); /* infinite loop when try replace @ with # @ */
-                                temp = fsd_replace(temp,"# $","# @ ");
-
-                                fprintf(fd,"# Job category:%s\n", temp);
-                                fsd_log_debug(("Job category:\n%s",temp));
-                                fsd_free(temp);
-                        }
-                        else
-                        {
-                                if( value != NULL )
-                                        fsd_exc_raise_fmt(
-                                                        FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE,
-                                                        "invalid job category: %s", job_category
-                                                        );
-                        }
-                }