Fix pg_controldata getopt. Fix some mistakes in pgpro_upgrade

vbwagner · vbwagner · commit 80cb26b8ee13 · 2017-08-29T12:00:59.000+03:00
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
@@ -122,7 +122,7 @@ main(int argc, char *argv[])
 		}
 	}
 
-	while ((c = getopt(argc, argv, "D:c:m")) != -1)
+	while ((c = getopt(argc, argv, "D:cm")) != -1)
 	{
 		switch (c)
 		{
diff --git a/src/pgpro-upgrade/pgpro_upgrade b/src/pgpro-upgrade/pgpro_upgrade
@@ -29,7 +29,7 @@ esac
 
 # Check the catalog version
 CATALOG_VERSION_NO=2016081311
-MAJORVER=$9.6
+MAJORVER=9.6
 CATVER=`${PGBIN}pg_controldata|sed -n '/Catalog version number:/s/^.*: *//p'`
 if [ "$CATVER" != $CATALOG_VERSION_NO ]; then
 	if [ ! -f "${PGDATA}/global/pg_control" ]; then
@@ -39,9 +39,13 @@ if [ "$CATVER" != $CATALOG_VERSION_NO ]; then
 		s/'.*$//
 		p}" /etc/postgresql/9.6/main/postgresql.conf`
 		if [ -z "$PGDATA" -o ! -f "${PGDATA}/global/pg_control" ]; then
-			echo "Cannot find valid database in $PGDATA" 2>&1;
+			echo "Cannot find valid database in $PGDATA" 1>&2;
 			exit 1
 		fi
+		if [ -f "$PGDATA/postmaster.pid" ]; then
+			echo "postmaster.pid exists. Is another backend running on $PGDATA" 1>&2; 
+			exit 1;
+		fi
 	fi
 	# Fix pg_control file
 	"${PGBIN}pg_controldata" -c
@@ -52,7 +56,7 @@ if [ "$CATVER" != $CATALOG_VERSION_NO ]; then
 		(cd $i; mv PG_${MAJORVER}_$CATVER PG_${MAJORVER}_$CATALOG_VERSION_NO)
 	 done
 	)
-	if [ -n "$SAVE_PGDATA" ] then
+	if [ -n "$SAVE_PGDATA" ]; then
 		PGDATA="$SAVE_PGDATA"
 	fi
 fi
