Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

planner: support preloading a scheduling decision #804

Merged
merged 10 commits into from
Nov 29, 2023
Merged

planner: support preloading a scheduling decision #804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
708d016
deps: bump faabric tag
csegarragonz Nov 27, 2023
add7374
gh: bump code version
csegarragonz Nov 27, 2023
54af356
faabric: bump commit to include changes that make micro-benchmark work
csegarragonz Nov 29, 2023
077f135
faasmctl: bump version to 0.16.0
csegarragonz Nov 29, 2023
1d82390
faabric: bump gh dep again
csegarragonz Nov 29, 2023
50b62cf
dist-tests: add dist test
csegarragonz Nov 29, 2023
77d35dd
faabric: bump after merge to main
csegarragonz Nov 29, 2023
c218c0f
dist-tests: make concurrent migration test use pre-loaded decisions
csegarragonz Nov 29, 2023
97f46ec
faabric: bump tagged version to have a new version of the planner
csegarragonz Nov 29, 2023
3ac5585
faabric: bump after merge to main
csegarragonz Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FAASM_VERSION=0.13.0
FAASM_CLI_IMAGE=faasm.azurecr.io/cli:0.13.0
FAASM_WORKER_IMAGE=faasm.azurecr.io/worker:0.13.0
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

FAABRIC_VERSION=0.8.0
FAABRIC_PLANNER_IMAGE=faasm.azurecr.io/planner:0.8.0
FAABRIC_VERSION=0.9.0
FAABRIC_PLANNER_IMAGE=faasm.azurecr.io/planner:0.9.0

CPP_VERSION=0.3.1
CPP_CLI_IMAGE=faasm.azurecr.io/cpp-sysroot:0.3.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/azure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.3
run: pip3 install faasmctl==0.16.0
- name: "Deploy Faasm on k8s cluster"
run: faasmctl deploy.k8s --workers=4
- name: "Build, upload and run a simple CPP function"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sgx_hw.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: self-hosted
env:
VM_BASE_NAME: gha-sgx-hw-vm
FAASM_VERSION: 0.13.0
FAASM_VERSION: 0.14.0
steps:
- name: "Check out the experiment-base code"
uses: actions/checkout@v4
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
container:
image: faasm.azurecr.io/cli:0.13.0
image: faasm.azurecr.io/cli:0.14.0
credentials:
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
container:
image: faasm.azurecr.io/cli:0.13.0
image: faasm.azurecr.io/cli:0.14.0
credentials:
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
container:
image: faasm.azurecr.io/cli:0.13.0
image: faasm.azurecr.io/cli:0.14.0
credentials:
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
Expand Down Expand Up @@ -224,18 +224,18 @@ jobs:
env:
HOST_TYPE: ci
container:
image: faasm.azurecr.io/cli:0.13.0
image: faasm.azurecr.io/cli:0.14.0
credentials:
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
services:
redis:
image: faasm.azurecr.io/redis:0.13.0
image: faasm.azurecr.io/redis:0.14.0
credentials:
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
minio:
image: faasm.azurecr.io/minio:0.13.0
image: faasm.azurecr.io/minio:0.14.0
credentials:
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
Expand Down Expand Up @@ -330,18 +330,18 @@ jobs:
env:
HOST_TYPE: ci
container:
image: faasm.azurecr.io/cli:0.13.0
image: faasm.azurecr.io/cli:0.14.0
credentials:
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
services:
redis:
image: faasm.azurecr.io/redis:0.13.0
image: faasm.azurecr.io/redis:0.14.0
credentials:
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
minio:
image: faasm.azurecr.io/minio:0.13.0
image: faasm.azurecr.io/minio:0.14.0
credentials:
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
Expand Down Expand Up @@ -434,18 +434,18 @@ jobs:
env:
HOST_TYPE: ci
container:
image: faasm.azurecr.io/cli-sgx-sim:0.13.0
image: faasm.azurecr.io/cli-sgx-sim:0.14.0
credentials:
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
services:
redis:
image: faasm.azurecr.io/redis:0.13.0
image: faasm.azurecr.io/redis:0.14.0
credentials:
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
minio:
image: faasm.azurecr.io/minio:0.13.0
image: faasm.azurecr.io/minio:0.14.0
credentials:
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
Expand Down Expand Up @@ -525,7 +525,7 @@ jobs:
env:
CONAN_CACHE_MOUNT_SOURCE: ~/.conan
FAASM_INI_FILE: ./faasm.ini
FAASM_VERSION: 0.13.0
FAASM_VERSION: 0.14.0
WASM_VM: ${{ matrix.wasm_vm }}
steps:
- uses: csegarragonz/set-compose-version-action@main
Expand All @@ -549,7 +549,7 @@ jobs:
with:
submodules: true
- name: "Install faasmctl"
run: pip3 install faasmctl==0.13.3
run: pip3 install faasmctl==0.16.0
# Cache contains architecture-specific machine code
- name: "Get CPU model name"
run: echo "CPU_MODEL=$(./bin/print_cpu.sh)" >> $GITHUB_ENV
Expand Down Expand Up @@ -593,7 +593,7 @@ jobs:
working-directory: ${{ github.workspace }}
env:
FAASM_INI_FILE: ./faasm.ini
FAASM_VERSION: 0.13.0
FAASM_VERSION: 0.14.0
PYTHON_CODEGEN: "on"
steps:
- uses: csegarragonz/set-compose-version-action@main
Expand Down Expand Up @@ -622,7 +622,7 @@ jobs:
build-type: release
if: matrix.detached == false
- name: "Install faasmctl"
run: pip3 install faasmctl==0.13.3
run: pip3 install faasmctl==0.16.0
- name: "Fetch python's CPP submodulle"
run: git submodule update --init -f third-party/cpp
working-directory: ${{ github.workspace }}/clients/python
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.13.0
0.14.0
2 changes: 1 addition & 1 deletion deploy/k8s-common/minio.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: minio-main
image: faasm.azurecr.io/minio:0.13.0
image: faasm.azurecr.io/minio:0.14.0
env:
- name: MINIO_ROOT_USER
value: "minio"
Expand Down
2 changes: 1 addition & 1 deletion deploy/k8s-common/planner.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: planner
image: faasm.azurecr.io/planner:0.8.0
image: faasm.azurecr.io/planner:0.9.0
ports:
- containerPort: 8081
env:
Expand Down
4 changes: 2 additions & 2 deletions deploy/k8s-common/redis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: master
image: faasm.azurecr.io/redis:0.13.0
image: faasm.azurecr.io/redis:0.14.0
ports:
- containerPort: 6379

Expand All @@ -28,7 +28,7 @@ metadata:
spec:
containers:
- name: master
image: faasm.azurecr.io/redis:0.13.0
image: faasm.azurecr.io/redis:0.14.0
ports:
- containerPort: 6379

Expand Down
2 changes: 1 addition & 1 deletion deploy/k8s-sgx/upload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: upload
image: faasm.azurecr.io/upload:0.13.0
image: faasm.azurecr.io/upload:0.14.0
ports:
- containerPort: 8002
- containerPort: 5000
Expand Down
2 changes: 1 addition & 1 deletion deploy/k8s-sgx/worker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
weight: 100

containers:
- image: faasm.azurecr.io/worker-sgx:0.13.0
- image: faasm.azurecr.io/worker-sgx:0.14.0
name: faasm-worker
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion deploy/k8s-wamr/upload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: upload
image: faasm.azurecr.io/upload:0.13.0
image: faasm.azurecr.io/upload:0.14.0
ports:
- containerPort: 8002
- containerPort: 5000
Expand Down
2 changes: 1 addition & 1 deletion deploy/k8s-wamr/worker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
weight: 100

containers:
- image: faasm.azurecr.io/worker:0.13.0
- image: faasm.azurecr.io/worker:0.14.0
name: faasm-worker
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion deploy/k8s/upload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: upload
image: faasm.azurecr.io/upload:0.13.0
image: faasm.azurecr.io/upload:0.14.0
ports:
- containerPort: 8002
- containerPort: 5000
Expand Down
2 changes: 1 addition & 1 deletion deploy/k8s/worker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
weight: 100

containers:
- image: faasm.azurecr.io/worker:0.13.0
- image: faasm.azurecr.io/worker:0.14.0
name: faasm-worker
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion faabric
Open in desktop
Submodule faabric updated 22 files
+2 −2 .env
+6 −6 .github/workflows/tests.yml
+1 −1 VERSION
+2 −1 cmake/ExternalProjects.cmake
+9 −0 include/faabric/planner/Planner.h
+1 −0 include/faabric/planner/PlannerApi.h
+3 −0 include/faabric/planner/PlannerClient.h
+3 −0 include/faabric/planner/PlannerServer.h
+6 −0 include/faabric/planner/PlannerState.h
+5 −0 include/faabric/util/batch.h
+9 −0 include/faabric/util/ptp.h
+80 −3 src/planner/Planner.cpp
+10 −0 src/planner/PlannerClient.cpp
+43 −1 src/planner/PlannerEndpointHandler.cpp
+23 −10 src/planner/PlannerServer.cpp
+3 −0 src/planner/planner.proto
+1 −0 src/util/CMakeLists.txt
+14 −0 src/util/batch.cpp
+20 −0 src/util/ptp.cpp
+39 −0 tests/test/planner/test_planner_client_server.cpp
+51 −0 tests/test/planner/test_planner_endpoint.cpp
+28 −0 tests/test/util/test_batch.cpp
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
black==22.3.0
breathe==4.32.0
docker==5.0.0
faasmctl==0.13.3
faasmctl==0.16.0
flake8==3.9.2
gunicorn==20.1.0
invoke>=2.0.0
Expand Down
Loading