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

* debian/patches/acceptance_tests_system_patroni.patch: Refreshed.

Browse source 
* debian/patches/behave_failure_logging.patch: Likewise.
  * debian/patches/check_postmaster.patch: Likewise.
  * debian/patches/consul_import.patch: Likewise.
  * debian/patches/coverage_binary.patch: Likewise.
This commit is contained in:
Michael Banck 2019-01-15 19:12:12 +01:00
parent 78e026f8c5
commit 452f26f844
6 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
debian/changelog vendored
View file

@ -3,6 +3,11 @@ patroni (1.5.4-1) UNRELEASED; urgency=medium
* New upstream point release.
[ Michael Banck ]
* debian/patches/acceptance_tests_system_patroni.patch: Refreshed.
* debian/patches/behave_failure_logging.patch: Likewise.
* debian/patches/check_postmaster.patch: Likewise.
* debian/patches/consul_import.patch: Likewise.
* debian/patches/coverage_binary.patch: Likewise.
* debian/README.Debian: New file (Closes: #916186).
* debian/config.yml.in: Add @PORT@ option.
* debian/pg_createconfig_patroni: Add --port option and automatically assign

8
debian/patches/acceptance_tests_system_patroni.patch vendored
View file

@ -1,6 +1,8 @@
--- ./features/environment.py.orig 2018-11-02 18:39:02.583862514 +0100
+++ ./features/environment.py 2018-11-02 18:41:12.127582214 +0100
@@ -129,7 +129,7 @@
Index: patroni/features/environment.py
===================================================================
--- patroni.orig/features/environment.py
+++ patroni/features/environment.py
@@ -141,7 +141,7 @@ class PatroniController(AbstractControll
if isinstance(self._context.dcs_ctl, KubernetesController):
self._context.dcs_ctl.create_pod(self._name[8:], self._scope)
os.environ['PATRONI_KUBERNETES_POD_IP'] = '10.0.0.' + self._name[-1]

2
debian/patches/behave_failure_logging.patch vendored
View file

@ -2,7 +2,7 @@ Index: patroni/features/environment.py
===================================================================
--- patroni.orig/features/environment.py
+++ patroni/features/environment.py
@@ -816,3 +816,5 @@ def after_feature(context, feature):
@@ -823,3 +823,5 @@ def after_feature(context, feature):
context.pctl.stop_all()
shutil.rmtree(os.path.join(context.pctl.patroni_path, 'data'))
context.dcs_ctl.cleanup_service_tree()

16
debian/patches/check_postmaster.patch vendored
View file

@ -1,6 +1,8 @@
--- ./patroni/postmaster.py 2018-09-26 13:58:59.000000000 +0200
+++ ./patroni/postmaster.py_ 2018-09-26 13:58:54.567944491 +0200
@@ -39,14 +39,15 @@
Index: patroni/patroni/postmaster.py
===================================================================
--- patroni.orig/patroni/postmaster.py
+++ patroni/patroni/postmaster.py
@@ -39,14 +39,15 @@ class PostmasterProcess(psutil.Process):
return {}
def _is_postmaster_process(self):
@ -23,9 +25,11 @@
# Extra safety check. The process can't be ourselves, our parent or our direct child.
if self.pid == os.getpid() or self.pid == os.getppid() or self.ppid() == os.getpid():
--- ./tests/test_postmaster.py.orig 2018-09-26 15:56:22.496398226 +0200
+++ ./tests/test_postmaster.py 2018-09-26 15:56:42.316604224 +0200
@@ -24,25 +24,6 @@
Index: patroni/tests/test_postmaster.py
===================================================================
--- patroni.orig/tests/test_postmaster.py
+++ patroni/tests/test_postmaster.py
@@ -24,25 +24,6 @@ class TestPostmasterProcess(unittest.Tes
mock_read.return_value = {"pid": "123"}
self.assertIsNone(PostmasterProcess.from_pidfile(''))

4
debian/patches/consul_import.patch vendored
View file

@ -12,11 +12,11 @@ Index: patroni/features/environment.py
import datetime
import etcd
import kazoo.client
@@ -364,6 +363,7 @@ class AbstractDcsController(AbstractCont
@@ -370,6 +369,7 @@ class AbstractDcsController(AbstractCont
class ConsulController(AbstractDcsController):
def __init__(self, context):
+ import consul
super(ConsulController, self).__init__(context)
os.environ['PATRONI_CONSUL_HOST'] = 'localhost:8500'
self._client = consul.Consul()
os.environ['PATRONI_CONSUL_REGISTER_SERVICE'] = 'on'

4
debian/patches/coverage_binary.patch vendored
View file

@ -2,7 +2,7 @@ Index: patroni/features/environment.py
===================================================================
--- patroni.orig/features/environment.py
+++ patroni/features/environment.py
@@ -130,7 +130,7 @@ class PatroniController(AbstractControll
@@ -142,7 +142,7 @@ class PatroniController(AbstractControll
if isinstance(self._context.dcs_ctl, KubernetesController):
self._context.dcs_ctl.create_pod(self._name[8:], self._scope)
os.environ['PATRONI_KUBERNETES_POD_IP'] = '10.0.0.' + self._name[-1]
@ -11,7 +11,7 @@ Index: patroni/features/environment.py
stdout=self._log, stderr=subprocess.STDOUT, cwd=self._work_directory)
def stop(self, kill=False, timeout=15, postgres=False):
@@ -802,8 +802,8 @@ def before_all(context):
@@ -809,8 +809,8 @@ def before_all(context):
def after_all(context):
context.dcs_ctl.stop()