pgpool2.git / summary / log / commit / refs

commit    a2cb29ad5dd0d8a215e952eeeaa318bbb058e9c2
Author:   Takuma Hoshiai <hoshiai@sraoss.co.jp>
Date:     Mon Jul 29 06:07:21 2019 +0000

    Fix watchdog_setup command option
    
    The mode option is incorrectly. when pgpool_setup command  is called by
    watchdog_setup command, mode option forget to set.


 src/test/regression/clean.sh   | 1 +
 src/test/regression/regress.sh | 5 +++++
 src/test/watchdog_setup        | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/test/regression/clean.sh b/src/test/regression/clean.sh
index 6b73a9579..cfbc7b814 100644
--- a/src/test/regression/clean.sh
+++ b/src/test/regression/clean.sh
@@ -3,6 +3,7 @@
 dir=`pwd`
 export TESTLIBS=$dir/libs.sh
 export PGPOOL_SETUP=$HOME/bin/pgpool_setup
+export WATCHDOG_SETUP=$HOME/bin/watchdog_setup
 log=$dir/log
 
 rm -fr $log
diff --git a/src/test/regression/regress.sh b/src/test/regression/regress.sh
index 32f71c60b..a891c2ae4 100755
--- a/src/test/regression/regress.sh
+++ b/src/test/regression/regress.sh
@@ -48,6 +48,9 @@ function install_pgpool
 	echo "moving pgpool_setup to temporary installation path ..."
         cp $dir/../pgpool_setup ${PGPOOL_PATH}/pgpool_setup
 	export PGPOOL_SETUP=$PGPOOL_PATH/pgpool_setup
+	echo "moving watchdog_setup to temporary installation path ..."
+        cp $dir/../watchdog_setup ${PGPOOL_PATH}/watchdog_setup
+	export WATCHDOG_SETUP=$PGPOOL_PATH/watchdog_setup
 }
 
 function verify_pginstallation
@@ -73,6 +76,7 @@ function export_env_vars
 		# check if pgpool is in the path
 		PGPOOL_PATH=/usr/local
 		export PGPOOL_SETUP=$HOME/bin/pgpool_setup
+		export WATCHDOG_SETUP=$HOME/bin/watchdog_setup
  	fi
 	
 	if [[ -z "$PGBENCH_PATH" ]]; then
@@ -163,6 +167,7 @@ elif [ "$MODE" = "noinstall" ]; then
 		PGPOOL_PATH=$PGPOOL_INSTALL_PATH
 	fi
         export PGPOOL_SETUP=$dir/../pgpool_setup
+        export WATCHDOG_SETUP=$dir/../watchdog_setup
 else
 	echo $MODE : Invalid mode
 	exit -1
diff --git a/src/test/watchdog_setup b/src/test/watchdog_setup
index af84cd9da..6c740f836 100755
--- a/src/test/watchdog_setup
+++ b/src/test/watchdog_setup
@@ -295,7 +295,7 @@ do
     mkdir pgpool$cnt
     cd pgpool$cnt
     port=`expr $W_BASE_PORT + \( $cnt \* $num_ports_per_node \)`
-    $PGPOOL_SETUP -p $port -pg $PGBASEPORT
+    $PGPOOL_SETUP -m $MODE -p $port -pg $PGBASEPORT
     set_watchdog_params $cnt $W_NUM_PGPOOL $W_BASE_PORT
 
     # remove "pg_ctl start" line from startall/shutdownall script in other than pgpool0


[parent: 719b4e7f467f]