feat: grow support for fluxion

.devcontainer/Dockerfile

@@ -19,7 +19,17 @@ RUN wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz  && tar -xvf go${G
          mv go /usr/local && rm go${GO_VERSION}.linux-amd64.tar.gz
 ENV PATH=$PATH:/usr/local/go/bin:/home/vscode/go/bin
 
-RUN git clone https://github.com/flux-framework/flux-sched /opt/flux-sched
+# Testing grow/shrink from custom branch
+RUN git clone -b debug-resource-error-messages https://github.com/researchapps/flux-sched /opt/flux-sched
+# RUN git clone https://github.com/flux-framework/flux-sched /opt/flux-sched
+
+# We also need to rebuild into the system install
+# TODO remove this when it is added to production container
+ENV FLUX_SCHED_VERSION=0.39.0
+RUN cd /opt/flux-sched && \
+    cmake -B build && \
+    make -C build && \
+    make -C build install
 
 # Add the group and user that match our ids
 RUN groupadd -g ${USER_GID} ${USERNAME} && \

Makefile

@@ -1,6 +1,7 @@
 HERE ?= $(shell pwd)
 LOCALBIN ?= $(shell pwd)/bin
 JGF ?= $(HERE)/cmd/test/data/tiny.json
+GROWJGF ?= $(HERE)/cmd/test/data/grow/new-nodes.json
 JOBSPECS ?= $(HERE)/cmd/test/data/jobspecs
 
 # This assumes a build in the .devcontainer Dockerfile environment
@@ -27,8 +28,8 @@ test-modules:
 	go test -v ./pkg/types
 
 .PHONY: test-binary
-test-binary: 	
-	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) $(LOCALBIN)/test --jgf=$(JGF) --jobspec=$(JOBSPECS)/test001.yaml
+test-binary: build
+	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) $(LOCALBIN)/test --jgf=$(JGF) --grow=$(GROWJGF) --jobspec=$(JOBSPECS)
 
 # test001_desc="match allocate 1 slot: 1 socket: 1 core (pol=default)"
 # test_expect_success "${test001_desc}" '

cmd/test/data/grow/new-nodes.json

@@ -0,0 +1,97 @@
+{
+    "graph": {
+        "nodes": [
+          {
+            "id": "0",
+            "metadata": {
+                "type": "cluster",
+                "basename": "tiny",
+                "name": "tiny0",
+                "id": 0,
+                "uniq_id": 0,
+                "rank": -1,
+                "exclusive": false,
+                "unit": "",
+                "size": 1,
+                "paths": {
+                    "containment": "/tiny0"
+                }
+            }
+        },
+        {
+            "id": "1",
+            "metadata": {
+                "type": "rack",
+                "basename": "rack",
+                "name": "rack0",
+                "id": 0,
+                "uniq_id": 1,
+                "rank": -1,
+                "exclusive": false,
+                "unit": "",
+                "size": 1,
+                "paths": {
+                    "containment": "/tiny0/rack0"
+                }
+            }
+          },
+          {
+                "id": "100",
+                "metadata": {
+                  "type": "node",
+                  "basename": "node",
+                  "name": "node2",
+                  "id": 100,
+                  "uniq_id": 100,
+                  "rank": -1,
+                  "exclusive": false,
+                  "unit": "",
+                  "size": 1,
+                  "paths": {
+                    "containment": "/tiny0/rack0/node2"
+                  }
+                }
+              },
+              {
+                "id": "101",
+                "metadata": {
+                  "type": "node",
+                  "basename": "node",
+                  "name": "node3",
+                  "id": 101,
+                  "uniq_id": 101,
+                  "rank": -1,
+                  "exclusive": false,
+                  "unit": "",
+                  "size": 1,
+                  "paths": {
+                    "containment": "/tiny0/rack0/node3"
+                  }
+                }
+              }
+        ],
+        "edges": [
+            {
+              "source": "0",
+              "target": "1",
+              "metadata": {
+                  "subsystem": "containment"
+              }
+            },
+            {
+                "source": "1",
+                "target": "100",
+                "metadata": {
+                    "subsystem": "containment"
+                }
+              },
+              {
+                "source": "1",
+                "target": "101",
+                "metadata": {
+                    "subsystem": "containment"  
+                }
+              }
+        ]
+    }
+}

cmd/test/data/jobspecs/grow.yaml

@@ -0,0 +1,21 @@
+version: 9999
+resources:
+    - type: cluster
+      count: 1
+      with:
+        - type: rack
+          count: 1
+          with:
+            - type: node
+              count: 4
+
+# a comment
+attributes:
+  system:
+    duration: 3600
+tasks:
+  - command: [ "app" ]
+    slot: default
+    count:
+      per_slot: 1
+