Changeset 23

Timestamp:

04/06/12 10:15:00 (13 years ago)

Author:

mmamonski

Message:

Follow up newer version of SLURM

Location:

trunk

Files:

• configure.ac (modified) (2 diffs)
• slurm_drmaa/job.c (modified) (2 diffs)

trunk/configure.ac

@@ -1 @@
-AC_INIT([PSNC DRMAA for SLURM], [1.0.2], [mamonski@man.poznan.pl], [slurm_drmaa])
+AC_INIT([PSNC DRMAA for SLURM], [1.0.3], [mamonski@man.poznan.pl], [slurm-drmaa])
 AC_PREREQ(2.59)
 AC_REVISION([$Id$])
@@ -23 +23 @@
 SLURM_DRMAA_MAJOR=1
 SLURM_DRMAA_MINOR=0
-SLURM_DRMAA_MICRO=2
-SLURM_DRMAA_VERSION_INFO=1:2:0
+SLURM_DRMAA_MICRO=3
+SLURM_DRMAA_VERSION_INFO=1:3:0
 AC_SUBST([SLURM_DRMAA_MAJOR])
 AC_SUBST([SLURM_DRMAA_MINOR])

trunk/slurm_drmaa/job.c

@@ -164 +164 @@
                                         #if SLURM_VERSION_NUMBER < SLURM_VERSION_NUM(2,2,0)
                                         case WAIT_TBD1:
+                                        #else
+                                        case WAIT_QOS_THRES:       /* required QOS threshold has been reached */
                                         #endif                                  
+                                        #if SLURM_VERSION_NUMBER < SLURM_VERSION_NUM(2,3,0)
                                         case WAIT_TBD2:
+                                        #else
+                                        case WAIT_FRONT_END: /* Front end nodes are DOWN */
+                                        case WAIT_QOS_JOB_LIMIT: /* QOS job limit reached */    
+                                        case WAIT_QOS_RESOURCE_LIMIT: /* QOS resource limit reached */ 
+                                        case WAIT_QOS_TIME_LIMIT: /*  QOS time limit reached */
+                                        #endif
                                                 self->state = DRMAA_PS_QUEUED_ACTIVE;
                                                 break;
@@ -180 +189 @@
                                         #else
                                         case FAIL_ACCOUNT:         /* invalid account */
-                                        #endif
-                                        
-                                        #if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(2,2,0)
                                         case FAIL_QOS:             /* invalid QOS */
-                                        case WAIT_QOS_THRES:       /* required QOS threshold has been breached */
                                         #endif
                                                 self->state = DRMAA_PS_FAILED;