gitops/patroni
1
0
Fork 0
mirror of https://github.com/outbackdingo/patroni.git synced 2026-08-25 14:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename hostname to name in a Member

Browse Source
This commit is contained in:
Alexander Kukushkin
2015-06-23 14:07:00 +02:00
parent 744026b4bb
commit b7c73fdba8
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
governor.py
+1 -1
View File
@@ -29,7 +29,7 @@ class Governor:
if self.ha.cluster:
for m in self.ha.cluster.members:
# Do not update member TTL when it is far from being expired
if m.hostname == self.postgresql.name and m.real_ttl() > self.shutdown_member_ttl:
if m.name == self.postgresql.name and m.real_ttl() > self.shutdown_member_ttl:
return True
return self.etcd.touch_member(self.postgresql.name, connection_string, ttl)
helpers/etcd.py
+3 -3
View File
@@ -19,7 +19,7 @@ else:
logger = logging.getLogger(__name__)
class Member(namedtuple('Member', 'hostname,conn_url,api_url,expiration,ttl')):
class Member(namedtuple('Member', 'name,conn_url,api_url,expiration,ttl')):
@staticmethod
def fromNode(node):
@@ -37,7 +37,7 @@ class Member(namedtuple('Member', 'hostname,conn_url,api_url,expiration,ttl')):
class Cluster(namedtuple('Cluster', 'initialize,leader,last_leader_operation,members')):
def is_unlocked(self):
return not (self.leader and self.leader.hostname)
return not (self.leader and self.leader.name)
class Client:
@@ -268,7 +268,7 @@ class Etcd:
node = self.find_node(response['node'], '/leader')
if node:
for m in members:
if m.hostname == node['value']:
if m.name == node['value']:
leader = m
break
if not leader:
helpers/ha.py
+1 -1
View File
@@ -23,7 +23,7 @@ class Ha:
return self.etcd.update_leader(self.state_handler)
def has_lock(self):
lock_owner = self.cluster.leader and self.cluster.leader.hostname
lock_owner = self.cluster.leader and self.cluster.leader.name
logger.info('Lock owner: %s; I am %s', lock_owner, self.state_handler.name)
return lock_owner == self.state_handler.name
helpers/postgresql.py
+3 -3
View File
@@ -182,7 +182,7 @@ class Postgresql:
return False
for member in cluster.members:
if member.hostname == self.name:
if member.name == self.name:
continue
try:
r = parseurl(member.conn_url)
@@ -195,7 +195,7 @@ class Postgresql:
row = member_cursor.fetchone()
member_cursor.close()
member_conn.close()
logger.error([self.name, member.hostname, row])
logger.error([self.name, member.name, row])
if not row[0] or row[1] < 0:
return False
except psycopg2.Error:
@@ -269,7 +269,7 @@ primary_conninfo = '{}'
self.members = [r[0] for r in cursor]
def create_replication_slots(self, cluster):
members = [m.hostname for m in cluster.members if m.hostname != self.name]
members = [m.name for m in cluster.members if m.name != self.name]
# drop unused slots
for slot in set(self.members) - set(members):
self.query("""SELECT pg_drop_replication_slot(%s)