From: <ta...@us...> - 2007-11-30 09:53:59
|
Revision: 3878 http://gfarm.svn.sourceforge.net/gfarm/?rev=3878&view=rev Author: tatebe Date: 2007-11-30 01:54:01 -0800 (Fri, 30 Nov 2007) Log Message: ----------- wait for postmaster to start up more robustly Modified Paths: -------------- gfarm/branches/gfarm_v2/gftool/config-gfarm/config-gfarm.postgresql Modified: gfarm/branches/gfarm_v2/gftool/config-gfarm/config-gfarm.postgresql =================================================================== --- gfarm/branches/gfarm_v2/gftool/config-gfarm/config-gfarm.postgresql 2007-11-28 09:12:05 UTC (rev 3877) +++ gfarm/branches/gfarm_v2/gftool/config-gfarm/config-gfarm.postgresql 2007-11-30 09:54:01 UTC (rev 3878) @@ -385,9 +385,6 @@ -D $BACKEND_DATA_DIR -l $BACKEND_DATA_DIR/logfile start _EOF_ - # wait until portmaster actually starts. XXX are 10 seconds enough? - sleep 10 - case "$BACKEND_VERSION" in [1-7].*|8.0) createuser_option=;; @@ -402,6 +399,18 @@ unset PGDATABASE PGUSER PGPASSWORD PGSERVICE unset PGREALM PGOPTIONS PGSSLMODE PGREQUIRESSL PGCONNECT_TIMEOUT + # wait for postmaster to start up + iter=0 + while ! $PGSQL_BINDIR/psql -l >/dev/null 2>&1 + do + iter=\`expr \$iter + 1\` + if [ \$iter -gt 6 ]; then + echo give up + exit 1 + fi + echo wait 5 seconds for postmaster to start up + sleep 5 + done $PGSQL_BINDIR/createuser -q $createuser_option -A -D $BACKEND_USER $PGSQL_BINDIR/createdb -q $DB_NAME # $PGSQL_BINDIR/psql -q \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |