Make client node to wait for a partition table to be operational, to fail in...

Make client node to wait for a partition table to be operational, to fail in making a connection when a node does not have a server address. Patch NEOStorage for returning a bogus value for __len__.

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

neo/client/NEOStorage.py

@@ -188,3 +188,7 @@ class NEOStorage(BaseStorage.BaseStorage,
 
     def copyTransactionsFrom(self, other, verbose=0):
         raise NotImplementedError
+
+    def __len__(self):
+        # XXX bogus but how to implement this?
+        return 0

neo/client/app.py

@@ -40,6 +40,8 @@ class ConnectionManager(object):
     def _initNodeConnection(self, node):
         """Init a connection to a given storage node."""
         addr = node.getNode().getServer()
+        if addr is None:
+            return None
         handler = ClientEventHandler(self.storage, self.storage.dispatcher)
         conn = ClientConnection(self.storage.em, handler, addr)
         msg_id = conn.getNextId()
@@ -252,7 +254,7 @@ class Application(ThreadingMixIn, object):
         # Wait for primary master node information
         while 1:
             self._waitMessage(block=0)
-            if self.pt.filled()  or self.node_not_ready:
+            if self.pt.operational() or self.node_not_ready:
                 break
 
 

neo/client/handler.py

@@ -4,7 +4,7 @@ from neo.handler import EventHandler
 from neo.connection import ClientConnection
 from neo.protocol import Packet, \
         MASTER_NODE_TYPE, STORAGE_NODE_TYPE, CLIENT_NODE_TYPE, \
-        INVALID_UUID, TEMPORARILY_DOWN_STATE, BROKEN_STATE
+        INVALID_UUID, RUNNING_STATE, TEMPORARILY_DOWN_STATE, BROKEN_STATE
 from neo.node import MasterNode, StorageNode, ClientNode
 from neo.pt import PartitionTable
 from neo.client.NEOStorage import NEOStorageError
@@ -228,8 +228,7 @@ class ClientEventHandler(EventHandler):
                     node = nm.getNodeByUUID(uuid)
                     if node is None:
                         node = StorageNode(uuid = uuid)
-                        if uuid != app.uuid:
-                            node.setState(TEMPORARILY_DOWN_STATE)
+                        node.setState(TEMPORARILY_DOWN_STATE)
                         nm.add(node)
                     pt.setCell(offset, node, state)
         else:
@@ -254,30 +253,40 @@ class ClientEventHandler(EventHandler):
             for node_type, ip_address, port, uuid, state in node_list:
                 # Register new nodes.
                 addr = (ip_address, port)
-                n = nm.getNodeByServer(addr)
-                if n is None:
-                    if node_type == MASTER_NODE_TYPE:
+
+                if node_type == MASTER_NODE_TYPE:
+                    n = nm.getNodeByServer(addr)
+                    if n is None:
                         n = MasterNode(server = addr)
                         nm.add(n)
-                        if uuid != INVALID_UUID:
-                            # If I don't know the UUID yet, believe what the peer
-                            # told me at the moment.
-                            if n.getUUID() is None:
-                                n.setUUID(uuid)
-                    elif node_type == STORAGE_NODE_TYPE:
-                        if uuid == INVALID_UUID:
-                            # No interest.
-                            continue
+                    if uuid != INVALID_UUID:
+                        # If I don't know the UUID yet, believe what the peer
+                        # told me at the moment.
+                        if n.getUUID() is None:
+                            n.setUUID(uuid)
+                elif node_type == STORAGE_NODE_TYPE:
+                    if uuid == INVALID_UUID:
+                        # No interest.
+                        continue
+                    n = nm.getNodeByUUID(uuid)
+                    if n is None:
                         n = StorageNode(server = addr, uuid = uuid)
                         nm.add(n)
-                    elif node_type == CLIENT_NODE_TYPE:
-                        if uuid == INVALID_UUID:
-                            # No interest.
-                            continue
-                        n = ClientNode(server = addr, uuid = uuid)
-                        nm.add(n)
                     else:
+                        n.setServer(addr)
+                elif node_type == CLIENT_NODE_TYPE:
+                    if uuid == INVALID_UUID:
+                        # No interest.
                         continue
+                    if state == RUNNING_STATE:
+                        n = app.nm.getNodeByUUID(uuid)
+                        if n is None:
+                            n = ClientNode(server = addr, uuid = uuid)
+                            nm.add(n)
+                    else:
+                        n = app.nm.getNodeByUUID(uuid)
+                        if n is not None:
+                            app.nm.remove(n)
 
                 n.setState(state)
         else:

neo/master/service.py

@@ -262,6 +262,8 @@ class ServiceEventHandler(MasterEventHandler):
         # If this is a storage node or a client node, send the partition table.
         node = app.nm.getNodeByUUID(uuid)
         if isinstance(node, (StorageNode, ClientNode)):
+            logging.debug('sending send partition table to %s:%d',
+                          *(conn.getAddress()))
             # Split the packet if too huge.
             p = Packet()
             row_list = []