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

cleanup: regex not being evaluated in quoted expression #605

Merged
merged 3 commits into from
Jul 31, 2024
Merged

cleanup: regex not being evaluated in quoted expression #605

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f71498d
cleanup: regex not being evaluated in quoted expression
ryansavino Jul 23, 2024
7708a79
cleanup: return true on the ps so script doesn't exit on failure
ryansavino Jul 23, 2024
7faa12c
formatting: replaced lingering tabs with spaces
ryansavino Jul 23, 2024
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
20 changes: 10 additions & 10 deletions misc/snapshotter/snapshotter.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ print_usage() {

wait_service_active(){
local wait_time="$1"
local sleep_time="$2"
local service="$3"
local sleep_time="$2"
local service="$3"

nsenter -t 1 -m systemctl restart $service

Expand All @@ -65,7 +65,7 @@ wait_service_active(){
return 0
else
sleep "$sleep_time"
wait_time=$((wait_time-sleep_time))
wait_time=$((wait_time-sleep_time))
fi
done

Expand Down Expand Up @@ -141,14 +141,14 @@ EOF
"${CONTAINER_RUNTIME_CONFIG}".bak
else
sed -i '/\[plugins\..*\.containerd\]/a\disable_snapshot_annotations = false' \
"${CONTAINER_RUNTIME_CONFIG}".bak
"${CONTAINER_RUNTIME_CONFIG}".bak
fi
if grep -q 'discard_unpacked_layers' "$CONTAINER_RUNTIME_CONFIG".bak; then
sed -i -e "s|discard_unpacked_layers = .*|discard_unpacked_layers = false|" \
"${CONTAINER_RUNTIME_CONFIG}".bak
else
sed -i '/\[plugins\..*\.containerd\]/a\discard_unpacked_layers = false' \
"${CONTAINER_RUNTIME_CONFIG}".bak
"${CONTAINER_RUNTIME_CONFIG}".bak
fi

if [ "${ENABLE_RUNTIME_SPECIFIC_SNAPSHOTTER}" == "false" ]; then
Expand Down Expand Up @@ -195,7 +195,7 @@ function deploy_snapshotter() {
function cleanup_snapshotter() {
echo "cleaning up snapshotter"

pid=$(ps -ef | grep containerd-nydus-grpc | grep -v grep | awk '{print $1}')
pid=$(ps -ef | grep containerd-nydus-grpc | grep -v grep | awk '{print $1}' || true)
if [ ! -z "$pid" ]; then
local ctr_args=""
if [[ " k3s k3s-agent rke2-agent rke2-server " =~ " ${CONTAINER_RUNTIME} " ]]; then
Expand All @@ -218,10 +218,10 @@ function cleanup_snapshotter() {
wait_service_active 30 5 ${CONTAINER_RUNTIME}
echo "Removing nydus-snapshotter artifacts from host"
rm -f "${SNAPSHOTTER_BINARY}"
rm -f "${NYDUS_BINARY_DIR}/nydus*"
rm -rf "${NYDUS_CONFIG_DIR}/*"
rm -rf "${SNAPSHOTTER_SCRYPT_DIR}/*"
rm -rf "${NYDUS_LIB_DIR}/*"
rm -f "${NYDUS_BINARY_DIR}"/nydus*
rm -rf "${NYDUS_CONFIG_DIR}"/*
rm -rf "${SNAPSHOTTER_SCRYPT_DIR}"/*
rm -rf "${NYDUS_LIB_DIR}"/*
}

function get_container_runtime() {
Expand Down
Loading