570ca85cd8
This adds a local mariadb container to the gerrit host to hold the accountPatchReviewDb database. This is inspired by a few things - since migration to NoteDB, there is only one table left where Gerrit records what files have been reviewed for a change. This logically scales with the number of reviews users are doing. Pulling the stats on this, we can see since the NoteDB upgrade this went from a very busy database (~300 queries/70 commits per second) to barely registering one hit per second : https://imgur.com/a/QGJV7Fw Thus separating the db to an external host for performance reasons is not a large concern any more. - emperically we've done a bad job in keeping the existing hosted db up-to-date; it's still running mysql 5.1 and we have been hit by bugs such as the one referenced in-line which silently drops backups. - The other gerrit option is to use an on-disk H2 database. This is certainly an option, however you need special tools to interact with it for migration, etc. and it's not safe to backup from files on disk (as opposed to mysqldump). Upstream advice is unclear, and varies between H2 being a performance bottleneck to this being ephemeral data that users don't care about. We know how to admin mariadb/mysql and this allows us to migrate and backup data, so seems like the best choice. - we have a pressing need to update the server to a new operating system. Running the db alongside the gerrit instance minimises fiddling we have to do manging connections to and migrating the hosted db systems. - related to that, we are tending towards more provider independence for control-plane servers. A hosted database product is not always provided, so this gives us more flexibility in moving things around. - the main concern here is memory usage. "docker stats" reports a quiescent container, freshly started on a 8GB host: gerrit-compose_mariadb_1 67.32MiB After loading a copy of the production table, and then dumping it back to a file the same container reports: gerrit-compose_mariadb_1 462.6MiB The existing remote mysql configuration path remains mostly the same. We move the gerrit startup into a script rather than a CMD so we can call it after a "wait for db" script in the mariadb_container case (this is the reccommeded way to enforce ordering [1]). Backups of the local container need different dump commands; backups are relocated to a new file and updated. Testing is converted to use this rather than a local H2 database. [1] https://docs.docker.com/compose/startup-order/ Change-Id: Iec981ef3c2e38889f91e9759e66295dbfb499c2e
213 lines
6.3 KiB
Bash
Executable File
213 lines
6.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
# See
|
|
# https://github.com/vishnubob/wait-for-it
|
|
# https://tracker.debian.org/pkg/wait-for-it
|
|
|
|
# The MIT License (MIT)
|
|
# Copyright (c) 2016 Giles Hall
|
|
|
|
# Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
# this software and associated documentation files (the "Software"), to deal in
|
|
# the Software without restriction, including without limitation the rights to
|
|
# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
# of the Software, and to permit persons to whom the Software is furnished to do
|
|
# so, subject to the following conditions:
|
|
|
|
# The above copyright notice and this permission notice shall be included in all
|
|
# copies or substantial portions of the Software.
|
|
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
# SOFTWARE.
|
|
|
|
# Use this script to test if a given TCP host/port are available
|
|
|
|
WAITFORIT_cmdname=${0##*/}
|
|
|
|
echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
|
|
|
|
usage()
|
|
{
|
|
cat << USAGE >&2
|
|
Usage:
|
|
$WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
|
|
-h HOST | --host=HOST Host or IP under test
|
|
-p PORT | --port=PORT TCP port under test
|
|
Alternatively, you specify the host and port as host:port
|
|
-s | --strict Only execute subcommand if the test succeeds
|
|
-q | --quiet Don't output any status messages
|
|
-t TIMEOUT | --timeout=TIMEOUT
|
|
Timeout in seconds, zero for no timeout
|
|
-- COMMAND ARGS Execute command with args after the test finishes
|
|
USAGE
|
|
exit 1
|
|
}
|
|
|
|
wait_for()
|
|
{
|
|
if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
|
|
echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
|
|
else
|
|
echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
|
|
fi
|
|
WAITFORIT_start_ts=$(date +%s)
|
|
while true; do
|
|
if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
|
|
nc -z $WAITFORIT_HOST $WAITFORIT_PORT
|
|
WAITFORIT_result=$?
|
|
else
|
|
(echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
|
|
WAITFORIT_result=$?
|
|
fi
|
|
if [[ $WAITFORIT_result -eq 0 ]]; then
|
|
WAITFORIT_end_ts=$(date +%s)
|
|
echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
|
|
break
|
|
fi
|
|
sleep 1
|
|
done
|
|
return $WAITFORIT_result
|
|
}
|
|
|
|
wait_for_wrapper()
|
|
{
|
|
# In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
|
|
if [[ $WAITFORIT_QUIET -eq 1 ]]; then
|
|
timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
|
|
else
|
|
timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
|
|
fi
|
|
WAITFORIT_PID=$!
|
|
trap "kill -INT -$WAITFORIT_PID" INT
|
|
wait $WAITFORIT_PID
|
|
WAITFORIT_RESULT=$?
|
|
if [[ $WAITFORIT_RESULT -ne 0 ]]; then
|
|
echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
|
|
fi
|
|
return $WAITFORIT_RESULT
|
|
}
|
|
|
|
# process arguments
|
|
while [[ $# -gt 0 ]]; do
|
|
case "$1" in
|
|
*:* )
|
|
WAITFORIT_hostport=(${1//:/ })
|
|
WAITFORIT_HOST=${WAITFORIT_hostport[0]}
|
|
WAITFORIT_PORT=${WAITFORIT_hostport[1]}
|
|
shift 1
|
|
;;
|
|
--child)
|
|
WAITFORIT_CHILD=1
|
|
shift 1
|
|
;;
|
|
-q | --quiet)
|
|
WAITFORIT_QUIET=1
|
|
shift 1
|
|
;;
|
|
-s | --strict)
|
|
WAITFORIT_STRICT=1
|
|
shift 1
|
|
;;
|
|
-h)
|
|
WAITFORIT_HOST="$2"
|
|
if [[ $WAITFORIT_HOST == "" ]]; then
|
|
break;
|
|
fi
|
|
shift 2
|
|
;;
|
|
--host=*)
|
|
WAITFORIT_HOST="${1#*=}"
|
|
shift 1
|
|
;;
|
|
-p)
|
|
WAITFORIT_PORT="$2"
|
|
if [[ $WAITFORIT_PORT == "" ]]; then
|
|
break;
|
|
fi
|
|
shift 2
|
|
;;
|
|
--port=*)
|
|
WAITFORIT_PORT="${1#*=}"
|
|
shift 1
|
|
;;
|
|
-t)
|
|
WAITFORIT_TIMEOUT="$2"
|
|
if [[ $WAITFORIT_TIMEOUT == "" ]]; then
|
|
break;
|
|
fi
|
|
shift 2
|
|
;;
|
|
--timeout=*)
|
|
WAITFORIT_TIMEOUT="${1#*=}"
|
|
shift 1
|
|
;;
|
|
--)
|
|
shift
|
|
WAITFORIT_CLI=("$@")
|
|
break
|
|
;;
|
|
--help)
|
|
usage
|
|
;;
|
|
*)
|
|
echoerr "Unknown argument: $1"
|
|
usage
|
|
;;
|
|
esac
|
|
done
|
|
|
|
if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
|
|
echoerr "Error: you need to provide a host and port to test."
|
|
usage
|
|
fi
|
|
|
|
WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
|
|
WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
|
|
WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
|
|
WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
|
|
|
|
# Check to see if timeout is from busybox?
|
|
WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
|
|
WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
|
|
|
|
WAITFORIT_BUSYTIMEFLAG=""
|
|
if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
|
|
WAITFORIT_ISBUSY=1
|
|
# Check if busybox timeout uses -t flag
|
|
# (recent Alpine versions don't support -t anymore)
|
|
if timeout &>/dev/stdout | grep -q -e '-t '; then
|
|
WAITFORIT_BUSYTIMEFLAG="-t"
|
|
fi
|
|
else
|
|
WAITFORIT_ISBUSY=0
|
|
fi
|
|
|
|
if [[ $WAITFORIT_CHILD -gt 0 ]]; then
|
|
wait_for
|
|
WAITFORIT_RESULT=$?
|
|
exit $WAITFORIT_RESULT
|
|
else
|
|
if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
|
|
wait_for_wrapper
|
|
WAITFORIT_RESULT=$?
|
|
else
|
|
wait_for
|
|
WAITFORIT_RESULT=$?
|
|
fi
|
|
fi
|
|
|
|
if [[ $WAITFORIT_CLI != "" ]]; then
|
|
if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
|
|
echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
|
|
exit $WAITFORIT_RESULT
|
|
fi
|
|
exec "${WAITFORIT_CLI[@]}"
|
|
else
|
|
exit $WAITFORIT_RESULT
|
|
fi
|