Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

Check gvisor on startup of run.sh, and clean up scripts related to gvisor flags (#760)

Browse Source 
* Check gvisor on startup
* Clear up get_checkpoint_path.sh script, so it doesn't hurt to run it twice
This commit is contained in:
Dmitry 2023-11-27 16:20:43 -05:00 committed by GitHub
parent 3e39c048c7
commit 6282558abd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sandbox/gvisor/get_checkpoint_path.sh
View File

@ -31,7 +31,7 @@ function check_gvisor {
return return
fi fi
# Check if a trivial command works under gvisor with the proposed flags. # Check if a trivial command works under gvisor with the proposed flags.
if runsc --network none "$@" do true 2> /dev/null; then if runsc --network none "$@" "do" true 2> /dev/null; then
export GVISOR_FLAGS="$@" export GVISOR_FLAGS="$@"
export GVISOR_AVAILABLE=1 export GVISOR_AVAILABLE=1
fi fi
@ -40,9 +40,9 @@ function check_gvisor {
check_gvisor --unprivileged --ignore-cgroups check_gvisor --unprivileged --ignore-cgroups
check_gvisor --unprivileged check_gvisor --unprivileged
# If we can't use --unprivileged, stick with --rootless and no checkpoint # If we can't use --unprivileged, stick with --rootless. We will not make a checkpoint.
if [[ -z "$GVISOR_FLAGS" ]]; then check_gvisor --rootless
check_gvisor --rootless
else if [[ "$GVISOR_FLAGS" =~ "-unprivileged" ]]; then
export GRIST_CHECKPOINT=/tmp/engine_$(echo $PWD | sed "s/[^a-zA-Z0-9]/_/g") export GRIST_CHECKPOINT=/tmp/engine_$(echo $PWD | sed "s/[^a-zA-Z0-9]/_/g")
fi fi

11
sandbox/run.sh
View File

@ -3,8 +3,17 @@
set -e set -e
if [[ "$GRIST_SANDBOX_FLAVOR" = "gvisor" ]]; then if [[ "$GRIST_SANDBOX_FLAVOR" = "gvisor" ]]; then
./sandbox/gvisor/update_engine_checkpoint.sh
source ./sandbox/gvisor/get_checkpoint_path.sh source ./sandbox/gvisor/get_checkpoint_path.sh
# Check GVISOR_FLAGS we ended up with. Don't ignore the output, it may be helpful in troubleshooting.
if runsc --network none $GVISOR_FLAGS "do" true; then
echo "gvisor check ok (flags: ${GVISOR_FLAGS})"
else
echo "gvisor check failed (flags: ${GVISOR_FLAGS}); consider different GVISOR_FLAGS or GRIST_SANDBOX_FLAVOR"
exit 1
fi
./sandbox/gvisor/update_engine_checkpoint.sh
fi fi
NODE_PATH=_build:_build/stubs:_build/ext node _build/stubs/app/server/server.js NODE_PATH=_build:_build/stubs:_build/ext node _build/stubs/app/server/server.js