Recognize terminated runsc gofers during teardown
This commit is contained in:
parent
8cef037fa3
commit
6c570da60e
2 changed files with 97 additions and 8 deletions
|
|
@ -59,7 +59,7 @@ if readelf -l "$sandbox_init" | grep -q 'Requesting program interpreter' ||
|
|||
fi
|
||||
install -m 755 "$sandbox_init" "$install_dir/lazaret-sandbox-init"
|
||||
|
||||
runsc_build_id=34ed2f67fc55ef97a0b1755b4a94ed682f6aae57a41ce27eceb66ea366185ca7
|
||||
runsc_build_id=9e711e005f13402e728a0c3ada3fdc67a38918da31f720e5be1006edc4272a51
|
||||
runsc_name="lazaret-runsc-$runsc_build_id"
|
||||
runsc_source="$root/.lazaret/bin/$runsc_name"
|
||||
runsc_destination="$install_dir/$runsc_name"
|
||||
|
|
|
|||
|
|
@ -9,18 +9,20 @@ patch_files=(
|
|||
"$root/patches/gvisor-9f8f6c917-private-ownership.patch"
|
||||
"$root/patches/gvisor-9f8f6c917-per-description-file-handles.patch"
|
||||
"$root/patches/gvisor-9f8f6c917-hostinet-recv-flags.patch"
|
||||
"$root/patches/gvisor-9f8f6c917-gofer-zombie-state.patch"
|
||||
)
|
||||
patch_checksums=(
|
||||
541420eece9ec7efbef156bdb726744ead6b4d991d41c5560f4fdfe83fb2357a
|
||||
79a8c98502d3bb7c254ffb0885dbd26afffac227d04a0091ff91383df0842561
|
||||
2403efb81df3185145d18ebdf8d511252fbc2fb414bae4746d7fe471ec4ea9d9
|
||||
d3f49a22fe60955d422f63557bc16907fdf65dff368dff296af5535a67b76e74
|
||||
2b7c7444dc56ff47e63af951c24d1dd30092c278c4cba7a6dcd3c3f1062c3206
|
||||
)
|
||||
patch_digest=bd37be0b8303f3a1248abc1fc898bb2cc513bad1404743428f8e9be99cbafc84
|
||||
patch_digest=669b658a29c006d7fd0a472f959265ee79f1fbc78673d0cdc3b31a7721afab98
|
||||
bazel_version=8.3.1
|
||||
module_lock="$root/patches/gvisor-9f8f6c917-MODULE.bazel.lock"
|
||||
module_checksum=8402c7beb4baf2c666f4b78e400ea3f15514b56117598c2cb5411d6a35208d34
|
||||
build_id=34ed2f67fc55ef97a0b1755b4a94ed682f6aae57a41ce27eceb66ea366185ca7
|
||||
build_id=9e711e005f13402e728a0c3ada3fdc67a38918da31f720e5be1006edc4272a51
|
||||
archive="$root/.lazaret/cache/gvisor-$revision.tar.gz"
|
||||
source="$root/.lazaret/vendor/gvisor-$build_id"
|
||||
binary="$root/.lazaret/bin/lazaret-runsc-$build_id"
|
||||
|
|
@ -93,6 +95,8 @@ fi
|
|||
if [[ "$mode" == test ]]; then
|
||||
make -C "$source" test \
|
||||
TARGETS='//pkg/sentry/fsimpl/gofer:gofer_test //runsc/fsgofer:lisafs_test //test/syscalls:socket_ip_tcp_generic_loopback_test_native //test/syscalls:socket_ip_tcp_generic_loopback_test_runsc_systrap_hostnet'
|
||||
make -C "$source" test OPTIONS='--test_filter=TestProcessStateIsTerminal' \
|
||||
TARGETS=//runsc/container:container_test
|
||||
fi
|
||||
if [[ "$mode" != source ]]; then
|
||||
make -C "$source" build TARGETS=//runsc:runsc
|
||||
|
|
|
|||
Loading…
Reference in a new issue