Merge pull request #97 from natefoo/slurm-25.11

Fixes for Slurm 25.11

Author: natefoo

configure.ac

@@ -1,5 +1,5 @@
 AC_INIT([DRMAA for Slurm],[m4_esyscmd_s(./m4/ac_version.sh)],[nate@bx.psu.edu],[slurm-drmaa])
-AC_PREREQ([2.72])
+AC_PREREQ([2.71])
 AC_REVISION([m4_esyscmd_s([git rev-parse HEAD])])
 AC_COPYRIGHT([
 DRMAA for Slurm
@@ -50,7 +50,6 @@ AC_PROG_MAKE_SET
 AC_PROG_LN_S
 
 # check compiler / set basic flags:
-
 if test x$GCC = xyes; then
 	CFLAGS="-pedantic -std=c99 ${CFLAGS}"
 fi

drmaa_utils

@@ -92,7 +92,11 @@ slurmdrmaa_job_control( fsd_job_t *self, int action )
 				/* change priority to 0*/
 				slurm_init_job_desc_msg(&job_desc);
 				slurm_self->old_priority = job_desc.priority;
+#if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(25,11,0)
+				job_desc.job_id_str = self->job_id;
+#else
 				job_desc.job_id = atoi(self->job_id);
+#endif
 				job_desc.priority = 0;
 				job_desc.alloc_sid = 0;
 #if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(24,11,0)
@@ -122,7 +126,11 @@ slurmdrmaa_job_control( fsd_job_t *self, int action )
 			  /* change priority back*/
 			  	slurm_init_job_desc_msg(&job_desc);
 				job_desc.priority = INFINITE;
+#if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(25,11,0)
+				job_desc.job_id_str = self->job_id;
+#else
 				job_desc.job_id = atoi(self->job_id);
+#endif
 #if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(24,11,0)
 				if((_serrno = slurm_update_job(&job_desc)) != SLURM_SUCCESS ) {
 #else

slurm_drmaa/job.c

@@ -29,6 +29,13 @@
 
 #include <slurm/slurmdb.h>
 
+/* Slurm 25.11+ moved job_id into step_id struct */
+#if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(25,11,0)
+#define SUBMIT_RESPONSE_JOB_ID(resp) ((resp)->step_id.job_id)
+#else
+#define SUBMIT_RESPONSE_JOB_ID(resp) ((resp)->job_id)
+#endif
+
 static char *slurmdrmaa_session_run_job(fsd_drmaa_session_t *self, const fsd_template_t *jt);
 
 static fsd_iter_t *slurmdrmaa_session_run_bulk(	fsd_drmaa_session_t *self,const fsd_template_t *jt, int start, int end, int incr );
@@ -145,24 +152,24 @@ slurmdrmaa_session_run_bulk(
 		connection_lock = fsd_mutex_unlock( &self->drm_connection_mutex );
 
 		if (!working_cluster_rec)
-			fsd_log_debug(("job %u submitted", submit_response->job_id));
+			fsd_log_debug(("job %u submitted", SUBMIT_RESPONSE_JOB_ID(submit_response)));
 		else
-			fsd_log_debug(("job %u submitted on cluster %s", submit_response->job_id, working_cluster_rec->name));
+			fsd_log_debug(("job %u submitted on cluster %s", SUBMIT_RESPONSE_JOB_ID(submit_response), working_cluster_rec->name));
 
 		if ( start != 0 || end != 0 || incr != 0 ) {
 			int _serrno;
 #if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(24,11,0)
-			if (( _serrno = slurm_load_job( &job_info, submit_response->job_id, 0)) != SLURM_SUCCESS) {
+			if (( _serrno = slurm_load_job( &job_info, SUBMIT_RESPONSE_JOB_ID(submit_response), 0)) != SLURM_SUCCESS) {
 #else
-			if ( SLURM_SUCCESS != slurm_load_job( &job_info, submit_response->job_id, 0) ) {
+			if ( SLURM_SUCCESS != slurm_load_job( &job_info, SUBMIT_RESPONSE_JOB_ID(submit_response), 0) ) {
 				_serrno = slurm_get_errno();
 #endif
 				fsd_exc_raise_fmt( FSD_ERRNO_INTERNAL_ERROR,"slurm_load_job: %s",slurm_strerror(_serrno));
 			}
 			else {
 #if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(14, 10, 0)
 				for (i = 0, v = start; i < n_jobs; i++, v += incr) {
-					job_ids[i] = fsd_asprintf("%d_%d", submit_response->job_id, v);
+					job_ids[i] = fsd_asprintf("%d_%d", SUBMIT_RESPONSE_JOB_ID(submit_response), v);
 #else
 				fsd_assert(  job_info->record_count == n_jobs );
 				for (i=0; i < job_info->record_count; i++) {
@@ -180,9 +187,9 @@ slurmdrmaa_session_run_bulk(
 			}
 		} else {
 			if (!working_cluster_rec)
-				job_ids[0] = fsd_asprintf( "%d", submit_response->job_id); /* .0*/
+				job_ids[0] = fsd_asprintf( "%d", SUBMIT_RESPONSE_JOB_ID(submit_response)); /* .0*/
 			else
-				job_ids[0] = fsd_asprintf("%d.%s",submit_response->job_id,working_cluster_rec->name);
+				job_ids[0] = fsd_asprintf("%d.%s",SUBMIT_RESPONSE_JOB_ID(submit_response),working_cluster_rec->name);
 
 			job = slurmdrmaa_job_new( fsd_strdup(job_ids[0]) ); /* TODO: ??? */
 			job->session = self;

slurm_drmaa/session.c

@@ -25,14 +25,14 @@
 #define __LL_DRMAA__SLURM_MISSING_H
 
 #if SLURM_VERSION_NUMBER < SLURM_VERSION_NUM(24,11,0)
-extern void * slurm_list_peek (List l);
+extern void * slurm_list_peek(List l);
+extern int slurm_addto_step_list(List step_list, char *names);
+#else
+extern void * slurm_list_peek(list_t *l);
+extern int slurm_addto_step_list(list_t *step_list, char *names);
 #endif
 #if SLURM_VERSION_NUMBER < SLURM_VERSION_NUM(24,5,0)
-extern void * slurm_list_remove (ListIterator i);
-#endif
-
-#if SLURM_VERSION_NUMBER < SLURM_VERSION_NUM(24,11,0)
-extern int slurm_addto_step_list(List step_list, char *names);
+extern void * slurm_list_remove(ListIterator i);
 #endif
 
 /* --clusters is not supported with Slurm < 15.08, but these are defined to