Skip to content

fix(install): Increase stop timeout to 60 seconds #731

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

Merged
merged 2 commits into from
Oct 29, 2020
Merged

fix(install): Increase stop timeout to 60 seconds #731

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd096ff
fix(install): Increase stop timeout to 60 seconds
BYK Oct 29, 2020
33600da
better description
BYK Oct 29, 2020
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
11 changes: 8 additions & 3 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ MIN_DOCKER_VERSION='19.03.6'
MIN_COMPOSE_VERSION='1.24.1'
MIN_RAM=2400 # MB

# Increase the default 10 second SIGTERM timeout
# to ensure celery queues are properly drained
# between upgrades as task signatures may change across
# versions
STOP_TIMEOUT=60 # seconds
SENTRY_CONFIG_PY='sentry/sentry.conf.py'
SENTRY_CONFIG_YML='sentry/config.yml'
SYMBOLICATOR_CONFIG_YML='symbolicator/config.yml'
Expand Down Expand Up @@ -76,7 +81,7 @@ cleanup () {
fi

if [[ -z "$MINIMIZE_DOWNTIME" ]]; then
$dc stop &> /dev/null
$dc stop -t $STOP_TIMEOUT &> /dev/null
fi
}
trap_with_arg cleanup ERR INT TERM EXIT
Expand Down Expand Up @@ -224,9 +229,9 @@ if [[ -n "$MINIMIZE_DOWNTIME" ]]; then
else
# Clean up old stuff and ensure nothing is working while we install/update
# This is for older versions of on-premise:
$dc -p onpremise down --rmi local --remove-orphans
$dc -p onpremise down -t $STOP_TIMEOUT --rmi local --remove-orphans
# This is for newer versions
$dc down --rmi local --remove-orphans
$dc down -t $STOP_TIMEOUT --rmi local --remove-orphans
fi

ZOOKEEPER_SNAPSHOT_FOLDER_EXISTS=$($dcr zookeeper bash -c 'ls 2>/dev/null -Ubad1 -- /var/lib/zookeeper/data/version-2 | wc -l | tr -d '[:space:]'')
Expand Down