github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-26 16:46:28 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

repmgr: fix "primary_slot_name" when using "standby clone" with --recovery-conf-only

Browse Source 
Addresses GitHub #474.
This commit is contained in:
Ian Barwick
2018-07-17 13:35:45 +09:00
parent 81de200561
commit 673bde2b7f
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@@ -16,6 +16,8 @@
GitHub #453 (Ian) GitHub #453 (Ian)
repmgr: fix witness node handling in "node check"/"node status"; repmgr: fix witness node handling in "node check"/"node status";
GitHub #451 (Ian) GitHub #451 (Ian)
repmgr: fix "primary_slot_name" when using "standby clone" with --recovery-conf-only;
GitHub #474 (Ian)
repmgr: enable "witness unregister" to be run on any node; GitHub #472 (Ian) repmgr: enable "witness unregister" to be run on any node; GitHub #472 (Ian)
repmgrd: create a PID file by default; GitHub #457 (Ian) repmgrd: create a PID file by default; GitHub #457 (Ian)
repmgrd: daemonize process by default; GitHub #458 (Ian) repmgrd: daemonize process by default; GitHub #458 (Ian)

7
doc/appendix-release-notes.sgml
View File

@@ -170,6 +170,13 @@
</para> </para>
</listitem> </listitem>
<listitem>
<para>
When using <command><link linkend="repmgr-standby-clone">repmgr standby clone</link></command>
with <option>--recovery-conf-only</option> and replication slots, ensure
<varname>primary_slot_name</varname> is set correctly. (GitHub #474).
</para>
</listitem>
</itemizedlist> </itemizedlist>
</para> </para>

7
repmgr-action-standby.c
View File

@@ -1054,6 +1054,7 @@ _do_create_recovery_conf(void)
local_node_record.slot_name, local_node_record.slot_name,
upstream_node_record.node_name, upstream_node_record.node_name,
upstream_node_id); upstream_node_id);
if (runtime_options.force == false && runtime_options.dry_run == false) if (runtime_options.force == false && runtime_options.dry_run == false)
{ {
log_error("%s", msg.data); log_error("%s", msg.data);
@@ -1085,7 +1086,7 @@ _do_create_recovery_conf(void)
initPQExpBuffer(&msg); initPQExpBuffer(&msg);
appendPQExpBuffer(&msg, appendPQExpBuffer(&msg,
_("insufficient free replicaiton slots on upstream node \"%s\" (ID: %i)"), _("insufficient free replication slots on upstream node \"%s\" (ID: %i)"),
upstream_node_record.node_name, upstream_node_record.node_name,
upstream_node_id); upstream_node_id);
@@ -1141,14 +1142,14 @@ _do_create_recovery_conf(void)
if (runtime_options.dry_run == true) if (runtime_options.dry_run == true)
{ {
char recovery_conf_contents[MAXLEN] = ""; char recovery_conf_contents[MAXLEN] = "";
create_recovery_file(&upstream_node_record, &recovery_conninfo, recovery_conf_contents, false); create_recovery_file(&local_node_record, &recovery_conninfo, recovery_conf_contents, false);
log_info(_("would create \"recovery.conf\" file in \"%s\""), local_data_directory); log_info(_("would create \"recovery.conf\" file in \"%s\""), local_data_directory);
log_detail(_("\n%s"), recovery_conf_contents); log_detail(_("\n%s"), recovery_conf_contents);
} }
else else
{ {
if (!create_recovery_file(&upstream_node_record, &recovery_conninfo, local_data_directory, true)) if (!create_recovery_file(&local_node_record, &recovery_conninfo, local_data_directory, true))
{ {
log_error(_("unable to create \"recovery.conf\"")); log_error(_("unable to create \"recovery.conf\""));
} }