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

Examples: only terminate vtadmin if it was started #13433

Merged
merged 14 commits into from
Jul 5, 2023
Merged

Examples: only terminate vtadmin if it was started #13433

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
014cbbe
Do not error stopping vtadmin web and api if pidd files do not exist.
jfg956 Jul 3, 2023
0487e79
Get rid of code duplication in vtadmin-down.sh.
jfg956 Jul 3, 2023
1a3da36
Use bash test
mattlord Jul 5, 2023
66f60eb
Use SIGTERM and wait for process to end
mattlord Jul 5, 2023
4a589a4
Validate function parameters
mattlord Jul 5, 2023
c8a7e47
Add license header
mattlord Jul 5, 2023
966841b
Move vtadmin stop function to utils
mattlord Jul 5, 2023
730edbe
Generalize simple process shutdown with timeout
mattlord Jul 5, 2023
e11d1c5
Correct output
mattlord Jul 5, 2023
b8ffa85
Remove now redundant log message
mattlord Jul 5, 2023
be72f81
Corrections
mattlord Jul 5, 2023
c78650d
Add missing license header to modified file
mattlord Jul 5, 2023
8bcf746
Only check PID if we killed it
mattlord Jul 5, 2023
f928d17
Remove mix of spaces and tabs
mattlord Jul 5, 2023
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
25 changes: 25 additions & 0 deletions examples/common/lib/utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,31 @@ function wait_for_healthy_shard() {
wait_for_shard_vreplication_engine "${keyspace}" "${shard}"
}

# Stop the specified vtadmin binary name using the provided PID file.
# Example:
# stop_vtadmin_process "vtadmin-web" "$VTDATAROOT/tmp/vtadmin-web.pid"
function stop_vtadmin_process() {
jfg956 marked this conversation as resolved.
Show resolved Hide resolved
if [[ -z ${1} || -z ${2} ]]; then
fail "A binary name and PID file must be specified when attempting to shutdown vtadmin"
mattlord marked this conversation as resolved.
Show resolved Hide resolved
fi

local binary_name="${1}"
local pidfile="${2}"
local pid=""

if [[ -e "${pidfile}" ]]; then
pid=$(cat "${pidfile}")
mattlord marked this conversation as resolved.
Show resolved Hide resolved
echo "Stopping ${binary_name}..."
kill "${pid}"
# Wait for the process to terminate
while ps -p "${pid}" > /dev/null; do
sleep 1
done
else
echo "Skipping stopping ${binary_name} because the specified PID file (${pidfile}) does not exist."
fi
}

# Print error message and exit with error code.
function fail() {
echo "ERROR: ${1}"
Expand Down
24 changes: 2 additions & 22 deletions examples/common/scripts/vtadmin-down.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,5 @@

mattlord marked this conversation as resolved.
Show resolved Hide resolved
source "$(dirname "${BASH_SOURCE[0]:-$0}")/../env.sh"

function stop_vtadmin() {
local name="$1"
local file="$2"

if [[ -z ${1} || -z ${2} ]]; then
fail "A binary name and PID file must be specified when attempting to shutdown vtadmin"
fi
if [[ -e "$file" ]]; then
echo "Stopping $name..."
local pid=$(cat "$file")
kill $pid
# Wait for the process to terminate
while ps -p $pid > /dev/null; do
sleep 1
done
else
echo "Skipping stopping $name because no pid file."
fi
}

stop_vtadmin "vtadmin-web" "$VTDATAROOT/tmp/vtadmin-web.pid"
stop_vtadmin "vtadmin-api" "$VTDATAROOT/tmp/vtadmin-api.pid"
stop_vtadmin_process "vtadmin-web" "$VTDATAROOT/tmp/vtadmin-web.pid"
stop_vtadmin_process "vtadmin-api" "$VTDATAROOT/tmp/vtadmin-api.pid"