Commit aa9c6fe5 authored by John Skarbek's avatar John Skarbek

Merge branch 'jarv/show-errors' into 'master'

No longer suppress errors

See merge request gitlab-com/migration!199
parents d72d47c9 5d7a13db
Pipeline #89094 passed with stage
in 16 seconds
......@@ -12,6 +12,6 @@ fi
for secondary in ${POSTGRESQL_GCP_SECONDARIES[*]}
do
recovery=$(ssh_host "$secondary" "sudo gitlab-psql -t -d gitlab_repmgr -c 'select pg_is_in_recovery();' 2>/dev/null")
recovery=$(ssh_host "$secondary" "sudo gitlab-psql -t -d gitlab_repmgr -c 'select pg_is_in_recovery();'")
echo "$secondary : pg_is_in_recovery=$recovery"
done
......@@ -10,7 +10,7 @@ if [[ -z $POSTGRESQL_AZURE_PRIMARY ]]; then
echo "You must set POSTGRESQL_AZURE_PRIMARY in source_vars"
fi
recovery=$(ssh_host "$POSTGRESQL_AZURE_PRIMARY" "sudo gitlab-psql -t -d gitlab_repmgr -c 'select pg_is_in_recovery();' 2>/dev/null")
recovery=$(ssh_host "$POSTGRESQL_AZURE_PRIMARY" "sudo gitlab-psql -t -d gitlab_repmgr -c 'select pg_is_in_recovery();'")
echo "$POSTGRESQL_AZURE_PRIMARY: pg_is_in_recovery=$recovery"
echo "postgresql will be shutdown on the above host, press enter to continue"
......
......@@ -12,7 +12,7 @@ fi
for secondary in ${POSTGRESQL_AZURE_SECONDARIES[*]}
do
recovery=$(ssh_host "$secondary" "sudo gitlab-psql -t -d gitlab_repmgr -c 'select pg_is_in_recovery();' 2>/dev/null")
recovery=$(ssh_host "$secondary" "sudo gitlab-psql -t -d gitlab_repmgr -c 'select pg_is_in_recovery();'")
echo "$secondary : pg_is_in_recovery=$recovery"
done
......
......@@ -9,4 +9,4 @@ source "${UNSYMLINKED_SCRIPT_DIR}/../../../../workflow-script-commons.sh"
if [[ -z $POSTGRESQL_AZURE_PRIMARY ]]; then
echo "You must set POSTGRESQL_AZURE_PRIMARY in source_vars"
fi
ssh_host "$POSTGRESQL_AZURE_PRIMARY" "sudo gitlab-psql -t -d gitlab_repmgr -c \"update repmgr_gitlab_cluster.repl_nodes set priority=100 where name like '%g${FAILOVER_ENVIRONMENT}%'\" 2>/dev/null"
ssh_host "$POSTGRESQL_AZURE_PRIMARY" "sudo gitlab-psql -t -d gitlab_repmgr -c \"update repmgr_gitlab_cluster.repl_nodes set priority=100 where name like '%g${FAILOVER_ENVIRONMENT}%'\""
......@@ -20,7 +20,7 @@ function die() {
function ssh_host() {
# shellcheck disable=SC2068
ssh -o StrictHostKeyChecking=no $@ 2>/dev/null
ssh -o StrictHostKeyChecking=no $@
}
function PRODUCTION_ONLY() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment