github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-22 22:56:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

repmgr: improve logging of rsync actions

Browse Source 
In particular, copy_remote_files() would report any kind of non-zero
exit status from rsync as an error, even though when cloning data
directories and tablespaces we explicitly ignore the "vanished
files" status (code 24) as it's expected behaviour for files in these
locations to disappear during the rsync copy process.

Conflicts:
	HISTORY
This commit is contained in:
Ian Barwick
2017-03-01 14:26:39 +09:00
committed by Ian Barwick
parent cec01c6620
commit 72a2ac284a
2 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@@ -1,10 +1,11 @@
3.3.1 2017-01-
3.3.1 2017-03-
repmgrd: prevent invalid apply lag value being written to the
monitoring table (Ian)
repmgrd: fix error in XLogRecPtr conversion when calculating
monitoring statistics (Ian)
repmgr: if replication slots in use, where possible delete slot on old
upstream node after following new upstream (Ian)
repmgr: improve logging of rsync actions (Ian)
3.3 2016-12-27
repmgr: always log to STDERR even if log facility defined (Ian)

48
repmgr.c
View File

@@ -3670,15 +3670,16 @@ do_standby_clone(void)
master_data_directory, local_data_directory,
true, server_version_num);
/*
Exit code 0 means no error, but we want to ignore exit code 24 as well
as rsync returns that code on "Partial transfer due to vanished source files".
It's quite common for this to happen on the data directory, particularly
with long running rsync on a busy server.
*/
if (!WIFEXITED(r) && WEXITSTATUS(r) != 24)
* Exit code 0 means no error, but we want to ignore exit code 24 as well
* as rsync returns that code on "Partial transfer due to vanished source files".
* It's quite common for this to happen on the data directory, particularly
* with long running rsync on a busy server.
*/
if (WIFEXITED(r) && WEXITSTATUS(r) && WEXITSTATUS(r) != 24)
{
log_warning(_("standby clone: failed copying master data directory '%s'\n"),
log_err(_("standby clone: failed copying master data directory '%s'\n"),
master_data_directory);
r = retval = ERR_BAD_RSYNC;
goto stop_backup;
}
@@ -3762,15 +3763,16 @@ do_standby_clone(void)
true, server_version_num);
/*
Exit code 0 means no error, but we want to ignore exit code 24 as well
as rsync returns that code on "Partial transfer due to vanished source files".
It's quite common for this to happen on the data directory, particularly
with long running rsync on a busy server.
*/
if (!WIFEXITED(r) && WEXITSTATUS(r) != 24)
* Exit code 0 means no error, but we want to ignore exit code 24 as well
* as rsync returns that code on "Partial transfer due to vanished source files".
* It's quite common for this to happen on the data directory, particularly
* with long running rsync on a busy server.
*/
if (WIFEXITED(r) && WEXITSTATUS(r) && WEXITSTATUS(r) != 24)
{
log_warning(_("standby clone: failed copying tablespace directory '%s'\n"),
cell_t->location);
log_err(_("standby clone: failed copying tablespace directory '%s'\n"),
cell_t->location);
r = retval = ERR_BAD_RSYNC;
goto stop_backup;
}
}
@@ -3778,7 +3780,7 @@ do_standby_clone(void)
/*
* If a valid mapping was provide for this tablespace, arrange for it to
* be remapped
* (if no tablespace mappings was provided, the link will be copied as-is
* (if no tablespace mapping was provided, the link will be copied as-is
* by pg_basebackup or rsync and no action is required)
*/
if (mapping_found == true || mode == barman)
@@ -3937,7 +3939,7 @@ do_standby_clone(void)
r = copy_remote_files(runtime_options.host, runtime_options.remote_user,
file->filepath, dest_path, false, server_version_num);
if (r != 0)
if (WEXITSTATUS(r))
{
log_err(_("standby clone: unable to copy config file '%s'\n"),
file->filename);
@@ -3971,7 +3973,7 @@ do_standby_clone(void)
r = copy_remote_files(runtime_options.host, runtime_options.remote_user,
master_control_file, local_control_file,
false, server_version_num);
if (r != 0)
if (WEXITSTATUS(r))
{
log_warning(_("standby clone: failed copying master control file '%s'\n"),
master_control_file);
@@ -6198,7 +6200,7 @@ do_witness_create(void)
r = copy_remote_files(runtime_options.host, runtime_options.remote_user,
master_hba_file, runtime_options.dest_dir, false, -1);
if (r != 0)
if (WEXITSTATUS(r))
{
char *errmsg = _("Unable to copy pg_hba.conf from master");
log_err("%s\n", errmsg);
@@ -6964,9 +6966,11 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,
r = system(script);
if (r != 0)
log_err(_("unable to rsync from remote host (%s:%s)\n"),
host_string, remote_path);
log_debug("copy_remote_files(): r = %i; WIFEXITED: %i; WEXITSTATUS: %i\n", r, WIFEXITED(r), WEXITSTATUS(r));
/* exit code 24 indicates vanished files, which isn't a problem for us */
if (WEXITSTATUS(r) && WEXITSTATUS(r) != 24)
log_verbose(LOG_WARNING, "copy_remote_files(): rsync returned unexpected exit status %i \n", WEXITSTATUS(r));
return r;
}