IM2/Slurm: Fixes two separate bugs

requestDynamicParameters no longer crashes in certain scenarios Lmod module parsing is now more roboust
SDU-eScience · Mar 11, 2025 · 1bfceef · 1bfceef
1 parent e774f9e
commit 1bfceef
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/backend/version.txt b/backend/version.txt
@@ -1 +1 @@
-2025.2.106
+2025.2.107
diff --git a/provider-integration/im2/macos_build.sh b/provider-integration/im2/macos_build.sh
@@ -16,10 +16,12 @@ docker exec -it ucloud-im2-macos-builder-arm64 bash -c '
     CGO_ENABLED=1 go build -o bin/ucloud_aarch64 -trimpath ucloud.dk/cmd/ucloud-im
 '
 
-version=`cat ../../backend/version.txt`
-docker buildx build \
-    -f macosbuilder.Dockerfile \
-    --push \
-    --tag dreg.cloud.sdu.dk/ucloud/im2:${version} \
-    --platform linux/arm64/v8,linux/amd64 \
-    .
+if [ -z "NO_DOCKER" ]; then
+    version=`cat ../../backend/version.txt`
+    docker buildx build \
+        -f macosbuilder.Dockerfile \
+        --push \
+        --tag dreg.cloud.sdu.dk/ucloud/im2:${version} \
+        --platform linux/arm64/v8,linux/amd64 \
+        .
+fi
diff --git a/provider-integration/im2/pkg/im/services/slurm/compute.go b/provider-integration/im2/pkg/im/services/slurm/compute.go
@@ -152,6 +152,7 @@ func requestDynamicParameters(owner orc.ResourceOwner, app *orc.Application) []o
 			Applications:         ServiceConfig.Compute.Applications,
 			RequiredApplications: appsToLoad,
 			VersionPolicy:        "loose",
+			PreviouslyLoaded:     make(map[orc.NativeApplication]appCfgAndVersion),
 		}
 
 		var failedToLoad []string

diff --git a/provider-integration/im2/pkg/im/services/slurm/slurm_modules.go b/provider-integration/im2/pkg/im/services/slurm/slurm_modules.go
@@ -10,11 +10,11 @@ import (
 )
 
 type LmodModuleGroup struct {
-	Versions           []LmodModule        `json:"versions"`
-	Package            string              `json:"package"`
-	Url                util.Option[string] `json:"url"`
-	DefaultVersionName string              `json:"defaultVersionName"`
-	Description        string              `json:"description"`
+	Versions    []LmodModule        `json:"versions"`
+	Package     string              `json:"package"`
+	Url         util.Option[string] `json:"url"`
+	Description string              `json:"description"`
+	// NOTE(Dan): defaultVersionName very rarely sends "defaultVersionName": false which breaks the naive implementation
 }
 
 type LmodModule struct {