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.

diff --git a/src/test/regression/clean.sh b/src/test/regression/clean.sh
index 6b73a957901be145c100cdef285c2364114e7105..cfbc7b8141970afc2e046e4b2f978d18fb97c50d 100644 (file)
--- 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 110d305d603661ca707c2d45f4c66359f0b3ed20..ea9b5c0f33f1b091833553e0c1860ea9521cd833 100755 (executable)
--- a/src/test/regression/regress.sh
+++ b/src/test/regression/regress.sh
@@ -47,6 +47,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
@@ -72,6 +75,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
@@ -160,6 +164,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 af84cd9dad5bc02923bafefc41c6c66ef2c74453..6c740f8366d972d7c192bc74de330a0cdd724a3c 100755 (executable)
--- 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