pgpool2.git / summary / log / commit / refs

commit    b85b7d81d92e2969fc12f621ac03f8c58f2fa3fa
Author:   Tatsuo Ishii <ishii@postgresql.org>
Commit:   Muhammad Usama <m.usama@gmail.com>
Date:     Sat Jan 18 11:50:10 2014 +0000

    Add raw mode support.
    
    Try "pgpool_setup -m n".


 src/test/pgpool_setup | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/test/pgpool_setup b/src/test/pgpool_setup
index c886ee803..1fab33753 100755
--- a/src/test/pgpool_setup
+++ b/src/test/pgpool_setup
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (c) 2013 PgPool Global Development Group
+# Copyright (c) 2013-2014 PgPool Global Development Group
 #
 # Permission to use, copy, modify, and distribute this software and
 # its documentation for any purpose and without fee is hereby
@@ -16,10 +16,11 @@
 # directory for *testing* purpose.
 # Do not use this tool for production environment!
 #
-# usage: pgpool_setup [-m r|s][-n num_clusters][-p base_port][--no-stop]
+# usage: pgpool_setup [-m r|s|n][-n num_clusters][-p base_port][--no-stop]
 # -m s: create an installation as streaming replication mode.
 # (the default)
 # -m r: create an installation as native replication mode.
+# -m n: create an installation as raw mode.
 # -n num_clusters: create num_clusters PostgreSQL database cluster nodes
 # -p base_port: specify base port. The first PostgreSQL node's port is
 #  base_port. Second PostgreSQL node's port is base_port+1... nth
@@ -278,7 +279,7 @@ function set_postgresql_conf
 		echo "max_wal_senders = 2" >> $PGCONF
 		echo "archive_mode = on" >> $PGCONF
 		echo "archive_command = 'cp %p $BASEDIR/archivedir/%f </dev/null'" >> $PGCONF
-	else
+	elif [ $MODE = 'r' ];then
 		echo "wal_level = archive" >> $PGCONF
 		echo "archive_mode = on" >> $PGCONF
 		echo "archive_command = 'cp %p $BASEDIR/archivedir/%f </dev/null'" >> $PGCONF
@@ -539,12 +540,12 @@ function wait_for_pgpool_reload {
 ################################################################################
 function usage()
 {
-	echo "usage: $0 [-m r|s] [-n num_clusters] [-p base_port] [--no-stop] ";exit 1
+	echo "usage: $0 [-m r|s|n] [-n num_clusters] [-p base_port] [--no-stop] ";exit 1
 }
 
 #-------------------------------------------
 # Argument check
-# usage: $0 [-m r|s] [-n num_clusters] [-p base_port] [--no-stop]"
+# usage: $0 [-m r|s|n] [-n num_clusters] [-p base_port] [--no-stop]"
 #-------------------------------------------
 #
 # default mode is streaming replication mode
@@ -558,6 +559,7 @@ do
 		case $1 in
 			r ) MODE="r";;
 			s ) MODE="s";;
+			n ) MODE="n";;
 			* ) usage;;
 		esac
 	elif [ $1 = "-n" ];then
@@ -586,6 +588,9 @@ case $MODE in
 	s ) MODENAME="streaming replication mode"
 		SAMPLE_CONF=$PGPOOLDIR/pgpool.conf.sample-stream
 		;;
+	n ) MODENAME="raw mode"
+		SAMPLE_CONF=$PGPOOLDIR/pgpool.conf.sample
+		;;
 esac
 
 #-------------------------------------------
@@ -659,7 +664,7 @@ do
 	# create basebackup.sh
 	if [ $MODE = 's' ];then
 		create_basebackup_stream $CLUSTERDIR >&5 2>&1
-	else
+	elif [ $MODE = 'r' ];then
 		create_basebackup_replication $CLUSTERDIR >&5 2>&1
 		create_pgpool_recovery_pitr $CLUSTERDIR >&5 2>&1
 	fi
@@ -799,7 +804,7 @@ else
 	echo "done."
 fi
 
-if [ $MODE = "r" ];then
+if [ $MODE = "r" -o $MODE = "n" ];then
 	echo "create extensions"
 	$PSQL -p $PGPOOL_PORT template1 >&5 2>&1 <<EOF
 CREATE EXTENSION pgpool_regclass;


[parent: c43149d15819]