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

Remove command-line options deprecated since repmgr 3.3

Browse Source 
The following options have long since been deprecated, and any attempt
to use them results only in a warning that they are no longer valid:

  --data-dir
  --no-conninfo-password
  --recovery-min-apply-delay
This commit is contained in:
Ian Barwick
2019-08-05 16:23:27 +09:00
parent 7d20aea606
commit 5ca0b57d0c
3 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
doc/appendix-release-notes.xml
View File

@@ -21,6 +21,30 @@
<title>Release 4.5</title>
<para><emphasis>?? ???, 2019</emphasis></para>
<sect2>
<title>Compatibility changes</title>
<para>
The following command line options, which have been deprecated since &repmgr; 3.3
(and which no longer had any effect other than to generate a warning about their use)
have been removed:
<itemizedlist spacing="compact" mark="bullet">
<listitem>
<simpara><option>--data-dir</option></simpara>
</listitem>
<listitem>
<simpara><option>--no-conninfo-password</option></simpara>
</listitem>
<listitem>
<simpara><option>--recovery-min-apply-delay</option></simpara>
</listitem>
</itemizedlist>
</para>
</sect2>
<sect2>
<title>General enhancements</title>
<para>

17
repmgr-client.c
View File

@@ -669,33 +669,20 @@ main(int argc, char **argv)
break;
/*-----------------------------
* options deprecated since 3.3
* options deprecated since 4.0
*-----------------------------
*/
case OPT_CHECK_UPSTREAM_CONFIG:
item_list_append(&cli_warnings,
_("--check-upstream-config is deprecated; use --dry-run instead"));
break;
case OPT_DATA_DIR:
item_list_append(&cli_warnings,
_("--data-dir is deprecated; use -D/--pgdata instead"));
break;
case OPT_NO_CONNINFO_PASSWORD:
item_list_append(&cli_warnings,
_("--no-conninfo-password is deprecated; use --use-recovery-conninfo-password to explicitly set a password"));
break;
/* -C/--remote-config-file */
case 'C':
item_list_append(&cli_warnings,
_("--remote-config-file is no longer required"));
break;
/* --recovery-min-apply-delay */
case OPT_RECOVERY_MIN_APPLY_DELAY:
item_list_append(&cli_warnings,
_("--recovery-min-apply-delay is now a configuration file parameter, \"recovery_min_apply_delay\""));
break;
case ':': /* missing option argument */
option_error_found = true;
break;

12
repmgr-client.h
View File

@@ -101,13 +101,9 @@
#define OPT_DETAIL 1046
#define OPT_REPMGRD_FORCE_UNPAUSE 1047
/* deprecated since 3.3 */
#define OPT_DATA_DIR 999
#define OPT_NO_CONNINFO_PASSWORD 998
#define OPT_RECOVERY_MIN_APPLY_DELAY 997
/* deprecated since 4.0 */
#define OPT_CHECK_UPSTREAM_CONFIG 996
#define OPT_NODE 995
#define OPT_CHECK_UPSTREAM_CONFIG 999
#define OPT_NODE 998
static struct option long_options[] =
@@ -157,7 +153,6 @@ static struct option long_options[] =
{"copy-external-config-files", optional_argument, NULL, OPT_COPY_EXTERNAL_CONFIG_FILES},
{"fast-checkpoint", no_argument, NULL, 'c'},
{"no-upstream-connection", no_argument, NULL, OPT_NO_UPSTREAM_CONNECTION},
{"recovery-min-apply-delay", required_argument, NULL, OPT_RECOVERY_MIN_APPLY_DELAY},
{"replication-user", required_argument, NULL, OPT_REPLICATION_USER},
{"upstream-conninfo", required_argument, NULL, OPT_UPSTREAM_CONNINFO},
{"upstream-node-id", required_argument, NULL, OPT_UPSTREAM_NODE_ID},
@@ -215,11 +210,8 @@ static struct option long_options[] =
/* deprecated */
{"check-upstream-config", no_argument, NULL, OPT_CHECK_UPSTREAM_CONFIG},
{"no-conninfo-password", no_argument, NULL, OPT_NO_CONNINFO_PASSWORD},
/* previously used by "standby switchover" */
{"remote-config-file", required_argument, NULL, 'C'},
/* legacy alias for -D/--pgdata */
{"data-dir", required_argument, NULL, OPT_DATA_DIR},
/* replaced by --node-id */
{"node", required_argument, NULL, OPT_NODE},