gh: bump code version and include is_app_migratable binary (#806)

* gh: bump code version and include is_app_migratable binary * planner: fix resource accounting when migrating messages * faasmctl: bump to version 0.18.0 * dist-tests: simplify mpi waiting/checking so that it does not rely on the exec graph any more * dist-tests: nits * dist-tests: more fixture updates * dist-tests: more fixes * gh: bump faabric again * dist-tests: use preloaded decision in remote execution test * faabric: bump commit after merge to main
faasm · Dec 5, 2023 · 7cec27e · 7cec27e
1 parent 90be79f
commit 7cec27e
Show file tree

Hide file tree

Showing 24 changed files with 157 additions and 168 deletions.
diff --git a/.env b/.env
@@ -1,9 +1,9 @@
-FAASM_VERSION=0.14.0
-FAASM_CLI_IMAGE=faasm.azurecr.io/cli:0.14.0
-FAASM_WORKER_IMAGE=faasm.azurecr.io/worker:0.14.0
+FAASM_VERSION=0.15.0
+FAASM_CLI_IMAGE=faasm.azurecr.io/cli:0.15.0
+FAASM_WORKER_IMAGE=faasm.azurecr.io/worker:0.15.0
 
-FAABRIC_VERSION=0.9.0
-FAABRIC_PLANNER_IMAGE=faasm.azurecr.io/planner:0.9.0
+FAABRIC_VERSION=0.10.0
+FAABRIC_PLANNER_IMAGE=faasm.azurecr.io/planner:0.10.0
 
 CPP_VERSION=0.3.1
 CPP_CLI_IMAGE=faasm.azurecr.io/cpp-sysroot:0.3.1

diff --git a/.github/workflows/azure.yml b/.github/workflows/azure.yml
@@ -56,7 +56,7 @@ jobs:
           ./bin/inv_wrapper.sh cluster.credentials --name ${{ env.CLUSTER_NAME }}
         working-directory: ${{ github.workspace }}/experiment-base
       - name: "Install faasmctl"
-        run: pip3 install faasmctl==0.16.0
+        run: pip3 install faasmctl==0.18.0
       - name: "Deploy Faasm on k8s cluster"
         run: faasmctl deploy.k8s --workers=4
       - name: "Build, upload and run a simple CPP function"

diff --git a/.github/workflows/sgx_hw.yml b/.github/workflows/sgx_hw.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: self-hosted
     env:
       VM_BASE_NAME: gha-sgx-hw-vm
-      FAASM_VERSION: 0.14.0
+      FAASM_VERSION: 0.15.0
     steps:
       - name: "Check out the experiment-base code"
         uses: actions/checkout@v4

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -23,7 +23,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm.azurecr.io/cli:0.14.0
+      image: faasm.azurecr.io/cli:0.15.0
       credentials:
         username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
         password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
@@ -52,7 +52,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm.azurecr.io/cli:0.14.0
+      image: faasm.azurecr.io/cli:0.15.0
       credentials:
         username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
         password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
@@ -196,7 +196,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm.azurecr.io/cli:0.14.0
+      image: faasm.azurecr.io/cli:0.15.0
       credentials:
         username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
         password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
@@ -224,18 +224,18 @@ jobs:
     env:
       HOST_TYPE: ci
     container:
-      image: faasm.azurecr.io/cli:0.14.0
+      image: faasm.azurecr.io/cli:0.15.0
       credentials:
         username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
         password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
     services:
       redis:
-        image: faasm.azurecr.io/redis:0.14.0
+        image: faasm.azurecr.io/redis:0.15.0
         credentials:
           username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
           password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
       minio:
-        image: faasm.azurecr.io/minio:0.14.0
+        image: faasm.azurecr.io/minio:0.15.0
         credentials:
           username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
           password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
@@ -330,18 +330,18 @@ jobs:
     env:
       HOST_TYPE: ci
     container:
-      image: faasm.azurecr.io/cli:0.14.0
+      image: faasm.azurecr.io/cli:0.15.0
       credentials:
         username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
         password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
     services:
       redis:
-        image: faasm.azurecr.io/redis:0.14.0
+        image: faasm.azurecr.io/redis:0.15.0
         credentials:
           username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
           password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
       minio:
-        image: faasm.azurecr.io/minio:0.14.0
+        image: faasm.azurecr.io/minio:0.15.0
         credentials:
           username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
           password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
@@ -434,18 +434,18 @@ jobs:
     env:
       HOST_TYPE: ci
     container:
-      image: faasm.azurecr.io/cli-sgx-sim:0.14.0
+      image: faasm.azurecr.io/cli-sgx-sim:0.15.0
       credentials:
         username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
         password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
     services:
       redis:
-        image: faasm.azurecr.io/redis:0.14.0
+        image: faasm.azurecr.io/redis:0.15.0
         credentials:
           username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
           password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
       minio:
-        image: faasm.azurecr.io/minio:0.14.0
+        image: faasm.azurecr.io/minio:0.15.0
         credentials:
           username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
           password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
@@ -525,7 +525,7 @@ jobs:
     env:
       CONAN_CACHE_MOUNT_SOURCE: ~/.conan
       FAASM_INI_FILE: ./faasm.ini
-      FAASM_VERSION: 0.14.0
+      FAASM_VERSION: 0.15.0
       WASM_VM: ${{ matrix.wasm_vm }}
     steps:
       - uses: csegarragonz/set-compose-version-action@main
@@ -549,7 +549,7 @@ jobs:
         with:
           submodules: true
       - name: "Install faasmctl"
-        run: pip3 install faasmctl==0.16.0
+        run: pip3 install faasmctl==0.18.0
       # Cache contains architecture-specific machine code
       - name: "Get CPU model name"
         run: echo "CPU_MODEL=$(./bin/print_cpu.sh)" >> $GITHUB_ENV
@@ -593,7 +593,7 @@ jobs:
         working-directory: ${{ github.workspace }}
     env:
       FAASM_INI_FILE: ./faasm.ini
-      FAASM_VERSION: 0.14.0
+      FAASM_VERSION: 0.15.0
       PYTHON_CODEGEN: "on"
     steps:
       - uses: csegarragonz/set-compose-version-action@main
@@ -622,7 +622,7 @@ jobs:
           build-type: release
         if: matrix.detached == false
       - name: "Install faasmctl"
-        run: pip3 install faasmctl==0.16.0
+        run: pip3 install faasmctl==0.18.0
       - name: "Fetch python's CPP submodulle"
         run: git submodule update --init -f third-party/cpp
         working-directory: ${{ github.workspace }}/clients/python

diff --git a/README.md b/README.md
@@ -39,9 +39,6 @@ Start a Faasm cluster locally using `docker compose`:
 
 ```bash
 faasmctl deploy.compose
-
-# Set the env. var with Faasm's INI file to avoid having to repeat it
-export FAASM_INI_FILE=./faasm.ini
 ```
 
 To compile, upload and invoke a C++ function using this local cluster you can

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.14.0
+0.15.0
diff --git a/bin/workon.sh b/bin/workon.sh
@@ -66,6 +66,7 @@ VERSION_FILE=${PROJ_ROOT}/VERSION
 export LOG_LEVEL=debug
 export FAASM_ROOT=$(pwd)
 export FAASM_VERSION=$(cat ${VERSION_FILE})
+export FAASM_INI_FILE=${PROJ_ROOT}/faasm.ini
 
 if [[ "$MODE" == "terminal" ]]; then
     export FAASM_BUILD_DIR=$(pwd)/dev/native/build

diff --git a/deploy/k8s-common/minio.yml b/deploy/k8s-common/minio.yml
@@ -11,7 +11,7 @@ metadata:
 spec:
   containers:
     - name: minio-main
-      image: faasm.azurecr.io/minio:0.14.0
+      image: faasm.azurecr.io/minio:0.15.0
       env:
         - name: MINIO_ROOT_USER
           value: "minio"

diff --git a/deploy/k8s-common/planner.yml b/deploy/k8s-common/planner.yml
@@ -11,7 +11,7 @@ metadata:
 spec:
   containers:
     - name: planner
-      image: faasm.azurecr.io/planner:0.9.0
+      image: faasm.azurecr.io/planner:0.10.0
       ports:
         - containerPort: 8081
       env:

diff --git a/deploy/k8s-common/redis.yml b/deploy/k8s-common/redis.yml
@@ -11,7 +11,7 @@ metadata:
 spec:
   containers:
     - name: master
-      image: faasm.azurecr.io/redis:0.14.0
+      image: faasm.azurecr.io/redis:0.15.0
       ports:
         - containerPort: 6379
 
@@ -28,7 +28,7 @@ metadata:
 spec:
   containers:
     - name: master
-      image: faasm.azurecr.io/redis:0.14.0
+      image: faasm.azurecr.io/redis:0.15.0
       ports:
         - containerPort: 6379
 

diff --git a/deploy/k8s-sgx/upload.yml b/deploy/k8s-sgx/upload.yml
@@ -11,7 +11,7 @@ metadata:
 spec:
   containers:
     - name: upload
-      image: faasm.azurecr.io/upload:0.14.0
+      image: faasm.azurecr.io/upload:0.15.0
       ports:
         - containerPort: 8002
         - containerPort: 5000

diff --git a/deploy/k8s-sgx/worker.yml b/deploy/k8s-sgx/worker.yml
@@ -32,7 +32,7 @@ spec:
               weight: 100
 
       containers:
-        - image: faasm.azurecr.io/worker-sgx:0.14.0
+        - image: faasm.azurecr.io/worker-sgx:0.15.0
           name: faasm-worker
           ports:
             - containerPort: 8080

diff --git a/deploy/k8s-wamr/upload.yml b/deploy/k8s-wamr/upload.yml
@@ -11,7 +11,7 @@ metadata:
 spec:
   containers:
     - name: upload
-      image: faasm.azurecr.io/upload:0.14.0
+      image: faasm.azurecr.io/upload:0.15.0
       ports:
         - containerPort: 8002
         - containerPort: 5000

diff --git a/deploy/k8s-wamr/worker.yml b/deploy/k8s-wamr/worker.yml
@@ -32,7 +32,7 @@ spec:
               weight: 100
 
       containers:
-        - image: faasm.azurecr.io/worker:0.14.0
+        - image: faasm.azurecr.io/worker:0.15.0
           name: faasm-worker
           ports:
             - containerPort: 8080

diff --git a/deploy/k8s/upload.yml b/deploy/k8s/upload.yml
@@ -11,7 +11,7 @@ metadata:
 spec:
   containers:
     - name: upload
-      image: faasm.azurecr.io/upload:0.14.0
+      image: faasm.azurecr.io/upload:0.15.0
       ports:
         - containerPort: 8002
         - containerPort: 5000

diff --git a/deploy/k8s/worker.yml b/deploy/k8s/worker.yml
@@ -32,7 +32,7 @@ spec:
               weight: 100
 
       containers:
-        - image: faasm.azurecr.io/worker:0.14.0
+        - image: faasm.azurecr.io/worker:0.15.0
           name: faasm-worker
           ports:
             - containerPort: 8080

diff --git a/faabric b/faabric
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 black==22.3.0
 breathe==4.32.0
 docker==5.0.0
-faasmctl==0.16.0
+faasmctl==0.18.0
 flake8==3.9.2
 gunicorn==20.1.0
 invoke>=2.0.0

diff --git a/src/wasm/migration.cpp b/src/wasm/migration.cpp
@@ -72,7 +72,8 @@ void doMigrationPoint(int32_t entrypointFuncWasmOffset,
           ->pushSnapshot(snapKey, snap);
         msg.set_snapshotkey(snapKey);
 
-        // Propagate the app ID and set the _same_ message ID
+        // Propagate the group IDx and set the _same_ message ID
+        msg.set_id(call->id());
         msg.set_groupidx(call->groupidx());
 
         // If message is MPI, propagate the necessary MPI bits

diff --git a/tasks/dev.py b/tasks/dev.py
@@ -15,6 +15,7 @@
     "codegen_shared_obj",
     "func_runner",
     "func_sym",
+    "is_app_migratable",
     "local_pool_runner",
     "planner_server",
     "pool_runner",