Compare commits

...

3 Commits

Author SHA1 Message Date
Ian Barwick
fe5904e04e standby clone: improve Barman source server check
Use "remote_command()" to execute the remote psql command, and
provide the -X option to psql to ensure it doesn't read ~/.psqlrc.
2020-10-20 17:21:17 +09:00
Ian Barwick
2cb1f4f728 doc: update release notes 2020-10-20 14:05:25 +09:00
Ian Barwick
5b90842c55 Bump version to 5.2.0
Also update the minimum version check to PostgreSQL 9.4.
2020-10-20 13:34:16 +09:00
6 changed files with 26 additions and 23 deletions

20
configure vendored
View File

@@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for repmgr 5.2. # Generated by GNU Autoconf 2.69 for repmgr 5.2.0.
# #
# Report bugs to <repmgr@googlegroups.com>. # Report bugs to <repmgr@googlegroups.com>.
# #
@@ -582,8 +582,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='repmgr' PACKAGE_NAME='repmgr'
PACKAGE_TARNAME='repmgr' PACKAGE_TARNAME='repmgr'
PACKAGE_VERSION='5.2' PACKAGE_VERSION='5.2.0'
PACKAGE_STRING='repmgr 5.2' PACKAGE_STRING='repmgr 5.2.0'
PACKAGE_BUGREPORT='repmgr@googlegroups.com' PACKAGE_BUGREPORT='repmgr@googlegroups.com'
PACKAGE_URL='https://repmgr.org/' PACKAGE_URL='https://repmgr.org/'
@@ -1181,7 +1181,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures repmgr 5.2 to adapt to many kinds of systems. \`configure' configures repmgr 5.2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1242,7 +1242,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of repmgr 5.2:";; short | recursive ) echo "Configuration of repmgr 5.2.0:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@@ -1316,7 +1316,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
repmgr configure 5.2 repmgr configure 5.2.0
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1335,7 +1335,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by repmgr $as_me 5.2, which was It was created by repmgr $as_me 5.2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@@ -1824,7 +1824,7 @@ if test "$major_version_num" -lt '10'; then
version_num_int=$(echo "$version_num"| version_num_int=$(echo "$version_num"|
$SED -e 's/^\([0-9]*\)\.\([0-9]*\)$/\1\2/') $SED -e 's/^\([0-9]*\)\.\([0-9]*\)$/\1\2/')
if test "$version_num_int" -lt '93'; then if test "$version_num_int" -lt '94'; then
as_fn_error $? "repmgr is not compatible with detected PostgreSQL version: $version_num" "$LINENO" 5 as_fn_error $? "repmgr is not compatible with detected PostgreSQL version: $version_num" "$LINENO" 5
fi fi
else else
@@ -2487,7 +2487,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by repmgr $as_me 5.2, which was This file was extended by repmgr $as_me 5.2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@@ -2550,7 +2550,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
repmgr config.status 5.2 repmgr config.status 5.2.0
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

View File

@@ -1,4 +1,4 @@
AC_INIT([repmgr], [5.2], [repmgr@googlegroups.com], [repmgr], [https://repmgr.org/]) AC_INIT([repmgr], [5.2.0], [repmgr@googlegroups.com], [repmgr], [https://repmgr.org/])
AC_COPYRIGHT([Copyright (c) 2010-2020, 2ndQuadrant Ltd.]) AC_COPYRIGHT([Copyright (c) 2010-2020, 2ndQuadrant Ltd.])
@@ -32,7 +32,7 @@ if test "$major_version_num" -lt '10'; then
version_num_int=$(echo "$version_num"| version_num_int=$(echo "$version_num"|
$SED -e 's/^\([[0-9]]*\)\.\([[0-9]]*\)$/\1\2/') $SED -e 's/^\([[0-9]]*\)\.\([[0-9]]*\)$/\1\2/')
if test "$version_num_int" -lt '93'; then if test "$version_num_int" -lt '94'; then
AC_MSG_ERROR([repmgr is not compatible with detected PostgreSQL version: $version_num]) AC_MSG_ERROR([repmgr is not compatible with detected PostgreSQL version: $version_num])
fi fi
else else

View File

@@ -18,14 +18,14 @@
<!-- remember to update the release date in ../repmgr_version.h.in --> <!-- remember to update the release date in ../repmgr_version.h.in -->
<sect1 id="release-5.2.0"> <sect1 id="release-5.2.0">
<title>Release 5.2.0</title> <title id="release-current">Release 5.2.0</title>
<para><emphasis>??? ?? ???, 2020</emphasis></para> <para><emphasis>??? ?? October, 2020</emphasis></para>
<para> <para>
&repmgr; 5.2.0 is a major release. &repmgr; 5.2.0 is a major release.
</para> </para>
<para> <para>
This release provides support for <ulink url="https://www.postgresql.org/docs/13/release-13.htmll">PostgreSQL 13</ulink>, released in September 2020. This release provides support for <ulink url="https://www.postgresql.org/docs/13/release-13.html">PostgreSQL 13</ulink>, released in September 2020.
</para> </para>
<para> <para>
This release removes support for PostgreSQL 9.3, which was This release removes support for PostgreSQL 9.3, which was
@@ -220,7 +220,7 @@
</sect1> </sect1>
<sect1 id="release-5.1.0"> <sect1 id="release-5.1.0">
<title id="release-current">Release 5.1.0</title> <title>Release 5.1.0</title>
<para><emphasis>Mon 13 April, 2020</emphasis></para> <para><emphasis>Mon 13 April, 2020</emphasis></para>
<para> <para>

View File

@@ -133,10 +133,10 @@
&repmgr; 5.1 &repmgr; 5.1
</entry> </entry>
<entry> <entry>
YES NO
</entry> </entry>
<entry> <entry>
<link linkend="release-5.1.0">5.1</link> (2020-04-13) <link linkend="release-5.1.0">5.1.0</link> (2020-04-13)
</entry> </entry>
<entry> <entry>
9.3, 9.4, 9.5, 9.6, 10, 11, 12 9.3, 9.4, 9.5, 9.6, 10, 11, 12

View File

@@ -5962,19 +5962,22 @@ check_source_server_via_barman()
initPQExpBuffer(&command_output); initPQExpBuffer(&command_output);
maxlen_snprintf(buf, maxlen_snprintf(buf,
"ssh %s \"psql -Aqt \\\"%s\\\" -c \\\"" "psql -AqtX -d \\\"%s\\\" -c \\\""
" SELECT conninfo" " SELECT conninfo"
" FROM repmgr.nodes" " FROM repmgr.nodes"
" WHERE %s" " WHERE %s"
" AND active IS TRUE" " AND active IS TRUE"
"\\\"\"", "\\\"",
config_file_options.barman_host,
repmgr_conninfo_buf.data, repmgr_conninfo_buf.data,
where_condition); where_condition);
termPQExpBuffer(&repmgr_conninfo_buf); termPQExpBuffer(&repmgr_conninfo_buf);
command_success = local_command(buf, &command_output); command_success = remote_command(config_file_options.barman_host,
runtime_options.remote_user,
buf,
config_file_options.ssh_options,
&command_output);
if (command_success == false) if (command_success == false)
{ {

View File

@@ -1,5 +1,5 @@
#define REPMGR_VERSION_DATE "" #define REPMGR_VERSION_DATE ""
#define REPMGR_VERSION "5.2dev" #define REPMGR_VERSION "5.2.0"
#define REPMGR_VERSION_NUM 50200 #define REPMGR_VERSION_NUM 50200
#define REPMGR_RELEASE_DATE "2020-XX-XX" #define REPMGR_RELEASE_DATE "2020-XX-XX"
#define PG_ACTUAL_VERSION_NUM #define PG_ACTUAL_VERSION_NUM