dprevot/patroni
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

* debian/patches/python3.7: Removed, no longer needed.

Browse source
This commit is contained in:
Michael Banck 2018-09-21 11:17:46 +02:00
parent 98f36e6735
commit c480cdff80
3 changed files with 2 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
debian/changelog vendored
View file

@ -6,7 +6,8 @@ patroni (1.5.0-1) UNRELEASED; urgency=medium
* Mention Kubernetes in description.
[ Michael Banck ]
* debian/patches/relax_requirements.patch: Removed, no longer needed.
* debian/patches/relax_requirements.patch:
* debian/patches/python3.7: Likewise.
-- Christoph Berg <christoph.berg@credativ.de> Wed, 25 Jul 2018 12:00:10 +0200

26
debian/patches/python3.7 vendored
View file

@ -1,26 +0,0 @@
--- a/patroni/ha.py
+++ b/patroni/ha.py
@@ -607,10 +607,10 @@ class Ha(object):
PostgreSQL as quickly as possible without regard for data durability. May only be called synchronously.
"""
mode_control = {
- 'offline': dict(stop='fast', checkpoint=False, release=False, offline=True, async=False),
- 'graceful': dict(stop='fast', checkpoint=True, release=True, offline=False, async=False),
- 'immediate': dict(stop='immediate', checkpoint=False, release=True, offline=False, async=True),
- 'immediate-nolock': dict(stop='immediate', checkpoint=False, release=False, offline=False, async=True),
+ 'offline': dict(stop='fast', checkpoint=False, release=False, offline=True, async_req=False),
+ 'graceful': dict(stop='fast', checkpoint=True, release=True, offline=False, async_req=False),
+ 'immediate': dict(stop='immediate', checkpoint=False, release=True, offline=False, async_req=True),
+ 'immediate-nolock': dict(stop='immediate', checkpoint=False, release=False, offline=False, async_req=True),
}[mode]
self.state_handler.trigger_check_diverged_lsn()
@@ -630,7 +630,7 @@ class Ha(object):
# FIXME: with mode offline called from DCS exception handler and handle_long_action_in_progress
# there could be an async action already running, calling follow from here will lead
# to racy state handler state updates.
- if mode_control['async']:
+ if mode_control['async_req']:
self._async_executor.schedule('starting after demotion')
self._async_executor.run_async(self.state_handler.follow, (node_to_follow,))
else:

1
debian/patches/series vendored
View file

@ -3,4 +3,3 @@ startup_scripts.patch
coverage_binary.patch
consul_import.patch
patroni_service.patch
python3.7