Commit 2a62b9da authored by Stan Hu's avatar Stan Hu

Merge branch 'fix/puma_background_timeout' into 'master'

Wait up to 60 seconds instead of 30 seconds till PIDs should exist.

See merge request gitlab-org/gitlab!53153
parents 4528786e 70fa4c0b
...@@ -138,8 +138,8 @@ wait_for_pids(){ ...@@ -138,8 +138,8 @@ wait_for_pids(){
i=$((i+1)) i=$((i+1))
if [ $((i%10)) = 0 ]; then if [ $((i%10)) = 0 ]; then
echo -n "." echo -n "."
elif [ $((i)) = 301 ]; then elif [ $((i)) = 601 ]; then
echo "Waited 30s for the processes to write their pids, something probably went wrong." echo "Waited 60s for the processes to write their pids, something probably went wrong."
exit 1; exit 1;
fi fi
done done
......
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