From 0a367784cb90fdc2e18b7d0de752e8a274497f74 Mon Sep 17 00:00:00 2001 From: "Hui, Chunyang" Date: Mon, 21 Nov 2022 20:09:16 +0800 Subject: [PATCH] Fix grpc pingpong test --- .github/workflows/demo_test.yml | 3 ++- demos/golang/grpc_pingpong/run_ping_on_occlum.sh | 11 +++++------ demos/golang/grpc_pingpong/run_pong_on_occlum.sh | 11 +++++------ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/demo_test.yml b/.github/workflows/demo_test.yml index 96662fff..5d1a4e96 100644 --- a/.github/workflows/demo_test.yml +++ b/.github/workflows/demo_test.yml @@ -76,8 +76,9 @@ jobs: - name: Run Golang grpc ping test run: | sleep ${{ env.nap_time }}; - docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/golang/grpc_pingpong && SGX_MODE=SIM ./run_ping_on_occlum.sh" & + docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/golang/grpc_pingpong && SGX_MODE=SIM ./run_ping_on_occlum.sh" + # This is for the go web_server test - name: Curl test run: | sleep ${{ env.nap_time }}; diff --git a/demos/golang/grpc_pingpong/run_ping_on_occlum.sh b/demos/golang/grpc_pingpong/run_ping_on_occlum.sh index 19dc0356..68b202f8 100755 --- a/demos/golang/grpc_pingpong/run_ping_on_occlum.sh +++ b/demos/golang/grpc_pingpong/run_ping_on_occlum.sh @@ -16,12 +16,11 @@ fi rm -rf occlum_ping_instance && mkdir occlum_ping_instance cd occlum_ping_instance occlum init -new_json="$(jq '.resource_limits.user_space_size = "2560MB" | - .resource_limits.kernel_space_heap_size="320MB" | - .resource_limits.kernel_space_stack_size="10MB" | - .process.default_stack_size = "40MB" | - .process.default_heap_size = "320MB" | - .process.default_mmap_size = "960MB" ' Occlum.json)" && \ +new_json="$(jq '.resource_limits.user_space_size = "800MB" | + .resource_limits.kernel_space_heap_size="40MB" | + .resource_limits.kernel_space_stack_size="1MB" | + .process.default_stack_size = "1MB" | + .process.default_heap_size = "20MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json # 2. Copy program into Occlum Workspace and build diff --git a/demos/golang/grpc_pingpong/run_pong_on_occlum.sh b/demos/golang/grpc_pingpong/run_pong_on_occlum.sh index 1e2c3bed..11d5e2e3 100755 --- a/demos/golang/grpc_pingpong/run_pong_on_occlum.sh +++ b/demos/golang/grpc_pingpong/run_pong_on_occlum.sh @@ -16,12 +16,11 @@ fi rm -rf occlum_pong_instance && mkdir occlum_pong_instance cd occlum_pong_instance occlum init -new_json="$(jq '.resource_limits.user_space_size = "2560MB" | - .resource_limits.kernel_space_heap_size="320MB" | - .resource_limits.kernel_space_stack_size="10MB" | - .process.default_stack_size = "40MB" | - .process.default_heap_size = "320MB" | - .process.default_mmap_size = "960MB" ' Occlum.json)" && \ +new_json="$(jq '.resource_limits.user_space_size = "800MB" | + .resource_limits.kernel_space_heap_size="40MB" | + .resource_limits.kernel_space_stack_size="1MB" | + .process.default_stack_size = "1MB" | + .process.default_heap_size = "20MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json # 2. Copy program into Occlum Workspace and build