From 6e71926d8bd010f557d4cc9f7d6b4f2c0e64c55e Mon Sep 17 00:00:00 2001 From: Tatsuo Ishii Date: Fri, 1 Sep 2017 13:19:27 +0900 Subject: [PATCH] Add "slony mode" to pgpool_setup. --- doc.ja/src/sgml/ref/pgpool_setup.sgml | 6 +++--- doc/src/Makefile.in | 4 ++-- doc/src/sgml/ref/pgpool_setup.sgml | 4 ++-- src/test/pgpool_setup | 11 ++++++++--- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/doc.ja/src/sgml/ref/pgpool_setup.sgml b/doc.ja/src/sgml/ref/pgpool_setup.sgml index 9a3878b52..05628be25 100644 --- a/doc.ja/src/sgml/ref/pgpool_setup.sgml +++ b/doc.ja/src/sgml/ref/pgpool_setup.sgml @@ -91,12 +91,12 @@ Pgpool-II documentation 動作モードを指定します。modeは - r (ネイティブレプリケーションモード), s (ストリーミングレプリケーションモード)、n (raw モード)、またはl (ロジカルレプリケーションモード)を指定できます。 + r (ネイティブレプリケーションモード), s (ストリーミングレプリケーションモード)、n (raw モード)、l (ロジカルレプリケーションモード)またはl（slonyモード）を指定できます。 指定しない場合は、s (ストリーミングレプリケーションモード) を指定した見なされます。 diff --git a/doc/src/Makefile.in b/doc/src/Makefile.in index ab3fe3d6a..26e04bc43 100644 --- a/doc/src/Makefile.in +++ b/doc/src/Makefile.in @@ -110,11 +110,11 @@ am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ -am__v_at_1 = +am__v_at_1 = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ diff --git a/doc/src/sgml/ref/pgpool_setup.sgml b/doc/src/sgml/ref/pgpool_setup.sgml index 952545b6b..eb6eddf21 100644 --- a/doc/src/sgml/ref/pgpool_setup.sgml +++ b/doc/src/sgml/ref/pgpool_setup.sgml @@ -65,8 +65,8 @@ Pgpool-II documentation Specifies the running mode. mode can be r (native replication mode), s (streaming replication mode), - n (raw mode) or l - (logical replication mode). If this is + n (raw mode), l + (logical replication mode) or y (slony mode). If this is omitted, s is assumed. diff --git a/src/test/pgpool_setup b/src/test/pgpool_setup index 8f11cae0a..6ce80632f 100755 --- a/src/test/pgpool_setup +++ b/src/test/pgpool_setup @@ -23,6 +23,7 @@ # -m r: create an installation as native replication mode. # -m n: create an installation as raw mode. # -m l: create an installation as logical replication mode. +# -m y: create an installation as slony mode. # -n num_clusters: create num_clusters PostgreSQL database cluster nodes # -p base_port: specify base port. pgpool port is base_port. # pcp port is base_port + 1. The first PostgreSQL node's port is @@ -292,7 +293,7 @@ function set_postgresql_conf echo "max_wal_senders = $NUMCLUSTERS" >> $PGCONF echo "archive_mode = on" >> $PGCONF echo "archive_command = 'cp %p $BASEDIR/archivedir/%f > $PGCONF - elif [ $MODE = 'r' -o $MODE = 'l' ];then + elif [ $MODE = 'r' -o $MODE = 'l' -o $MODE = 'y' ];then echo "wal_level = archive" >> $PGCONF echo "archive_mode = on" >> $PGCONF echo "archive_command = 'cp %p $BASEDIR/archivedir/%f > $PGCONF @@ -562,7 +563,7 @@ function wait_for_pgpool_reload { ################################################################################ function usage() { - echo "usage: $0 [-m r|s|n|l] [-n num_clusters] [-p base_port] [-pg pg_base_port][--no-stop] [-d]";exit 1 + echo "usage: $0 [-m r|s|n|l|y] [-n num_clusters] [-p base_port] [-pg pg_base_port][--no-stop] [-d]";exit 1 } #------------------------------------------- @@ -583,6 +584,7 @@ do s ) MODE="s";; n ) MODE="n";; l ) MODE="l";; + y ) MODE="y";; * ) usage;; esac elif [ $1 = "-n" ];then @@ -623,6 +625,9 @@ case $MODE in l ) MODENAME="logical replication mode" SAMPLE_CONF=$PGPOOLDIR/pgpool.conf.sample-logical ;; + y ) MODENAME="slony mode" + SAMPLE_CONF=$PGPOOLDIR/pgpool.conf.sample-master-slave + ;; esac #------------------------------------------- @@ -836,7 +841,7 @@ else while [ $n -lt $NUMCLUSTERS ] do - if [ $MODE = 'l' ] + if [ $MODE = 'l' -o $MODE = 'y' ] then # temporarily start data$n cluster to create extensions echo "temporarily start data${n} cluster to create extensions" -- 2.39.5