Skip to content

ENT-14140: psql_wrapper.sh: retry psql commands on transient failures (3.27.x) #3167

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

Open
larsewi wants to merge 1 commit into
base: 3.27.x
Choose a base branch
from
+16 −2
Open

ENT-14140: psql_wrapper.sh: retry psql commands on transient failures (3.27.x) #3167

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 16 additions & 2 deletions templates/federated_reporting/psql_wrapper.sh.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,22 @@ fi

TMP=$(mktemp)
cd /tmp
OUT=$(su - cfpostgres --command "{{{vars.sys.bindir}}}/psql --quiet --tuples-only --no-align --no-psqlrc \"$1\" --command=\"$2\"" 2> $TMP)
RETURN_CODE=$?

# psql returns 2 when the connection to the server went bad, which can happen
# transiently while postgres is being restarted. Retry a few times so that the
# wrapper doesn't fail the promise just because postgres is briefly unavailable.
MAX_ATTEMPTS=10
ATTEMPT=1
while : ; do
OUT=$(su - cfpostgres --command "{{{vars.sys.bindir}}}/psql --quiet --tuples-only --no-align --no-psqlrc \"$1\" --command=\"$2\"" 2> $TMP)
RETURN_CODE=$?
if [ $RETURN_CODE -ne 2 ] || [ $ATTEMPT -ge $MAX_ATTEMPTS ]; then
break
fi
ATTEMPT=$((ATTEMPT + 1))
sleep 3
done

ERR=$(<$TMP)

EXIT_CODE=$(echo $OUT | awk -F= '{ if ( /exit_code/ ) print $2}')
Expand Down
Loading