pgpool2.git / summary / log / commit / refs
commit 44a431ade04ee7378de92218d29a4f816a201740
Author: Tatsuo Ishii <ishii at sraoss.co.jp>
Date: Tue Jul 27 23:24:08 2010 +0000
More doc updation for 3.0.
doc/basebackup.sh | 17 +++++++
doc/pgpool-ja.html | 22 ++++-----
doc/pgpool_remote_start | 13 ++++++
doc/recovery.conf.sample | 117 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 158 insertions(+), 11 deletions(-)
diff --git a/doc/basebackup.sh b/doc/basebackup.sh
new file mode 100644
index 000000000..f9118fdb8
--- /dev/null
+++ b/doc/basebackup.sh
@@ -0,0 +1,17 @@
+#! /bin/sh
+# Recovery script for streaming replication.
+# This script assumes that DB node 0 is primary, and 1 is standby.
+#
+datadir=$1
+desthost=$2
+destdir=$3
+
+psql -c "SELECT pg_start_backup('Streaming Replication', true)" postgres
+
+rsync -C -a --delete -e ssh --exclude postgresql.conf --exclude postmaster.pid \
+--exclude postmaster.opts --exclude pg_log --exclude pg_xlog \
+--exclude recovery.conf $datadir/ $desthost:$destdir/
+
+ssh -T localhost mv $destdir/recovery.done $destdir/recovery.conf
+
+psql -c "SELECT pg_stop_backup()" postgres
diff --git a/doc/pgpool-ja.html b/doc/pgpool-ja.html
index 2255b6e26..813a5c216 100644
--- a/doc/pgpool-ja.html
+++ b/doc/pgpool-ja.html
@@ -8,7 +8,7 @@
<body>
<!-- hhmts start -->
-Last modified: Mon Jul 26 19:16:28 JST 2010
+Last modified: Tue Jul 27 11:20:55 JST 2010
<!-- hhmts end -->
<body bgcolor="#ffffff">
@@ -1431,7 +1431,7 @@ pgpool-II$B$N(BStreaming Replication$B%b!<%I$O!"$3$&$7$??6$jJ,$1$r<+F0E*$K9T$
<li>SET TRANSACTION READ WRITE, SET SESSION CHARACTERISTICS AS TRANSACTION READ WRITE
<li>SET transaction_read_only = off
</ul>
- <li>2$BAX%3%_%C%H4XO"$N%3%^%s%I!#(BPREPARE TRANSACTION, COMMIT PREPARED, ROLLBACK PREPARED
+ <li>$BFsAj%3%_%C%H4XO"$N%3%^%s%I!#(BPREPARE TRANSACTION, COMMIT PREPARED, ROLLBACK PREPARED
<li>LISTEN, UNLISTEN, NOTIFY
<li>VACUUM
<li>$B%7!<%1%s%94XO"$N4X?t(B(nextval$B$d(Bsetval$B$J$I(B)$B$N8F$S=P$7!#(B
@@ -3301,31 +3301,31 @@ pgpool-II$B$O4pK\E*$K$O(Bmaster/slave mode$B$H$7$FF0:n$7$^$9$,!"$=$N:]$K(B "
</p>
<ul>
- <li>$B%*%s%i%$%s%j%+%P%j$,(BStreaming Replication$BBP1~$GF0:n$7$F$$$k(Bmaster/slave$B%b!<%I$KBP1~$7$^$7$?(B(Tatsuo)$B!#(B
+ <li>$B%*%s%i%$%s%j%+%P%j$,(BStreaming Replication$BBP1~$GF0:n$7$F$$$k(Bmaster/slave$B%b!<%I$KBP1~$7$^$7$?(B(Tatsuo)
- <li>Streaming Replication$B%b!<%IMQ$N?7$7$$@_Dj9`L\(B "delay_threshold" $B$,DI2C$5$l!"%l%W%j%1!<%7%g%s$NCY$l$,4F;k$G$-$k$h$&$K$J$j$^$7$?(B(Tatsuo)$B!#(B
+ <li>Streaming Replication$B%b!<%IMQ$N?7$7$$@_Dj9`L\(B "delay_threshold" $B$,DI2C$5$l!"%l%W%j%1!<%7%g%s$NCY$l$,4F;k$G$-$k$h$&$K$J$j$^$7$?(B(Tatsuo)
- <li>show pool_status$B$G!"(BStreaming Replication$B$K$*$1$k%l%W%j%1!<%7%g%s$NCY1d$,3NG'$G$-$k$h$&$K$J$j$^$7$?(B(Tatsuo)$B!#(B
+ <li>show pool_status$B$G!"(BStreaming Replication$B$K$*$1$k%l%W%j%1!<%7%g%s$NCY1d$,3NG'$G$-$k$h$&$K$J$j$^$7$?(B(Tatsuo)
- <li>Streaming Replication$B$K$*$1$k%l%W%j%1!<%7%g%s$NCY1d$N%m%0$r@)8f$9$k?7$7$$@_Dj9`L\(B"log_standby_delay"$B$,DI2C$5$l$^$7$?(B(Tatsuo)$B!#(B
+ <li>Streaming Replication$B$K$*$1$k%l%W%j%1!<%7%g%s$NCY1d$N%m%0$r@)8f$9$k?7$7$$@_Dj9`L\(B"log_standby_delay"$B$,DI2C$5$l$^$7$?(B(Tatsuo)
</ul>
- <li>$B%^%9%?%9%l!<%V%b!<%I$G!"L@<(E*$J%H%i%s%6%/%7%g%sFb$G<B9T$5$l$k(BSQL$B%3%^%s%I$K$*$$$F!"<+F0E*$K%H%i%s%6%/%7%g%s$r3+;O$9$k$3$H$r;_$a$^$7$?!#$3$l$OITI,MW$G$7$?!#$3$l$K$h$C$F!"%Q%U%)!<%^%s%9$,8~>e$7$F$$$^$9(B(Tatsuo)
+ <li>$B%^%9%?%9%l!<%V%b!<%I$G!"L@<(E*$J%H%i%s%6%/%7%g%sFb$G<B9T$5$l$J$$(BSQL$B%3%^%s%I$K$*$$$F!"<+F0E*$K%H%i%s%6%/%7%g%s$r3+;O$9$k$3$H$r;_$a$^$7$?!#$3$l$OITI,MW$G$7$?!#$3$l$K$h$C$F!"%Q%U%)!<%^%s%9$,8~>e$7$F$$$^$9(B(Tatsuo)
<li>$B%^%9%?%9%l!<%V%b!<%I$G!"L@<(E*$J%H%i%s%6%/%7%g%sFb$G<B9T$5$l$k(BSELECT$B%3%^%s%I$,Ii2YJ,;6$G$-$k$h$&$K$J$j$^$7$?(B(Tatsuo, Kitagawa)
<li>$B%^%9%?%9%l!<%V%b!<%I$G!"I,MW$J(BDB$B%N!<%I$K$N$_%3%^%s%I$,Aw$i$l$k$h$&$K$J$j$^$7$?!#(B
$B$3$l$K$h$j!"$?$H$($P%Q!<%9%3%^%s%I$,ITI,MW$J(BDB$B%N!<%I$K$*$$$F$b%m%C%/$r<h$C$F$7$^$&$h$&$J$3$H$,$J$/$J$j$^$7$?(B(Tatsuo, Kitagawa)
- <li>pgpool$B$N5/F0;~$K!"%9%F!<%?%9%U%!%$%k$rL5;k$9$k%*%W%7%g%s$,DI2C$5$l$^$7$?(B(Tatsuo)$B!#(B
+ <li>pgpool$B$N5/F0;~$K!"%9%F!<%?%9%U%!%$%k$rL5;k$9$k%*%W%7%g%s$,DI2C$5$l$^$7$?(B(Tatsuo)
<li>PostgreSQL 9.0$B$N(BVACUUM$B$N?7$7$$=q<0$r(Bpgpool-II$B$N%Q!<%5$,%5%]!<%H$7$^$7$?(B(Tatsuo)
<li>$B%U%'%$%k%*!<%P(B/$B%U%'%$%k%P%C%/%3%^%s%I$G!"(B"%H"$B$H$$$&FC<lJQ?t$,MxMQ$G$-$k$h$&$K$J$j$^$7$?!#(B
$B$3$l$O!"?7$7$$%^%9%?!<%N!<%I$N%[%9%HL>$rI=$7$^$9(B(Tatsuo)
- <li>failover_if_affected_tuples_mismatch $B$H$$$&@_Dj9`L\$,DI2C$5$l$^$7$?(B(Tatsuo)$B!#(B
+ <li>failover_if_affected_tuples_mismatch $B$H$$$&@_Dj9`L\$,DI2C$5$l$^$7$?(B(Tatsuo)
$B=>Mh!"%l%W%j%1!<%7%g%s%b!<%I$G(BUPDATE/DELETE$B$N7k2L9T?t$,0[$J$k$H!"%H%i%s%6%/%7%g%s$r%"%\!<%H$7$F%;%C%7%g%s$r6/@)@ZCG$7$F$$$^$7$?!#(B
failover_if_affected_tuples_mismatch $B$r(B true$B$K@_Dj$9$k$H!"$3$N8=>]$,5/$-$?$H$-$K!"IT0lCW$N$"$C$?(BDB$B%N!<%I$r@Z$jJ|$7$F=LB`1?E>$KF~$k$h$&$K$J$j$^$9!#(B
@@ -3339,7 +3339,7 @@ failover_if_affected_tuples_mismatch $B$r(B true$B$K@_Dj$9$k$H!"$3$N8=>]$,5/$
<li>pcp$B%3%^%s%I$K$*$$$F!"%m%s%0%*%W%7%g%s$,%5%]!<%H$5$l$^$7$?(B(Guillaume Lelarge)
- <li>debug_level $B$H$$$&@_Dj9`L\$,DI2C$5$l!"(Bpgpool.conf$B$N:FFI$_9~$_$K$h$C$F%G%P%C%0%a%C%;!<%8$N=PNO$r%*%s!?%*%U$G$-$k$h$&$K$J$j$^$7$?(B(Tatsuo)$B!#(B
+ <li>debug_level $B$H$$$&@_Dj9`L\$,DI2C$5$l!"(Bpgpool.conf$B$N:FFI$_9~$_$K$h$C$F%G%P%C%0%a%C%;!<%8$N=PNO$r%*%s!?%*%U$G$-$k$h$&$K$J$j$^$7$?(B(Tatsuo)
<li>pgpool.conf$B$G!"(Bpostgresql.conf$B$HF1$8??56CMI=8=$,MxMQ$G$-$k$h$&$K$J$j$^$7$?!#=>Mh$O!"(Btrue/false, 1/0$B$7$+;H$($^$;$s$G$7$?(B(Kitagawa)
@@ -3356,7 +3356,7 @@ failover_if_affected_tuples_mismatch $B$r(B true$B$K@_Dj$9$k$H!"$3$N8=>]$,5/$
<li>SSL$B$,M-8z$J>uBV$G!"BgNL$N%G!<%?DL?.$,5/$k$H%O%s%0$9$kLdBj$,=$@5$5$l$^$7$?(B(Tatsuo)
- <li>DB$B%N!<%I$,(B1$B8D$@$1$7$+B8:_$7$J$$>uBV$G(BDB$B$,%(%i!<$r5/$7$?$?:]$K!"4V0c$C$?(BDB$B%N!<%I$,%U%'%$%k%*!<%P$9$k%P%0$r=$@5$7$^$7$?(B(Tatsuo)$B!#(B
+ <li>DB$B%N!<%I$,(B1$B8D$@$1$7$+B8:_$7$J$$>uBV$G(BDB$B$,%(%i!<$r5/$7$?$?:]$K!"4V0c$C$?(BDB$B%N!<%I$,%U%'%$%k%*!<%P$9$k%P%0$r=$@5$7$^$7$?(B(Tatsuo)
</ul>
</p>
diff --git a/doc/pgpool_remote_start b/doc/pgpool_remote_start
new file mode 100644
index 000000000..afd0e61ad
--- /dev/null
+++ b/doc/pgpool_remote_start
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+if [ $# -ne 2 ]
+then
+ echo "pgpool_remote_start remote_host remote_datadir"
+ exit 1
+fi
+
+DEST=$1
+DESTDIR=$2
+PGCTL=/usr/local/pgsql/bin/pg_ctl
+
+ssh -T $DEST $PGCTL -w -D $DESTDIR start 2>/dev/null 1>/dev/null < /dev/null &
diff --git a/doc/recovery.conf.sample b/doc/recovery.conf.sample
new file mode 100644
index 000000000..722c7d677
--- /dev/null
+++ b/doc/recovery.conf.sample
@@ -0,0 +1,117 @@
+# -------------------------------
+# PostgreSQL recovery config file
+# -------------------------------
+#
+# Edit this file to provide the parameters that PostgreSQL needs to
+# perform an archive recovery of a database, or to act as a log-streaming
+# replication standby.
+#
+# If "recovery.conf" is present in the PostgreSQL data directory, it is
+# read on postmaster startup. After successful recovery, it is renamed
+# to "recovery.done" to ensure that we do not accidentally re-enter
+# archive recovery or standby mode.
+#
+# This file consists of lines of the form:
+#
+# name = 'value'
+#
+# (The quotes around the value are NOT optional, but the "=" is.)
+#
+# Comments are introduced with '#'.
+#
+# The complete list of option names and allowed values can be found
+# in the PostgreSQL documentation.
+#
+#---------------------------------------------------------------------------
+# ARCHIVE RECOVERY PARAMETERS
+#---------------------------------------------------------------------------
+#
+# restore_command
+#
+# specifies the shell command that is executed to copy log files
+# back from archival storage. The command string may contain %f,
+# which is replaced by the name of the desired log file, and %p,
+# which is replaced by the absolute path to copy the log file to.
+#
+# This parameter is *required* for an archive recovery, but optional
+# for streaming replication.
+#
+# It is important that the command return nonzero exit status on failure.
+# The command *will* be asked for log files that are not present in the
+# archive; it must return nonzero when so asked.
+#
+# NOTE that the basename of %p will be different from %f; do not
+# expect them to be interchangeable.
+#
+#restore_command = '' # e.g. 'cp /mnt/server/archivedir/%f %p'
+#
+#
+# archive_cleanup_command
+#
+# specifies an optional shell command to execute at every restartpoint.
+# This can be useful for cleaning up the archive of a standby server.
+#
+#archive_cleanup_command = ''
+#
+# recovery_end_command
+#
+# specifies an optional shell command to execute at completion of recovery.
+# This can be useful for cleaning up after the restore_command.
+#
+#recovery_end_command = ''
+#
+#---------------------------------------------------------------------------
+# RECOVERY TARGET PARAMETERS
+#---------------------------------------------------------------------------
+#
+# By default, recovery will rollforward to the end of the WAL log.
+# If you want to stop rollforward at a specific point, you
+# must set a recovery target.
+#
+# You may set a recovery target either by transactionId, or
+# by timestamp. Recovery may either include or exclude the
+# transaction(s) with the recovery target value (ie, stop either
+# just after or just before the given target, respectively).
+#
+#recovery_target_time = '' # e.g. '2004-07-14 22:39:00 EST'
+#
+#recovery_target_xid = ''
+#
+#recovery_target_inclusive = 'true'
+#
+#
+# If you want to recover into a timeline other than the "main line" shown in
+# pg_control, specify the timeline number here, or write 'latest' to get
+# the latest branch for which there's a history file.
+#
+#recovery_target_timeline = 'latest'
+#
+#---------------------------------------------------------------------------
+# STANDBY SERVER PARAMETERS
+#---------------------------------------------------------------------------
+#
+# When standby_mode is enabled, the PostgreSQL server will work as
+# a standby. It tries to connect to the primary according to the
+# connection settings primary_conninfo, and receives XLOG records
+# continuously.
+#
+#standby_mode = 'off'
+#
+#primary_conninfo = '' # e.g. 'host=localhost port=5432'
+#
+#
+# By default, a standby server keeps streaming XLOG records from the
+# primary indefinitely. If you want to stop streaming and finish recovery,
+# opening up the system in read/write mode, specify path to a trigger file.
+# Server will poll the trigger file path periodically and stop streaming
+# when it's found.
+#
+#trigger_file = ''
+#
+#---------------------------------------------------------------------------
+# HOT STANDBY PARAMETERS
+#---------------------------------------------------------------------------
+#
+# Hot Standby related parameters are listed in postgresql.conf
+#
+#---------------------------------------------------------------------------
[parent: d4aed36639ba]