Introduce extra node properties

Explicit fields in RequestIdentification are only suitable for the actual
identification or for properties that most nodes have.

But some current (and future) features require to pass values (always and
as soon as possible) for tasks that are unrelated to identification.

neo/client/app.py

@@ -228,7 +228,7 @@ class Application(ThreadedApplication):
                         node=node,
                         dispatcher=self.dispatcher)
                 p = Packets.RequestIdentification(NodeTypes.CLIENT,
-                    self.uuid, None, self.name, None, (), ())
+                    self.uuid, None, self.name, None, {})
                 try:
                     ask(conn, p, handler=handler)
                 except ConnectionClosed:
@@ -270,7 +270,7 @@ class Application(ThreadedApplication):
         conn = MTClientConnection(self, self.storage_event_handler, node,
                                   dispatcher=self.dispatcher)
         p = Packets.RequestIdentification(NodeTypes.CLIENT,
-            self.uuid, None, self.name, self.id_timestamp, (), ())
+            self.uuid, None, self.name, self.id_timestamp, {})
         try:
             self._ask(conn, p, handler=self.storage_bootstrap_handler)
         except ConnectionClosed:

neo/lib/bootstrap.py

@@ -26,15 +26,14 @@ class BootstrapManager(EventHandler):
     Manage the bootstrap stage, lookup for the primary master then connect to it
     """
 
-    def __init__(self, app, node_type, server=None, devpath=(), new_nid=()):
+    def __init__(self, app, node_type, server=None, **extra):
         """
         Manage the bootstrap stage of a non-master node, it lookup for the
         primary master node, connect to it then returns when the master node
         is ready.
         """
         self.server = server
-        self.devpath = devpath
-        self.new_nid = new_nid
+        self.extra = extra
         self.node_type = node_type
         app.nm.reset()
 
@@ -43,7 +42,7 @@ class BootstrapManager(EventHandler):
     def connectionCompleted(self, conn):
         EventHandler.connectionCompleted(self, conn)
         conn.ask(Packets.RequestIdentification(self.node_type, self.uuid,
-            self.server, self.app.name, None, self.devpath, self.new_nid))
+            self.server, self.app.name, None, self.extra))
 
     def connectionFailed(self, conn):
         EventHandler.connectionFailed(self, conn)

neo/lib/node.py

@@ -28,7 +28,7 @@ class Node(object):
 
     _connection = None
     _identified = False
-    devpath = ()
+    extra = {}
     id_timestamp = None
 
     def __init__(self, manager, address=None, uuid=None, state=NodeStates.DOWN):

neo/master/handlers/identification.py

@@ -24,7 +24,7 @@ from ..app import monotonic_time
 class IdentificationHandler(EventHandler):
 
     def requestIdentification(self, conn, node_type, uuid,
-                              address, name, id_timestamp, devpath, new_nid):
+                              address, name, id_timestamp, extra):
         app = self.app
         self.checkClusterName(name)
         if address == app.server:
@@ -60,6 +60,7 @@ class IdentificationHandler(EventHandler):
             # cloned/evil/buggy node connecting to us
             raise ProtocolError('already connected')
 
+        new_nid = extra.pop('new_nid', None)
         state = NodeStates.RUNNING
         if node_type == NodeTypes.CLIENT:
             if app.cluster_state == ClusterStates.RUNNING:
@@ -111,8 +112,7 @@ class IdentificationHandler(EventHandler):
                 uuid=uuid, address=address)
         else:
             node.setUUID(uuid)
-        if devpath:
-            node.devpath = tuple(devpath)
+        node.extra = extra
         node.id_timestamp = monotonic_time()
         node.setState(state)
         app.broadcastNodesInformation([node])
@@ -135,7 +135,7 @@ class IdentificationHandler(EventHandler):
 class SecondaryIdentificationHandler(EventHandler):
 
     def requestIdentification(self, conn, node_type, uuid,
-                              address, name, id_timestamp, devpath, new_nid):
+                              address, name, id_timestamp, extra):
         app = self.app
         self.checkClusterName(name)
         if address == app.server:

neo/master/handlers/master.py

@@ -40,7 +40,7 @@ class ElectionHandler(SecondaryHandler):
         super(ElectionHandler, self).connectionCompleted(conn)
         app = self.app
         conn.ask(Packets.RequestIdentification(NodeTypes.MASTER,
-            app.uuid, app.server, app.name, app.election, (), ()))
+            app.uuid, app.server, app.name, app.election, {}))
 
     def connectionFailed(self, conn):
         super(ElectionHandler, self).connectionFailed(conn)

neo/master/pt.py

@@ -250,7 +250,7 @@ class PartitionTable(neo.lib.pt.PartitionTable):
         devpath_max = []
         devpaths = [()] * node_count
         if repeats > 1:
-            _devpaths = [x[0].devpath for x in node_list]
+            _devpaths = [x[0].extra.get('devpath', ()) for x in node_list]
             max_depth = min(map(len, _devpaths))
             depth = 0
             while 1:

neo/storage/app.py

@@ -252,7 +252,7 @@ class Application(BaseApplication):
         # search, find, connect and identify to the primary master
         bootstrap = BootstrapManager(self, NodeTypes.STORAGE,
                                      None if self.new_nid else self.server,
-                                     self.devpath, self.new_nid)
+                                     devpath=self.devpath, new_nid=self.new_nid)
         self.master_node, self.master_conn = bootstrap.getPrimaryConnection()
         self.dm.setUUID(self.uuid)
 

neo/storage/checker.py

@@ -51,7 +51,7 @@ class Checker(object):
             else:
                 conn = ClientConnection(app, StorageOperationHandler(app), node)
                 conn.ask(Packets.RequestIdentification(NodeTypes.STORAGE,
-                    uuid, app.server, name, app.id_timestamp, (), ()))
+                    uuid, app.server, name, app.id_timestamp, {}))
             self.conn_dict[conn] = node.isIdentified()
         conn_set = set(self.conn_dict)
         conn_set.discard(None)

neo/storage/handlers/identification.py

@@ -32,7 +32,7 @@ class IdentificationHandler(EventHandler):
         return self.app.nm
 
     def requestIdentification(self, conn, node_type, uuid, address, name,
-                              id_timestamp, devpath, new_nid):
+                              id_timestamp, extra):
         self.checkClusterName(name)
         app = self.app
         # reject any incoming connections if not ready

neo/storage/replicator.py

@@ -350,7 +350,7 @@ class Replicator(object):
             try:
                 conn.ask(Packets.RequestIdentification(NodeTypes.STORAGE,
                     None if name else app.uuid, app.server, name or app.name,
-                    app.id_timestamp, (), ()))
+                    app.id_timestamp, {}))
             except ConnectionClosed:
                 if previous_node is self.current_node:
                     return

neo/tests/master/testMasterPT.py

@@ -325,7 +325,7 @@ class MasterPartitionTableTests(NeoUnitTestBase):
         pt.make(sn)
         pt.log()
         for i, s in enumerate(sn, sn_count):
-            s.devpath = tuple(bin(i)[3:-1])
+            s.extra = {'devpath': tuple(bin(i)[3:-1])}
         self.assertEqual(Counter(x[2] for x in self.tweak(pt)), {
             CellStates.OUT_OF_DATE: 96,
             CellStates.FEEDING: 96,
@@ -360,12 +360,12 @@ class MasterPartitionTableTests(NeoUnitTestBase):
             assert len(topo) <= sn_count
             sn2 = sn[:len(topo)]
             for s in sn2:
-                s.devpath = ()
+                s.extra = {}
             k = (1,7)[even]
             pt = PartitionTable(np*k, i)
             pt.make(sn2)
             for devpath, s in zip(topo, sn2):
-                s.devpath = tuple(devpath)
+                s.extra = {'devpath': tuple(devpath)}
             if type(expected) is tuple:
                 self.assertTrue(self.tweak(pt))
                 self.update(pt)

neo/tests/protocol

@@ -89,7 +89,7 @@ Ping()
 Pong()
 Repair([int],bool)
 Replicate(p64,bin,{int:?(bin,int)})
-RequestIdentification(NodeTypes,?int,?(bin,int),bin,?float,any,[int])
+RequestIdentification(NodeTypes,?int,?(bin,int),bin,?float,{bin:any})
 SendPartitionTable(?int,int,[[(int,CellStates)]])
 SetClusterState(ClusterStates)
 SetNodeState(int,NodeStates)