SPANK plugin sessions tests

Author: nchaimov

.github/workflows/ci.yml

@@ -213,6 +213,11 @@ jobs:
         run: |
           docker exec slurm-plugin-head bash -c 'cd Spindle-build/testsuite && salloc -n${workers} -N${workers} ./runTests ${workers}'
 
+      - name: Run spindle-slurm-plugin-ubuntu session testsuite
+        id: slurm-ubuntu-testsuite
+        run: |
+          docker exec slurm-plugin-head bash -c 'cd Spindle-build/testsuite && salloc -n${workers} -N${workers} --spindle-session ./runTests ${workers}'
+
       - name: Bring spindle-slurm-plugin-ubuntu down
         id: slurm-ubuntu-down
         if: ${{ always() }}

src/slurm_plugin/plugin_utils.c

@@ -48,7 +48,6 @@ int srunAllNodes(unsigned int num_nodes, const char *command)
       // In child
       char n[12];
       snprintf(n, sizeof(n), "%u", num_nodes);
-      fprintf(stderr, "Going to srun on %s nodes\n", n);
       execlp("srun",
              "srun", 
              "--nodes", n,

src/slurm_plugin/slurm_plugin.c

@@ -562,15 +562,15 @@ static int handleStart(void *params, char **output_str)
       return 0;
    }
 
-   err = get_stepid(spank, &stepid);
-   if (err != ESPANK_SUCCESS) {
-     slurm_error("ERROR: Spindle plugin error. Could not get step id.");
-     return -1;
-   }
-
    // Only initialize a session once
-   if (use_session && (args.opts & OPT_RSHLAUNCH) && (stepid != 0))
+   if (use_session && (args.opts & OPT_RSHLAUNCH) && (stepid != 0)) {
+      err = get_stepid(spank, &stepid);
+      if (err != ESPANK_SUCCESS) {
+          slurm_error("ERROR: Spindle plugin error. Could not get step id.");
+          return -1;
+      }
       return 0;
+   }
 
    result = launch_spindle(spank, &args);
    if (result == -1) {
@@ -633,6 +633,7 @@ int slurm_spank_task_exit(spank_t spank, int site_argc, char *site_argv[])
    return 0;
 }
 
+
 static spank_err_t get_stepid(spank_t spank, uint32_t *stepid)
 {
    char *slurm_step_id_s;

testsuite/runTests_template

@@ -6,6 +6,16 @@ export TEST_RM="TEST_RESOURCE_MANAGER"
 export GLOBAL_RESULT=0
 CHECK_RETCODE() { if [[ $? != 0 ]]; then export GLOBAL_RESULT=-1; fi }
 
+# For slurm-plugin, whether we use a session is determined by the allocation we run in.
+# Run only the non-session tests if this allocation doesn't use a session.
+# Run only the session tests if this allocation uses a session.
+SKIP_NONSESSION=false
+if test "x$TEST_RM" == "xslurm-plugin" && test "x$SPANK_SPINDLE_USE_SESSION" != "x"; then
+    SKIP_NONSESSION=true
+fi
+
+if test "x$SKIP_NONSESSION" != "xtrue"; then
+
 ./run_driver --dependency --push
 CHECK_RETCODE
 ./run_driver --dlopen --push
@@ -129,7 +139,17 @@ CHECK_RETCODE
 ./run_driver --spindleapi --preload
 CHECK_RETCODE
 
-if test "x$TEST_RM" != "xserial"; then
+fi # SKIP_NONSESSION
+
+SKIP_SESSION=false
+if test "x$TEST_RM" == "xserial"; then
+    SKIP_SESSION=true
+fi
+if test "x$TEST_RM" == "xslurm-plugin" && test "x$SPANK_SPINDLE_USE_SESSION" == "x"; then
+    SKIP_SESSION=true
+fi
+
+if test "x$SKIP_SESSION" != "xtrue"; then
 export SESSION_ID=`./run_driver --start-session`
 ./run_driver --dependency --session
 CHECK_RETCODE

testsuite/run_driver_template

@@ -11,6 +11,10 @@ export SPINDLE=SPINDLE_EXEC
 export PATH=$PATH:.
 
 if [ $1 == --start-session ] ; then
+    # With SPANK plugin, sessions are started by argument to salloc/sbatch instead
+    if [ "x$TEST_RM" == "xslurm-plugin" ] ; then
+        exit 0
+    fi
     export SPINDLEID=`$SPINDLE --start-session --level=high`
     if [ x$SPINDLEID == x ]; then
         echo ANONYMOUS_SESSION
@@ -20,6 +24,9 @@ if [ $1 == --start-session ] ; then
     exit 0
 fi
 if [ $1 == --end-session ] ; then
+    if [ "x$TEST_RM" == "xslurm-plugin" ] ; then
+        exit 0
+    fi
     if [ x$2 == xANONYMOUS_SESSION ] ; then
         $SPINDLE --end-session
     else
@@ -59,11 +66,14 @@ export SPINDLE_OPTS="--numa"
 fi
 
 if [ $2 == --session ] ; then
-  if [ x$SESSION_ID == x ] ; then
-    export SESSION_ID=`$SPINDLE --start-session`
-    export STARTED_SPINDLE_SESSION=true
+  # With SPANK plugin, we run in session if the allocation has a session
+  if [ "x$TEST_RM" != "xslurm-plugin" ] ; then
+    if [ x$SESSION_ID == x ] ; then
+      export SESSION_ID=`$SPINDLE --start-session`
+      export STARTED_SPINDLE_SESSION=true
+    fi
+    export SPINDLE_OPTS="--run-in-session $SESSION_ID"
   fi
-  export SPINDLE_OPTS="--run-in-session $SESSION_ID"
 fi
 
 export SPINDLE_BLUEGENE="BLUEGENE_TEST"