* debian/patches/reclone-unable-pg_rewind.patch: Removed, no longer needed.
This commit is contained in:
parent
7d1e81e853
commit
39bf90fbef
3
debian/changelog
vendored
3
debian/changelog
vendored
|
@ -4,7 +4,7 @@ patroni (1.5.5-1) UNRELEASED; urgency=medium
|
|||
* New upstream release.
|
||||
|
||||
[ Michael Banck ]
|
||||
* debian/patches/behave_failure_logging.patch: Removed, applied upstream.
|
||||
* debian/patches/behave_failure_logging.patch: Removed, applied upstream.
|
||||
* debian/patches/acceptance_tests_coverage_binary.patch: Likewise.
|
||||
* debian/patches/automatic_primary_reinit.patch: Likewise.
|
||||
* debian/patches/automatic_primary_reinit.patch: Likewise.
|
||||
|
@ -12,6 +12,7 @@ patroni (1.5.5-1) UNRELEASED; urgency=medium
|
|||
* debian/patches/acceptance_tests_postgres_port.patch: Likewise.
|
||||
* debian/patches/fix_replication_connection.patch: Likewise.
|
||||
* debian/patches/consul_import.patch: Refreshed.
|
||||
* debian/patches/reclone-unable-pg_rewind.patch: Removed, no longer needed.
|
||||
|
||||
-- Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org> Fri, 08 Feb 2019 17:45:11 +0100
|
||||
|
||||
|
|
22
debian/patches/reclone-unable-pg_rewind.patch
vendored
22
debian/patches/reclone-unable-pg_rewind.patch
vendored
|
@ -1,22 +0,0 @@
|
|||
diff --git a/patroni/postgresql.py b/patroni/postgresql.py
|
||||
index d031d84..a006660 100644
|
||||
--- a/patroni/postgresql.py
|
||||
+++ b/patroni/postgresql.py
|
||||
@@ -1400,7 +1400,16 @@ class Postgresql(object):
|
||||
# make it store the new timeline (5540277D.8020309@iki.fi)
|
||||
leader_status = self.checkpoint(r)
|
||||
if leader_status:
|
||||
- return logger.warning('Can not use %s for rewind: %s', leader.name, leader_status)
|
||||
+ logger.warning('Can not use %s for rewind: %s', leader.name, leader_status)
|
||||
+ for name in ('remove_data_directory_on_rewind_failure', 'remove_data_directory_on_diverged_timelines'):
|
||||
+ if self.config.get(name):
|
||||
+ logger.warning('%s is set. removing...', name)
|
||||
+ self.remove_data_directory()
|
||||
+ self._rewind_state = REWIND_STATUS.INITIAL
|
||||
+ break
|
||||
+ else:
|
||||
+ self._rewind_state = REWIND_STATUS.FAILED
|
||||
+ return False
|
||||
|
||||
if self.pg_rewind(r):
|
||||
self._rewind_state = REWIND_STATUS.SUCCESS
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -2,4 +2,3 @@ startup_scripts.patch
|
|||
consul_import.patch
|
||||
check_postmaster.patch
|
||||
acceptance_tests_system_patroni.patch
|
||||
reclone-unable-pg_rewind.patch
|
||||
|
|
Loading…
Reference in a new issue