Commit 43258182 authored by Vincent Pelletier's avatar Vincent Pelletier

Log master node UUID to make log cross-reference easier.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2385 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent d8d957d6
...@@ -85,6 +85,7 @@ class Application(object): ...@@ -85,6 +85,7 @@ class Application(object):
if uuid is None or uuid == '': if uuid is None or uuid == '':
uuid = self.getNewUUID(NodeTypes.MASTER) uuid = self.getNewUUID(NodeTypes.MASTER)
self.uuid = uuid self.uuid = uuid
neo.logging.info('UUID : %s', dump(uuid))
# election related data # election related data
self.unconnected_master_node_set = set() self.unconnected_master_node_set = set()
......
...@@ -99,6 +99,7 @@ class ClientElectionHandler(MasterHandler): ...@@ -99,6 +99,7 @@ class ClientElectionHandler(MasterHandler):
if your_uuid != app.uuid: if your_uuid != app.uuid:
# uuid conflict happened, accept the new one and restart election # uuid conflict happened, accept the new one and restart election
app.uuid = your_uuid app.uuid = your_uuid
neo.logging.info('UUID conflict, new UUID: %s', dump(your_uuid))
raise ElectionFailure, 'new uuid supplied' raise ElectionFailure, 'new uuid supplied'
conn.setUUID(uuid) conn.setUUID(uuid)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment