pgpool2.git / summary / log / commit / refs

commit    b8a1dfe54c8172107ca60cbd58efd5a868a9bb78
Author:   Yugo Nagata <nagata@sraoss.co.jp>
Date:     Wed Nov 04 07:28:23 2015 +0000

    Fix pgpool_setup to use DEFAULT_PGSOCKET_DIR in pg_config_manual.h
    
    Some Postgresql rpms define DEFAULT_PGSOCKET_DIR as /tmp, others as
    /var/run/postgresql. This affects not only PostgreSQL server but
    also libpq and psql.
    
    This is a workaround for regression test. We might have to fix
    pgpool-II code to control default value of backend_hostname*.


 src/test/pgpool_setup | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/test/pgpool_setup b/src/test/pgpool_setup
index 9ab675652..ec08476c6 100755
--- a/src/test/pgpool_setup
+++ b/src/test/pgpool_setup
@@ -80,6 +80,11 @@ INITDB=$PGBIN/initdb
 PG_CTL=$PGBIN/pg_ctl
 PSQL=$PGBIN/psql
 
+# PostgreSQL socket directory
+INCLUDE_DIR=`$PGBIN/pg_config --includedir`
+PG_CONFIG_MANUAL=$INCLUDE_DIR/pg_config_manual.h
+PGSOCKET_DIR=`cat $PG_CONFIG_MANUAL | awk '/DEFAULT_PGSOCKET_DIR/ {print $3}' | tr -d '"'`
+
 # pgpool-II configuration file localtion.
 CONF=$BASEDIR/etc/pgpool.conf
 # failover script
@@ -276,8 +281,6 @@ function set_postgresql_conf
 	echo "log_truncate_on_rotation = on" >> $PGCONF
 	echo "log_statement = 'all'" >> $PGCONF
 	echo "max_prepared_transactions = 10" >> $PGCONF
-	# for rhel7 rpm
-	echo "unix_socket_directories = '/tmp' >> $PGCONF
 
 	if [ $MODE = "s" ];then
 		echo "hot_standby = on" >> $PGCONF
@@ -760,7 +763,7 @@ EOF
 	PORT=$BASEPORT
 	CLUSTER="data"`expr $n`
 	CLUSTERDIR=$BASEDIR/$CLUSTER
-	echo "backend_hostname$n = ''" >> $CONF
+	echo "backend_hostname$n = '$PGSOCKET_DIR'" >> $CONF
 	echo "backend_port$n = $PORT" >> $CONF
 	echo "backend_weight$n = 1" >> $CONF
 	echo "backend_data_directory$n = '$CLUSTERDIR'" >> $CONF
@@ -777,7 +780,7 @@ EOF
 		do
 		# set up pgpool.conf
 			PORT=`expr $PORT + 1`
-			echo "backend_hostname$n = ''" >> $CONF
+			echo "backend_hostname$n = '$PGSOCKET_DIR'" >> $CONF
 			echo "backend_port$n = $PORT" >> $CONF
 			echo "backend_weight$n = 1" >> $CONF
 			CLUSTER="data"`expr $n`
@@ -817,7 +820,7 @@ else
 	while [ $n -lt $NUMCLUSTERS ]
 	do
 	# set up pgpool.conf
-		echo "backend_hostname$n = ''" >> $CONF
+		echo "backend_hostname$n = '$PGSOCKET_DIR'" >> $CONF
 		echo "backend_port$n = $PORT" >> $CONF
 		echo "backend_weight$n = 1" >> $CONF
 		CLUSTER="data"`expr $n`


[parent: 2f60dc5f6851]