From 060b74674381d9c1fee9debfdebc2e304932b463 Mon Sep 17 00:00:00 2001 From: Ian Barwick Date: Fri, 17 Nov 2017 09:20:43 +0900 Subject: [PATCH] docs: miscellaneous cleanup --- doc/overview.sgml | 6 +++--- doc/repmgr-node-rejoin.sgml | 3 +-- doc/repmgr-witness-unregister.sgml | 4 ++-- doc/repmgrd-demonstration.sgml | 2 +- doc/repmgrd-network-split.sgml | 2 +- doc/repmgrd-witness-server.sgml | 4 ++-- doc/switchover.sgml | 6 +++--- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/doc/overview.sgml b/doc/overview.sgml index 248deb6e..be91122a 100644 --- a/doc/overview.sgml +++ b/doc/overview.sgml @@ -150,7 +150,7 @@ &repmgr; provides functionality to set up a so-called "witness server" to - assist in determining a new master server in a failover situation with more + assist in determining a new primary server in a failover situation with more than one standby. The witness server itself is not part of the replication cluster, although it does contain a copy of the repmgr metadata schema (see below). @@ -160,8 +160,8 @@ in the replication cluster are split over more than one location. In the event of a loss of connectivity between locations, the presence or absence of the witness server will decide whether a server at that location is promoted - to master; this is to prevent a "split-brain" situation where an isolated - location interprets a network outage as a failure of the (remote) master and + to primary; this is to prevent a "split-brain" situation where an isolated + location interprets a network outage as a failure of the (remote) primary and promotes a (local) standby. diff --git a/doc/repmgr-node-rejoin.sgml b/doc/repmgr-node-rejoin.sgml index 55cb0bd2..084f8b44 100644 --- a/doc/repmgr-node-rejoin.sgml +++ b/doc/repmgr-node-rejoin.sgml @@ -125,7 +125,7 @@ INFO: prerequisites for using pg_rewind are met INFO: 2 files copied to "/tmp/repmgr-config-archive-node1" NOTICE: executing pg_rewind - NOTICE: 2 files copied to /space/sda1/ibarwick/repmgr-test/node_1/data + NOTICE: 2 files copied to /var/lib/pgsql/data INFO: directory "/tmp/repmgr-config-archive-node1" deleted INFO: deleting "recovery.done" INFO: setting node 1's primary to node 2 @@ -136,7 +136,6 @@ DETAIL: node 1 is now attached to node 2 - diff --git a/doc/repmgr-witness-unregister.sgml b/doc/repmgr-witness-unregister.sgml index bd9a9416..3c220782 100644 --- a/doc/repmgr-witness-unregister.sgml +++ b/doc/repmgr-witness-unregister.sgml @@ -32,7 +32,7 @@ Unregistering a running witness node: - $ ./repmgr -f /space/sda1/ibarwick/repmgr-test/node_3/repmgr.conf witness unregister + $ repmgr -f /etc/repmgr.conf witness unregister INFO: connecting to witness node "node3" (ID: 3) INFO: unregistering witness node 3 INFO: witness unregistration complete @@ -41,7 +41,7 @@ Unregistering a non-running witness node: - $ ./repmgr -f /space/sda1/ibarwick/repmgr-test/node_3/repmgr.conf witness unregister -h localhost -p 5501 -F + $ repmgr -f /etc/repmgr.conf witness unregister -h localhost -p 5501 -F INFO: connecting to witness node "node3" (ID: 3) NOTICE: unable to connect to witness node "node3" (ID: 3), removing node record on cluster primary only INFO: unregistering witness node 3 diff --git a/doc/repmgrd-demonstration.sgml b/doc/repmgrd-demonstration.sgml index 233a4261..2a0530a9 100644 --- a/doc/repmgrd-demonstration.sgml +++ b/doc/repmgrd-demonstration.sgml @@ -61,7 +61,7 @@ [2017-08-24 23:32:12] [NOTICE] this node is the winner, will now promote self and inform other nodes INFO: connecting to standby database NOTICE: promoting standby - DETAIL: promoting server using '/home/barwick/devel/builds/HEAD/bin/pg_ctl -l /var/log/postgres/startup.log -w -D '/tmp/repmgr-test/node_2/data' promote' + DETAIL: promoting server using 'pg_ctl -l /var/log/postgres/startup.log -w -D '/var/lib/pgsql/data' promote' INFO: reconnecting to promoted server NOTICE: STANDBY PROMOTE successful DETAIL: node 2 was successfully promoted to primary diff --git a/doc/repmgrd-network-split.sgml b/doc/repmgrd-network-split.sgml index 6dd5eebe..3b18d0a5 100644 --- a/doc/repmgrd-network-split.sgml +++ b/doc/repmgrd-network-split.sgml @@ -15,7 +15,7 @@ in the main data centre and promoted a standby among themselves. - Previous &repmgr; versions used the concept of a "witness server" to + &repmgr; enables provision of "" to artificially create a quorum of servers in a particular location, ensuring that nodes in another location will not elect a new primary if they are unable to see the majority of nodes. However this approach does not diff --git a/doc/repmgrd-witness-server.sgml b/doc/repmgrd-witness-server.sgml index 2ae39539..bce6770b 100644 --- a/doc/repmgrd-witness-server.sgml +++ b/doc/repmgrd-witness-server.sgml @@ -9,12 +9,12 @@ In a situation caused e.g. by a network interruption between two data centres, it's important to avoid a "split-brain" situation where both sides of the network assume they are the active segment and the - side without an active master unilaterally promotes one of its standbys. + side without an active primary unilaterally promotes one of its standbys. To prevent this situation happening, it's essential to ensure that one network segment has a "voting majority", so other segments will know - they're in the minority and not attempt to promote a new master. Where + they're in the minority and not attempt to promote a new primary. Where an odd number of servers exists, this is not an issue. However, if each network has an even number of nodes, it's necessary to provide some way of ensuring a majority, which is where the witness server becomes useful. diff --git a/doc/switchover.sgml b/doc/switchover.sgml index 6e2eaed0..ac719cfc 100644 --- a/doc/switchover.sgml +++ b/doc/switchover.sgml @@ -62,9 +62,9 @@ Double-check which commands will be used to stop/start/restart the current primary; on the primary execute: - repmgr -f /etc./repmgr.conf node service --list --action=stop - repmgr -f /etc./repmgr.conf node service --list --action=start - repmgr -f /etc./repmgr.conf node service --list --action=restart + repmgr -f /etc/repmgr.conf node service --list --action=stop + repmgr -f /etc/repmgr.conf node service --list --action=start + repmgr -f /etc/repmgr.conf node service --list --action=restart