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 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) 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'