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

Cleanup new ignore rsync warning feature. Closes gh-22.

Browse Source
This commit is contained in:
Greg Smith
2011-04-05 17:52:39 -04:00
parent 68b42d16c9
commit f824189692
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@@ -31,5 +31,5 @@
1.1.0 2011-03-09 1.1.0 2011-03-09
Make options -U, -R and -p not mandatory (Jaime) Make options -U, -R and -p not mandatory (Jaime)
X.X.X 2011-XX-XX 1.1.1 2011-XX-XX
Add --ignore-rsync-warning (Cédric) Add --ignore-rsync-warning (Cédric)

2
README.rst
View File

@@ -862,8 +862,8 @@ The output from this program looks like this::
-f, --config_file=PATH path to the configuration file -f, --config_file=PATH path to the configuration file
-R, --remote-user=USERNAME database server username for rsync -R, --remote-user=USERNAME database server username for rsync
-w, --wal-keep-segments=VALUE minimum value for the GUC wal_keep_segments (default: 5000) -w, --wal-keep-segments=VALUE minimum value for the GUC wal_keep_segments (default: 5000)
-I, --ignore-rsync-warning ignore rsync partial transfer warning
-F, --force force potentially dangerous operations to happen -F, --force force potentially dangerous operations to happen
-I, --ignore-rsync-warning Ignore partial transfert warning
repmgr performs some tasks like clone a node, promote it or making follow another node and then exits. repmgr performs some tasks like clone a node, promote it or making follow another node and then exits.
COMMANDS: COMMANDS:

26
repmgr.c
View File

@@ -1340,8 +1340,8 @@ void help(const char *progname)
printf(_(" -f, --config_file=PATH path to the configuration file\n")); printf(_(" -f, --config_file=PATH path to the configuration file\n"));
printf(_(" -R, --remote-user=USERNAME database server username for rsync\n")); printf(_(" -R, --remote-user=USERNAME database server username for rsync\n"));
printf(_(" -w, --wal-keep-segments=VALUE minimum value for the GUC wal_keep_segments (default: 5000)\n")); printf(_(" -w, --wal-keep-segments=VALUE minimum value for the GUC wal_keep_segments (default: 5000)\n"));
printf(_(" -I, --ignore-rsync-warning ignore rsync partial transfer warning\n"));
printf(_(" -F, --force force potentially dangerous operations to happen\n")); printf(_(" -F, --force force potentially dangerous operations to happen\n"));
printf(_(" -I, --ignore-rsync-warning Ignore partial transfert warning\n"));
printf(_("\n%s performs some tasks like clone a node, promote it "), progname); printf(_("\n%s performs some tasks like clone a node, promote it "), progname);
printf(_("or making follow another node and then exits.\n")); printf(_("or making follow another node and then exits.\n"));
@@ -1479,24 +1479,28 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,
r = system(script); r = system(script);
/* /*
* If we are transfering a directory (ie: data directory, tablespace directories) * If we are transfering a directory (data directory, tablespace directories)
* then we can ignore some rsync warning, so if we get some of those errors we * then we can ignore some rsync warnings. If we get some of those errors, we
* treat them as 0 if we have --ignore-rsync-warning commandline option set * treat them as 0 only if passed the --ignore-rsync-warning command-line option.
*
* List of ignorable rsync errors: * List of ignorable rsync errors:
* 24 Partial transfer due to vanished source files * 24 Partial transfer due to vanished source files
*/ */
if ((WEXITSTATUS(r) == 24) && is_directory) if ((WEXITSTATUS(r) == 24) && is_directory)
{ {
if (!runtime_options.ignore_rsync_warn) if (runtime_options.ignore_rsync_warn)
log_warning( _("\nrsync completed with return code 24 " {
r = 0;
log_info(_("rsync partial transfer warning ignored\n"));
}
else
log_warning( _("\nrsync completed with return code 24: "
"\"Partial transfer due to vanished source files\".\n" "\"Partial transfer due to vanished source files\".\n"
"This can happen because of normal operation " "This can happen because of normal operation "
"on the master server, but it may indicate an " "on the master server, but it may indicate an "
"issue during cloning. If you are certain no " "unexpected change during cloning. If you are certain "
"changes were made to the master, try cloning " "no changes were made to the master, try cloning "
"again using \"repmgr --force --ignore-rsync-warning\".")); "again using \"repmgr --force --ignore-rsync-warning\"."));
else
r = 0;
} }
if (r != 0) if (r != 0)
log_err(_("Can't rsync from remote file or directory (%s:%s)\n"), log_err(_("Can't rsync from remote file or directory (%s:%s)\n"),