add handler to manage newOIDList

use new protocol for NodeIdentification
plus fix some variable,import


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

neo/master/app.py

@@ -7,7 +7,7 @@ from struct import pack, unpack
 from neo.config import ConfigurationManager
 from neo.protocol import Packet, ProtocolError, \
         RUNNING_STATE, TEMPORARILY_DOWN_STATE, DOWN_STATE, BROKEN_STATE, \
-        INVALID_UUID, INVALID_OID, INVALID_TID, INVALID_PTID
+        INVALID_UUID, INVALID_OID, INVALID_TID, INVALID_PTID, CLIENT_NODE_TYPE
 from neo.node import NodeManager, MasterNode, StorageNode, ClientNode
 from neo.event import EventManager
 from neo.util import dump
@@ -240,7 +240,7 @@ class Application(object):
                     for conn in em.getConnectionList():
                         if isinstance(conn, ClientConnection):
                             # Still not closed.
-                            closed = Falsed
+                            closed = False
                             break
                     
                     if time() > t + 10:
@@ -673,7 +673,7 @@ class Application(object):
         """I play a secondary role, thus only wait for a primary master to fail."""
         logging.info('play the secondary role')
 
-        handler = SecondaryEventHandler()
+        handler = SecondaryEventHandler(self)
         em = self.em
         nm = self.nm
 
@@ -728,3 +728,9 @@ class Application(object):
 
     def getPartition(self, oid_or_tid):
         return unpack('!Q', oid_or_tid)[0] % self.num_partitions
+
+    def getNewOidList(self, num_oid):
+        return [self.getNextOid() for i in xrange(n)]
+
+        
+    

neo/master/election.py

@@ -71,7 +71,8 @@ class ElectionEventHandler(MasterEventHandler):
         MasterEventHandler.packetReceived(self, conn, packet)
 
     def handleAcceptNodeIdentification(self, conn, packet, node_type,
-                                       uuid, ip_address, port):
+                                       uuid, ip_address, port, num_partitions,
+                                       num_replicas):
         if isinstance(conn, ClientConnection):
             app = self.app
             node = app.nm.getNodeByServer(conn.getAddress())
@@ -137,10 +138,10 @@ class ElectionEventHandler(MasterEventHandler):
                     # is old. So ignore it.
                     pass
                 else:
-                    if node.getUUID() == primary_uuid:
+                    if primary_node.getUUID() == primary_uuid:
                         # Whatever the situation is, I trust this master.
                         app.primary = False
-                        app.primary_master_node = node
+                        app.primary_master_node = primary_node
             else:
                 if app.uuid < uuid:
                     # I lost.
@@ -190,7 +191,8 @@ class ElectionEventHandler(MasterEventHandler):
 
             p = Packet()
             p.acceptNodeIdentification(packet.getId(), MASTER_NODE_TYPE,
-                                       app.uuid, app.server[0], app.server[1])
+                                       app.uuid, app.server[0], app.server[1],
+                                       app.num_partitions, app.num_replicas)
             conn.addPacket(p)
             # Next, the peer should ask a primary master node.
             conn.expectMessage()

neo/master/handler.py

@@ -57,6 +57,10 @@ class MasterEventHandler(EventHandler):
         logging.info('ignoring Ask New TID')
         pass
 
+    def handleAskNewOIDList(self, conn, packet):
+        logging.info('ignoring Ask New OID List')
+        pass
+
     def handleFinishTransaction(self, conn, packet, oid_list, tid):
         logging.info('ignoring Finish Transaction')
         pass

neo/master/recovery.py

 import logging
 
 from neo.protocol import MASTER_NODE_TYPE, \
-        RUNNING_STATE, BROKEN_STATE, TEMPORARILY_DOWN_STATE, DOWN_STATE
+        RUNNING_STATE, BROKEN_STATE, TEMPORARILY_DOWN_STATE, DOWN_STATE, \
+        STORAGE_NODE_TYPE
 from neo.master.handler import MasterEventHandler
 from neo.exception import ElectionFailure
 from neo.protocol import Packet, INVALID_UUID
+from neo.node import ClientNode, StorageNode
 from neo.util import dump
 
 class RecoveryEventHandler(MasterEventHandler):
@@ -158,7 +160,8 @@ class RecoveryEventHandler(MasterEventHandler):
 
         p = Packet()
         p.acceptNodeIdentification(packet.getId(), MASTER_NODE_TYPE,
-                                   app.uuid, app.server[0], app.server[1])
+                                   app.uuid, app.server[0], app.server[1],
+                                   app.num_partitions, app.num_replicas)
         conn.addPacket(p)
         # Next, the peer should ask a primary master node.
         conn.expectMessage()

neo/master/secondary.py

@@ -64,7 +64,8 @@ class SecondaryEventHandler(MasterEventHandler):
 
             p = Packet()
             p.acceptNodeIdentification(packet.getId(), MASTER_NODE_TYPE,
-                                       app.uuid, app.server[0], app.server[1])
+                                       app.uuid, app.server[0], app.server[1],
+                                       app.num_partitions, app.num_replicas)
             conn.addPacket(p)
             # Next, the peer should ask a primary master node.
             conn.expectMessage()

neo/master/service.py

@@ -207,7 +207,8 @@ class ServiceEventHandler(MasterEventHandler):
 
         p = Packet()
         p.acceptNodeIdentification(packet.getId(), MASTER_NODE_TYPE,
-                                   app.uuid, app.server[0], app.server[1])
+                                   app.uuid, app.server[0], app.server[1],
+                                   app.num_partitions, app.num_replicas)
         conn.addPacket(p)
         # Next, the peer should ask a primary master node.
         conn.expectMessage()
@@ -369,6 +370,22 @@ class ServiceEventHandler(MasterEventHandler):
         tid = app.getNextTID()
         conn.addPacket(Packet().answerNewTID(packet.getId(), tid))
 
+    def handleAskNewOIDList(self, conn, packet, num_oid):
+        uuid = conn.getUUID()
+        if uuid is None:
+            self.handleUnexpectedPacket(conn, packet)
+            return
+
+        app = self.app
+
+        node = app.nm.getNodeByUUID(uuid)
+        if not isinstance(node, ClientNode):
+            self.handleUnexpectedPacket(conn, packet)
+            return
+
+        oid = app.getNextOIDList(num_oid)
+        conn.addPacket(Packet().answerNewOIDList(packet.getId(), num_oid, oid_list))
+
     def handleFinishTransaction(self, conn, packet, oid_list, tid):
         uuid = conn.getUUID()
         if uuid is None:

neo/master/verification.py

@@ -173,7 +173,8 @@ class VerificationEventHandler(MasterEventHandler):
 
         p = Packet()
         p.acceptNodeIdentification(packet.getId(), MASTER_NODE_TYPE,
-                                   app.uuid, app.server[0], app.server[1])
+                                   app.uuid, app.server[0], app.server[1],
+                                   app.num_partitions, app.num_replicas)
         conn.addPacket(p)
         # Next, the peer should ask a primary master node.
         conn.expectMessage()