From 7784f7db3d0934a7e77ef0b9004551ec96081950 Mon Sep 17 00:00:00 2001 From: Feike Steenbergen Date: Tue, 27 Oct 2015 09:20:24 +0100 Subject: [PATCH 1/3] Bumped version to 0.6 --- patroni/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patroni/version.py b/patroni/version.py index b650ceb0..27fda16b 100644 --- a/patroni/version.py +++ b/patroni/version.py @@ -1 +1 @@ -__version__ = '0.2' +__version__ = '0.6' From 87ead9ddaf5220c79de48d7a1f66e8f6f58189fc Mon Sep 17 00:00:00 2001 From: Oleksii Kliukin Date: Sun, 1 Nov 2015 15:29:45 +0300 Subject: [PATCH 2/3] Fix haproxy configuration to work by default with Patroni. --- haproxy.cfg | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/haproxy.cfg b/haproxy.cfg index c0a959d9..7c040355 100644 --- a/haproxy.cfg +++ b/haproxy.cfg @@ -15,7 +15,8 @@ frontend ft_postgresql default_backend bk_db backend bk_db - option httpchk GET + option httpchk GET /master + http-check expect string '"master"' - server postgresql_127.0.0.1_5432 127.0.0.1:5432 maxconn 100 check port 8008 - server postgresql_127.0.0.1_5433 127.0.0.1:5433 maxconn 100 check port 8009 + server postgresql_127.0.0.1_5432 127.0.0.1:5432 maxconn 100 check port 8008 + server postgresql_127.0.0.1_5433 127.0.0.1:5433 maxconn 100 check port 8009 From 8a70cc4d7bb266a48dfdc87fa2af46ee7fc4a416 Mon Sep 17 00:00:00 2001 From: Alexander Kukushkin Date: Mon, 9 Nov 2015 16:22:51 +0100 Subject: [PATCH 3/3] Call touch_member right after demote and promote. This is necessary to propagate actual information about node into DCS. --- patroni/ha.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patroni/ha.py b/patroni/ha.py index 8ed18b16..9a053cab 100644 --- a/patroni/ha.py +++ b/patroni/ha.py @@ -132,6 +132,7 @@ class Ha: return message else: self.state_handler.promote() + self.touch_member() return promote_message @staticmethod @@ -244,6 +245,7 @@ class Ha: if delete_leader: self.state_handler.stop() self.dcs.delete_leader() + self.touch_member() self.dcs.reset_cluster() self.state_handler.follow_the_leader(None)