Commit44a9639

committed

Detect postmaster being ready by calling psql -l rathern than

checking postmaster.pid. It's not enough to check the existenceof postmaster.pid since DB recovery might be running.

1 parent6217a8c commit44a9639Copy full SHA for 44a9639

File tree

-5

lines changed

-5

lines changed

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#`
`9`	`9`	`#`
`10`	`10`	`# IDENTIFICATION`
`11`		`-# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.9 2000/02/07 04:31:10 ishii Exp $`
	`11`	`+# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.10 2000/03/14 08:34:47 ishii Exp $`
`12`	`12`	`#`
`13`	`13`	`#-------------------------------------------------------------------------`
`14`	`14`	CMDNAME=`basename$0`
`@@ -47,7 +47,7 @@ else`
`47`	`47`	`fi`
`48`	`48`
`49`	`49`	`# Check if needed programs actually exist in path`
`50`		`-forprogin postmaster`
	`50`	`+forprogin postmaster psql`
`51`	`51`	`do`
`52`	`52`	`if [!-x"$PGPATH/$prog" ]`
`53`	`53`	`then`
`@@ -245,16 +245,17 @@ if [ $op = "start" -o $op = "restart" ];then`
`245`	`245`	`$ECHO_N"Waiting for postmaster starting up.."$ECHO_C`
`246`	`246`	`while:`
`247`	`247`	`do`
`248`		`-if [!-f$PIDFILE ];then`
	`248`	`+if psql -l>/dev/null2>&1`
	`249`	`+then`
	`250`	`+break;`
	`251`	`+else`
`249`	`252`	`$ECHO_N"."$ECHO_C`
`250`	`253`	cnt=`expr$cnt + 1`
`251`	`254`	`if [$cnt-gt 60 ];then`
`252`	`255`	`$ECHO"$CMDNAME: postmaster does not start up"`
`253`	`256`	`exit 1`
`254`	`257`	`fi`
`255`	`258`	`sleep 1`
`256`		`-else`
`257`		`-break`
`258`	`259`	`fi`
`259`	`260`	`done`
`260`	`261`	`$ECHO"done."`

Comments

(0)