Merge pull request #1156 from zekemorton/planner_init_fix

Add planner reinitialization for elasticity

Author: mergify[bot]

resource/traversers/dfu_impl.cpp

@@ -1132,7 +1132,12 @@ int dfu_impl_t::prime_pruning_filter (const subsystem_t &s, vtx_t u,
         }
     }
 
-    if (!avail.empty () && !types.empty ()) {
+    if (avail.empty () || types.empty ()) {
+        rc = 0;
+        goto done;
+    }
+
+    if ( (*m_graph)[u].idata.subplans[s] == NULL) {
         errno = 0;
         planner_multi_t *p = NULL;
         if (!(p = subtree_plan (u, avail, types)) ) {
@@ -1141,6 +1146,9 @@ int dfu_impl_t::prime_pruning_filter (const subsystem_t &s, vtx_t u,
             goto done;
         }
         (*m_graph)[u].idata.subplans[s] = p;
+    } else {
+        planner_multi_update ((*m_graph)[u].idata.subplans[s], &avail[0], 
+                               &types[0], types.size ());
     }
     rc = 0;
 done:

t/data/resource/commands/elastic/cmds09.in

@@ -0,0 +1,28 @@
+find sched-now=free
+match allocate @TEST_SRCDIR@/data/resource/jobspecs/elastic/test-ma-node.yaml
+match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/elastic/test-ma-node.yaml
+find status=up
+find sched-now=allocated
+find sched-future=reserved
+match allocate @TEST_SRCDIR@/data/resource/jobspecs/elastic/test-ma-node.yaml
+attach @TEST_SRCDIR@/data/resource/jgfs/elastic/node-add-test.json
+find status=up
+find sched-now=allocated
+find sched-future=reserved
+find sched-now=free
+match allocate @TEST_SRCDIR@/data/resource/jobspecs/elastic/test-ma-node.yaml
+find status=up
+find sched-now=allocated
+find sched-future=reserved
+find sched-now=free
+cancel 1
+match allocate @TEST_SRCDIR@/data/resource/jobspecs/elastic/test-ma-node.yaml
+find status=up
+find sched-now=allocated
+find sched-future=reserved
+match allocate @TEST_SRCDIR@/data/resource/jobspecs/elastic/test-ma-node.yaml
+match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/elastic/test-ma-node.yaml
+find status=up
+find sched-now=allocated
+find sched-future=reserved
+quit