don't try and drop non-existent slot after switchover

This commit is contained in:
Ian Barwick
2017-08-04 14:20:38 +09:00
parent 972f8394ff
commit 20eeeef884

View File

@@ -2055,9 +2055,12 @@ do_standby_switchover(void)
} }
else else
{ {
drop_replication_slot_if_exists(remote_conn, if (config_file_options.use_replication_slots == true)
remote_node_record.node_id, {
local_node_record.slot_name); drop_replication_slot_if_exists(remote_conn,
remote_node_record.node_id,
local_node_record.slot_name);
}
/* TODO warn about any inactive replication slots*/ /* TODO warn about any inactive replication slots*/
} }
@@ -2480,7 +2483,7 @@ initialise_direct_clone(t_node_info *node_record)
* anyway) in Barman mode. * anyway) in Barman mode.
*/ */
if (config_file_options.use_replication_slots) if (config_file_options.use_replication_slots == true)
{ {
PQExpBufferData event_details; PQExpBufferData event_details;
initPQExpBuffer(&event_details); initPQExpBuffer(&event_details);