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 master register: ensure event record is always written

Browse Source
This commit is contained in:
Ian Barwick
2017-06-11 23:36:47 +09:00
parent aa53514f9f
commit 8720c9be45
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
repmgr-action-master.c
View File

@@ -12,6 +12,12 @@
#include "repmgr-action-master.h" #include "repmgr-action-master.h"
/*
* do_master_register()
*
* Event(s):
* - master_register
*/
void void
do_master_register(void) do_master_register(void)
{ {
@@ -178,6 +184,15 @@ do_master_register(void)
} }
if (record_created == false)
{
rollback_transaction(conn);
}
else
{
commit_transaction(conn);
}
/* Log the event */ /* Log the event */
create_event_record(conn, create_event_record(conn,
&config_file_options, &config_file_options,
@@ -186,18 +201,15 @@ do_master_register(void)
record_created, record_created,
event_description.data); event_description.data);
PQfinish(conn);
if (record_created == false) if (record_created == false)
{ {
rollback_transaction(conn);
PQfinish(conn);
log_notice(_("unable to register master node - see preceding messages")); log_notice(_("unable to register master node - see preceding messages"));
exit(ERR_DB_QUERY); exit(ERR_DB_QUERY);
} }
commit_transaction(conn);
PQfinish(conn);
if (record_found) if (record_found)
{ {
log_notice(_("master node record (id: %i) updated"), log_notice(_("master node record (id: %i) updated"),
@@ -212,6 +224,14 @@ do_master_register(void)
return; return;
} }
/*
* do_master_unregister()
*
* Event(s):
* - master_unregister
*/
void void
do_master_unregister(void) do_master_unregister(void)
{ {