Detect a conflict correctly. Accept Notify Node Identification from any master...

Detect a conflict correctly. Accept Notify Node Identification from any master node. Enhance the output of PartitionTable.log.

git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@146 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/client/app.py

@@ -539,7 +539,7 @@ class Application(ThreadingMixIn, object):
             return
         # Call function given by ZODB
         if f is not None:
-          f(self.tid)
+            f(self.tid)
         # Call finish on master
         oid_list = self.txn_data_dict.keys()
         conn = self.master_conn

neo/client/handler.py

@@ -9,6 +9,7 @@ from neo.node import MasterNode, StorageNode, ClientNode
 from neo.pt import PartitionTable
 from neo.client.NEOStorage import NEOStorageError
 from neo.exception import ElectionFailure
+from neo.util import dump
 
 from ZODB.TimeStamp import TimeStamp
 
@@ -244,10 +245,12 @@ class ClientEventHandler(EventHandler):
             app = self.app
             nm = app.nm
             node = nm.getNodeByUUID(uuid)
-            # This must be sent only by primary master node
-            if not isinstance(node, MasterNode) \
-                   or app.primary_master_node is None \
-                   or app.primary_master_node.getUUID() != uuid:
+            # This must be sent only by a primary master node.
+            # Note that this may be sent before I know that it is 
+            # a primary master node.
+            if not isinstance(node, MasterNode):
+                logging.warn('ignoring notify node information from %s', 
+                             dump(uuid))
                 return
 
             for node_type, ip_address, port, uuid, state in node_list:
@@ -287,6 +290,7 @@ class ClientEventHandler(EventHandler):
                         n = app.nm.getNodeByUUID(uuid)
                         if n is not None:
                             app.nm.remove(n)
+                    continue
 
                 n.setState(state)
         else:
@@ -385,7 +389,7 @@ class ClientEventHandler(EventHandler):
     def handleAnswerStoreObject(self, conn, packet, conflicting, oid, serial):
         if isinstance(conn, ClientConnection):
             app = self.app
-            if conflicting == '1':
+            if conflicting:
                 app.txn_object_stored = -1, serial
             else:
                 app.txn_object_stored = oid, serial

neo/pt.py

@@ -143,15 +143,20 @@ class PartitionTable(object):
             node_dict[node] = i
         for node, i in node_dict.iteritems():
             logging.debug('pt: node %d: %s', i, dump(node.getUUID()))
-        state_dict = { UP_TO_DATE_STATE: 'U', 
-                       OUT_OF_DATE_STATE: 'O', 
-                       FEEDING_STATE: 'F' }
+        node_state_dict = { RUNNING_STATE: 'R',
+                            TEMPORARILY_DOWN_STATE: 'T',
+                            DOWN_STATE: 'D',
+                            BROKEN_STATE: 'B' }
+        cell_state_dict = { UP_TO_DATE_STATE: 'U', 
+                            OUT_OF_DATE_STATE: 'O', 
+                            FEEDING_STATE: 'F' }
         for offset, row in enumerate(self.partition_list):
             desc_list = []
             for cell in row:
                 i = node_dict[cell.getNode()]
-                s = state_dict[cell.getState()]
-                desc_list.append('%d %s' % (i, s))
+                cell_state = cell_state_dict[cell.getState()]
+                node_state = node_state_dict[cell.getNodeState()]
+                desc_list.append('%d %s %s' % (i, cell_state, node_state))
             logging.debug('pt: row %d: %s', offset, ', '.join(desc_list))
 
     def operational(self):

neo/storage/operation.py

@@ -370,6 +370,7 @@ class OperationEventHandler(StorageEventHandler):
             else:
                 # If a newer transaction already locks this object,
                 # do not try to resolve a conflict, so return immediately.
+                logging.info('unresolvable conflict in %s', dump(oid))
                 conn.addPacket(Packet().answerStoreObject(packet.getId(), 1,
                                                           oid, locking_tid))
             return
@@ -379,6 +380,7 @@ class OperationEventHandler(StorageEventHandler):
         if history_list:
             last_serial = history_list[0][0]
             if last_serial != serial:
+                logging.info('resolvable conflict in %s', dump(oid))
                 conn.addPacket(Packet().answerStoreObject(packet.getId(), 1,
                                                           oid, last_serial))
                 return