Skip to content

N
neoppod
Commit a26e93f6 authored by Grégory Wisniewski's avatar Grégory Wisniewski
Browse files
Options

Fix some tests about accessors on partitions number, replicas and partition 

table ID.


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@673 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 25c190e1
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 64 deletions
neo/master/tests/testMasterElectionHandler.py
View file @ a26e93f6
...@@ -263,7 +263,7 @@ class MasterElectionTests(NeoTestBase): ...@@ -263,7 +263,7 @@ class MasterElectionTests(NeoTestBase):
conn = ClientConnection(self.app.em, self.election, addr = ("127.0.0.1", self.master_port), conn = ClientConnection(self.app.em, self.election, addr = ("127.0.0.1", self.master_port),
connector_handler = DoNothingConnector) connector_handler = DoNothingConnector)
args = (MASTER_NODE_TYPE, uuid, '127.0.0.1', self.master_port, args = (MASTER_NODE_TYPE, uuid, '127.0.0.1', self.master_port,
self.app.num_partitions, self.app.num_replicas, self.app.uuid) self.app.pt.getPartitions(), self.app.pt.getReplicas(), self.app.uuid)
p = protocol.acceptNodeIdentification(*args) p = protocol.acceptNodeIdentification(*args)
self.assertEqual(len(self.app.unconnected_master_node_set), 0) self.assertEqual(len(self.app.unconnected_master_node_set), 0)
self.assertEqual(len(self.app.negotiating_master_node_set), 1) self.assertEqual(len(self.app.negotiating_master_node_set), 1)
...@@ -272,8 +272,8 @@ class MasterElectionTests(NeoTestBase): ...@@ -272,8 +272,8 @@ class MasterElectionTests(NeoTestBase):
self.assertEqual(len(conn.getConnector().mockGetNamedCalls("_addPacket")),1) self.assertEqual(len(conn.getConnector().mockGetNamedCalls("_addPacket")),1)
self.election.handleAcceptNodeIdentification(conn, p, STORAGE_NODE_TYPE, self.election.handleAcceptNodeIdentification(conn, p, STORAGE_NODE_TYPE,
uuid, "127.0.0.1", self.master_port, uuid, "127.0.0.1", self.master_port,
self.app.num_partitions, self.app.pt.getPartitions(),
self.app.num_replicas, self.app.pt.getReplicas(),
self.app.uuid self.app.uuid
) )
self.assertEqual(conn.getConnector(), None) self.assertEqual(conn.getConnector(), None)
...@@ -286,7 +286,7 @@ class MasterElectionTests(NeoTestBase): ...@@ -286,7 +286,7 @@ class MasterElectionTests(NeoTestBase):
conn = ClientConnection(self.app.em, self.election, addr = ("127.0.0.1", self.master_port), conn = ClientConnection(self.app.em, self.election, addr = ("127.0.0.1", self.master_port),
connector_handler = DoNothingConnector) connector_handler = DoNothingConnector)
args = (MASTER_NODE_TYPE, uuid, '127.0.0.1', self.master_port, args = (MASTER_NODE_TYPE, uuid, '127.0.0.1', self.master_port,
self.app.num_partitions, self.app.num_replicas, self.app.uuid) self.app.pt.getPartitions(), self.app.pt.getReplicas(), self.app.uuid)
p = protocol.acceptNodeIdentification(*args) p = protocol.acceptNodeIdentification(*args)
self.assertEqual(len(self.app.unconnected_master_node_set), 0) self.assertEqual(len(self.app.unconnected_master_node_set), 0)
self.assertEqual(len(self.app.negotiating_master_node_set), 1) self.assertEqual(len(self.app.negotiating_master_node_set), 1)
...@@ -295,8 +295,8 @@ class MasterElectionTests(NeoTestBase): ...@@ -295,8 +295,8 @@ class MasterElectionTests(NeoTestBase):
self.assertEqual(len(conn.getConnector().mockGetNamedCalls("_addPacket")),1) self.assertEqual(len(conn.getConnector().mockGetNamedCalls("_addPacket")),1)
self.election.handleAcceptNodeIdentification(conn, p, STORAGE_NODE_TYPE, self.election.handleAcceptNodeIdentification(conn, p, STORAGE_NODE_TYPE,
uuid, "127.0.0.2", self.master_port, uuid, "127.0.0.2", self.master_port,
self.app.num_partitions, self.app.pt.getPartitions(),
self.app.num_replicas, self.app.pt.getReplicas(),
self.app.uuid) self.app.uuid)
self.assertEqual(conn.getConnector(), None) self.assertEqual(conn.getConnector(), None)
...@@ -306,7 +306,7 @@ class MasterElectionTests(NeoTestBase): ...@@ -306,7 +306,7 @@ class MasterElectionTests(NeoTestBase):
conn = ClientConnection(self.app.em, self.election, addr = ("127.0.0.1", self.master_port), conn = ClientConnection(self.app.em, self.election, addr = ("127.0.0.1", self.master_port),
connector_handler = DoNothingConnector) connector_handler = DoNothingConnector)
args = (MASTER_NODE_TYPE, uuid, '127.0.0.1', self.master_port, args = (MASTER_NODE_TYPE, uuid, '127.0.0.1', self.master_port,
self.app.num_partitions, self.app.num_replicas, self.app.uuid) self.app.pt.getPartitions(), self.app.pt.getReplicas(), self.app.uuid)
p = protocol.acceptNodeIdentification(*args) p = protocol.acceptNodeIdentification(*args)
self.assertEqual(len(self.app.unconnected_master_node_set), 0) self.assertEqual(len(self.app.unconnected_master_node_set), 0)
self.assertEqual(len(self.app.negotiating_master_node_set), 1) self.assertEqual(len(self.app.negotiating_master_node_set), 1)
...@@ -316,8 +316,8 @@ class MasterElectionTests(NeoTestBase): ...@@ -316,8 +316,8 @@ class MasterElectionTests(NeoTestBase):
self.election.handleAcceptNodeIdentification(conn, p, MASTER_NODE_TYPE, self.election.handleAcceptNodeIdentification(conn, p, MASTER_NODE_TYPE,
uuid, "127.0.0.1", self.master_port, uuid, "127.0.0.1", self.master_port,
self.app.num_partitions, self.app.pt.getPartitions(),
self.app.num_replicas, self.app.pt.getReplicas(),
self.app.uuid) self.app.uuid)
self.assertEqual(self.app.nm.getNodeByServer(conn.getAddress()).getUUID(), uuid) self.assertEqual(self.app.nm.getNodeByServer(conn.getAddress()).getUUID(), uuid)
self.assertEqual(conn.getUUID(), uuid) self.assertEqual(conn.getUUID(), uuid)
......
neo/master/tests/testMasterRecoveryHandler.py
View file @ a26e93f6
...@@ -454,14 +454,14 @@ class MasterRecoveryTests(NeoTestBase): ...@@ -454,14 +454,14 @@ class MasterRecoveryTests(NeoTestBase):
packet = Packet(msg_type=ANSWER_LAST_IDS) packet = Packet(msg_type=ANSWER_LAST_IDS)
loid = self.app.loid loid = self.app.loid
ltid = self.app.ltid ltid = self.app.ltid
lptid = self.app.lptid lptid = self.app.pt.getID()
# do not answer if no uuid # do not answer if no uuid
conn = self.getFakeConnection(None, self.storage_port) conn = self.getFakeConnection(None, self.storage_port)
node_list = [] node_list = []
self.checkIdenficationRequired(recovery.handleAnswerLastIDs, conn, packet, None, None, None) self.checkIdenficationRequired(recovery.handleAnswerLastIDs, conn, packet, None, None, None)
self.assertEquals(loid, self.app.loid) self.assertEquals(loid, self.app.loid)
self.assertEquals(ltid, self.app.ltid) self.assertEquals(ltid, self.app.ltid)
self.assertEquals(lptid, self.app.lptid) self.assertEquals(lptid, self.app.pt.getID())
# do not care if master node call it # do not care if master node call it
master_uuid = self.identifyToMasterNode(node_type=MASTER_NODE_TYPE, port=self.master_port) master_uuid = self.identifyToMasterNode(node_type=MASTER_NODE_TYPE, port=self.master_port)
conn = self.getFakeConnection(master_uuid, self.master_address) conn = self.getFakeConnection(master_uuid, self.master_address)
...@@ -469,7 +469,7 @@ class MasterRecoveryTests(NeoTestBase): ...@@ -469,7 +469,7 @@ class MasterRecoveryTests(NeoTestBase):
self.checkUnexpectedPacketRaised(recovery.handleAnswerLastIDs, conn, packet, None, None, None) self.checkUnexpectedPacketRaised(recovery.handleAnswerLastIDs, conn, packet, None, None, None)
self.assertEquals(loid, self.app.loid) self.assertEquals(loid, self.app.loid)
self.assertEquals(ltid, self.app.ltid) self.assertEquals(ltid, self.app.ltid)
self.assertEquals(lptid, self.app.lptid) self.assertEquals(lptid, self.app.pt.getID())
# send information which are later to what PMN knows, this must update target node # send information which are later to what PMN knows, this must update target node
conn = self.getFakeConnection(uuid, self.storage_port) conn = self.getFakeConnection(uuid, self.storage_port)
node_list = [] node_list = []
...@@ -479,14 +479,14 @@ class MasterRecoveryTests(NeoTestBase): ...@@ -479,14 +479,14 @@ class MasterRecoveryTests(NeoTestBase):
new_oid = pack('!Q', oid + 1) new_oid = pack('!Q', oid + 1)
upper, lower = unpack('!LL', ltid) upper, lower = unpack('!LL', ltid)
new_tid = pack('!LL', upper, lower + 10) new_tid = pack('!LL', upper, lower + 10)
self.failUnless(new_ptid > self.app.lptid) self.failUnless(new_ptid > self.app.pt.getID())
self.failUnless(new_oid > self.app.loid) self.failUnless(new_oid > self.app.loid)
self.failUnless(new_tid > self.app.ltid) self.failUnless(new_tid > self.app.ltid)
self.assertEquals(self.app.target_uuid, None) self.assertEquals(self.app.target_uuid, None)
recovery.handleAnswerLastIDs(conn, packet, new_oid, new_tid, new_ptid) recovery.handleAnswerLastIDs(conn, packet, new_oid, new_tid, new_ptid)
self.assertEquals(new_oid, self.app.loid) self.assertEquals(new_oid, self.app.loid)
self.assertEquals(new_tid, self.app.ltid) self.assertEquals(new_tid, self.app.ltid)
self.assertEquals(new_ptid, self.app.lptid) self.assertEquals(new_ptid, self.app.pt.getID())
self.assertEquals(self.app.target_uuid,uuid) self.assertEquals(self.app.target_uuid,uuid)
......
neo/master/tests/testMasterService.py
View file @ a26e93f6
...@@ -45,7 +45,7 @@ class MasterServiceTests(NeoTestBase): ...@@ -45,7 +45,7 @@ class MasterServiceTests(NeoTestBase):
config = self.getConfigFile(master_number=1, replicas=1) config = self.getConfigFile(master_number=1, replicas=1)
self.app = Application(config, "master1") self.app = Application(config, "master1")
self.app.pt.clear() self.app.pt.clear()
self.app.lptid = pack('!Q', 1) self.app.pt.setID(pack('!Q', 1))
self.app.em = Mock({"getConnectionList" : []}) self.app.em = Mock({"getConnectionList" : []})
self.app.finishing_transaction_dict = {} self.app.finishing_transaction_dict = {}
for server in self.app.master_node_list: for server in self.app.master_node_list:
...@@ -87,14 +87,14 @@ class MasterServiceTests(NeoTestBase): ...@@ -87,14 +87,14 @@ class MasterServiceTests(NeoTestBase):
packet = protocol.requestNodeIdentification(*args) packet = protocol.requestNodeIdentification(*args)
# test alien cluster # test alien cluster
conn = self.getFakeConnection() conn = self.getFakeConnection()
ptid = self.app.lptid ptid = self.app.pt.getID()
self.checkProtocolErrorRaised(service.handleRequestNodeIdentification, conn, packet, *args) self.checkProtocolErrorRaised(service.handleRequestNodeIdentification, conn, packet, *args)
self.assertEquals(len(self.app.nm.getStorageNodeList()), 0) self.assertEquals(len(self.app.nm.getStorageNodeList()), 0)
self.assertEquals(self.app.lptid, ptid) self.assertEquals(self.app.pt.getID(), ptid)
# test connection of a storage node # test connection of a storage node
conn = self.getFakeConnection() conn = self.getFakeConnection()
ptid = self.app.lptid ptid = self.app.pt.getID()
service.handleRequestNodeIdentification(conn, service.handleRequestNodeIdentification(conn,
packet=packet, packet=packet,
node_type=STORAGE_NODE_TYPE, node_type=STORAGE_NODE_TYPE,
...@@ -108,11 +108,11 @@ class MasterServiceTests(NeoTestBase): ...@@ -108,11 +108,11 @@ class MasterServiceTests(NeoTestBase):
self.assertEquals(sn.getServer(), ('127.0.0.1', self.storage_port)) self.assertEquals(sn.getServer(), ('127.0.0.1', self.storage_port))
self.assertEquals(sn.getUUID(), uuid) self.assertEquals(sn.getUUID(), uuid)
self.assertEquals(sn.getState(), RUNNING_STATE) self.assertEquals(sn.getState(), RUNNING_STATE)
self.failUnless(self.app.lptid > ptid) self.failUnless(self.app.pt.getID() > ptid)
# send message again for the same storage node, MN must recognize it # send message again for the same storage node, MN must recognize it
conn = self.getFakeConnection() conn = self.getFakeConnection()
ptid = self.app.lptid ptid = self.app.pt.getID()
service.handleRequestNodeIdentification(conn, service.handleRequestNodeIdentification(conn,
packet=packet, packet=packet,
node_type=STORAGE_NODE_TYPE, node_type=STORAGE_NODE_TYPE,
...@@ -126,12 +126,12 @@ class MasterServiceTests(NeoTestBase): ...@@ -126,12 +126,12 @@ class MasterServiceTests(NeoTestBase):
self.assertEquals(sn.getUUID(), uuid) self.assertEquals(sn.getUUID(), uuid)
self.assertEquals(sn.getState(), RUNNING_STATE) self.assertEquals(sn.getState(), RUNNING_STATE)
# No change of partition table # No change of partition table
self.assertEquals(self.app.lptid, ptid) self.assertEquals(self.app.pt.getID(), ptid)
# send message again for the same storage node but different uuid # send message again for the same storage node but different uuid
# must be rejected as SN is considered as running # must be rejected as SN is considered as running
conn = self.getFakeConnection() conn = self.getFakeConnection()
ptid = self.app.lptid ptid = self.app.pt.getID()
new_uuid = self.getNewUUID() new_uuid = self.getNewUUID()
self.checkProtocolErrorRaised( self.checkProtocolErrorRaised(
...@@ -148,12 +148,12 @@ class MasterServiceTests(NeoTestBase): ...@@ -148,12 +148,12 @@ class MasterServiceTests(NeoTestBase):
self.assertEquals(sn.getUUID(), uuid) self.assertEquals(sn.getUUID(), uuid)
self.assertEquals(sn.getState(), RUNNING_STATE) self.assertEquals(sn.getState(), RUNNING_STATE)
# No change of partition table # No change of partition table
self.assertEquals(self.app.lptid, ptid) self.assertEquals(self.app.pt.getID(), ptid)
# same test, but set SN as not running before # same test, but set SN as not running before
# this new node must replaced the old one # this new node must replaced the old one
conn = self.getFakeConnection() conn = self.getFakeConnection()
ptid = self.app.lptid ptid = self.app.pt.getID()
sn = self.app.nm.getStorageNodeList()[0] sn = self.app.nm.getStorageNodeList()[0]
self.assertEquals(sn.getState(), RUNNING_STATE) self.assertEquals(sn.getState(), RUNNING_STATE)
sn.setState(TEMPORARILY_DOWN_STATE) sn.setState(TEMPORARILY_DOWN_STATE)
...@@ -173,13 +173,13 @@ class MasterServiceTests(NeoTestBase): ...@@ -173,13 +173,13 @@ class MasterServiceTests(NeoTestBase):
self.assertEquals(sn.getUUID(), new_uuid) self.assertEquals(sn.getUUID(), new_uuid)
self.assertEquals(sn.getState(), RUNNING_STATE) self.assertEquals(sn.getState(), RUNNING_STATE)
# Partition table changed # Partition table changed
self.failUnless(self.app.lptid > ptid) self.failUnless(self.app.pt.getID() > ptid)
uuid = new_uuid uuid = new_uuid
# send message again for the same storage node but different address # send message again for the same storage node but different address
# A new UUID should be send and the node is added to the storage node list # A new UUID should be send and the node is added to the storage node list
conn = self.getFakeConnection() conn = self.getFakeConnection()
ptid = self.app.lptid ptid = self.app.pt.getID()
service.handleRequestNodeIdentification(conn, service.handleRequestNodeIdentification(conn,
packet=packet, packet=packet,
node_type=STORAGE_NODE_TYPE, node_type=STORAGE_NODE_TYPE,
...@@ -201,11 +201,11 @@ class MasterServiceTests(NeoTestBase): ...@@ -201,11 +201,11 @@ class MasterServiceTests(NeoTestBase):
self.assertEquals(sn.getUUID(), new_uuid) self.assertEquals(sn.getUUID(), new_uuid)
self.assertEquals(sn.getState(), RUNNING_STATE) self.assertEquals(sn.getState(), RUNNING_STATE)
# Partition table changed # Partition table changed
self.failUnless(self.app.lptid > ptid) self.failUnless(self.app.pt.getID() > ptid)
# mark the node as broken and request identification, this must be forbidden # mark the node as broken and request identification, this must be forbidden
conn = self.getFakeConnection() conn = self.getFakeConnection()
ptid = self.app.lptid ptid = self.app.pt.getID()
sn = self.app.nm.getStorageNodeList()[0] sn = self.app.nm.getStorageNodeList()[0]
self.assertEquals(sn.getState(), RUNNING_STATE) self.assertEquals(sn.getState(), RUNNING_STATE)
sn.setState(BROKEN_STATE) sn.setState(BROKEN_STATE)
...@@ -226,7 +226,7 @@ class MasterServiceTests(NeoTestBase): ...@@ -226,7 +226,7 @@ class MasterServiceTests(NeoTestBase):
self.assertEquals(sn.getUUID(), uuid) self.assertEquals(sn.getUUID(), uuid)
self.assertEquals(sn.getState(), BROKEN_STATE) self.assertEquals(sn.getState(), BROKEN_STATE)
# No change of partition table # No change of partition table
self.assertEqual(self.app.lptid, ptid) self.assertEqual(self.app.pt.getID(), ptid)
def test_02_handleAskPrimaryMaster(self): def test_02_handleAskPrimaryMaster(self):
...@@ -320,7 +320,7 @@ class MasterServiceTests(NeoTestBase): ...@@ -320,7 +320,7 @@ class MasterServiceTests(NeoTestBase):
for call in conn.mockGetAllCalls(): for call in conn.mockGetAllCalls():
self.assertEquals(call.getName(), "getUUID") self.assertEquals(call.getName(), "getUUID")
# notify node is temp down, must be taken into account # notify node is temp down, must be taken into account
ptid = self.app.lptid ptid = self.app.pt.getID()
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
node_list = [(STORAGE_NODE_TYPE, '127.0.0.1', self.storage_port, uuid, TEMPORARILY_DOWN_STATE),] node_list = [(STORAGE_NODE_TYPE, '127.0.0.1', self.storage_port, uuid, TEMPORARILY_DOWN_STATE),]
service.handleNotifyNodeInformation(conn, packet, node_list) service.handleNotifyNodeInformation(conn, packet, node_list)
...@@ -328,7 +328,7 @@ class MasterServiceTests(NeoTestBase): ...@@ -328,7 +328,7 @@ class MasterServiceTests(NeoTestBase):
self.assertEquals(call.getName(), "getUUID") self.assertEquals(call.getName(), "getUUID")
sn = self.app.nm.getStorageNodeList()[0] sn = self.app.nm.getStorageNodeList()[0]
self.assertEquals(sn.getState(), TEMPORARILY_DOWN_STATE) self.assertEquals(sn.getState(), TEMPORARILY_DOWN_STATE)
self.assertEquals(ptid, self.app.lptid) self.assertEquals(ptid, self.app.pt.getID())
# notify node is broken, must be taken into account and partition must changed # notify node is broken, must be taken into account and partition must changed
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
node_list = [(STORAGE_NODE_TYPE, '127.0.0.1', self.storage_port, uuid, BROKEN_STATE),] node_list = [(STORAGE_NODE_TYPE, '127.0.0.1', self.storage_port, uuid, BROKEN_STATE),]
...@@ -337,7 +337,7 @@ class MasterServiceTests(NeoTestBase): ...@@ -337,7 +337,7 @@ class MasterServiceTests(NeoTestBase):
self.assertEquals(call.getName(), "getUUID") self.assertEquals(call.getName(), "getUUID")
sn = self.app.nm.getStorageNodeList()[0] sn = self.app.nm.getStorageNodeList()[0]
self.assertEquals(sn.getState(), BROKEN_STATE) self.assertEquals(sn.getState(), BROKEN_STATE)
self.failUnless(ptid < self.app.lptid) self.failUnless(ptid < self.app.pt.getID())
def test_06_handleAnswerLastIDs(self): def test_06_handleAnswerLastIDs(self):
service = self.service service = self.service
...@@ -345,14 +345,14 @@ class MasterServiceTests(NeoTestBase): ...@@ -345,14 +345,14 @@ class MasterServiceTests(NeoTestBase):
packet = Packet(msg_type=ANSWER_LAST_IDS) packet = Packet(msg_type=ANSWER_LAST_IDS)
loid = self.app.loid loid = self.app.loid
ltid = self.app.ltid ltid = self.app.ltid
lptid = self.app.lptid lptid = self.app.pt.getID()
# do not answer if no uuid # do not answer if no uuid
conn = self.getFakeConnection(None, self.storage_address) conn = self.getFakeConnection(None, self.storage_address)
node_list = [] node_list = []
self.checkIdenficationRequired(service.handleAnswerLastIDs, conn, packet, None, None, None) self.checkIdenficationRequired(service.handleAnswerLastIDs, conn, packet, None, None, None)
self.assertEquals(loid, self.app.loid) self.assertEquals(loid, self.app.loid)
self.assertEquals(ltid, self.app.ltid) self.assertEquals(ltid, self.app.ltid)
self.assertEquals(lptid, self.app.lptid) self.assertEquals(lptid, self.app.pt.getID())
# do not care if client node call it # do not care if client node call it
client_uuid = self.identifyToMasterNode(node_type=CLIENT_NODE_TYPE, port=self.client_port) client_uuid = self.identifyToMasterNode(node_type=CLIENT_NODE_TYPE, port=self.client_port)
conn = self.getFakeConnection(client_uuid, self.client_address) conn = self.getFakeConnection(client_uuid, self.client_address)
...@@ -360,17 +360,17 @@ class MasterServiceTests(NeoTestBase): ...@@ -360,17 +360,17 @@ class MasterServiceTests(NeoTestBase):
self.checkUnexpectedPacketRaised(service.handleAnswerLastIDs, conn, packet, None, None, None) self.checkUnexpectedPacketRaised(service.handleAnswerLastIDs, conn, packet, None, None, None)
self.assertEquals(loid, self.app.loid) self.assertEquals(loid, self.app.loid)
self.assertEquals(ltid, self.app.ltid) self.assertEquals(ltid, self.app.ltid)
self.assertEquals(lptid, self.app.lptid) self.assertEquals(lptid, self.app.pt.getID())
# send information which are later to what PMN knows, this must raise # send information which are later to what PMN knows, this must raise
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
node_list = [] node_list = []
new_ptid = unpack('!Q', lptid)[0] new_ptid = unpack('!Q', lptid)[0]
new_ptid = pack('!Q', new_ptid + 1) new_ptid = pack('!Q', new_ptid + 1)
self.failUnless(new_ptid > self.app.lptid) self.failUnless(new_ptid > self.app.pt.getID())
self.assertRaises(OperationFailure, service.handleAnswerLastIDs, conn, packet, None, None, new_ptid) self.assertRaises(OperationFailure, service.handleAnswerLastIDs, conn, packet, None, None, new_ptid)
self.assertEquals(loid, self.app.loid) self.assertEquals(loid, self.app.loid)
self.assertEquals(ltid, self.app.ltid) self.assertEquals(ltid, self.app.ltid)
self.assertEquals(lptid, self.app.lptid) self.assertEquals(lptid, self.app.pt.getID())
def test_07_handleAskNewTID(self): def test_07_handleAskNewTID(self):
...@@ -551,7 +551,7 @@ class MasterServiceTests(NeoTestBase): ...@@ -551,7 +551,7 @@ class MasterServiceTests(NeoTestBase):
self.checkIdenficationRequired(service.handleAskLastIDs, conn, packet ) self.checkIdenficationRequired(service.handleAskLastIDs, conn, packet )
# give a uuid # give a uuid
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
ptid = self.app.lptid ptid = self.app.pt.getID()
tid = self.app.ltid tid = self.app.ltid
oid = self.app.loid oid = self.app.loid
service.handleAskLastIDs(conn, packet) service.handleAskLastIDs(conn, packet)
...@@ -647,9 +647,9 @@ class MasterServiceTests(NeoTestBase): ...@@ -647,9 +647,9 @@ class MasterServiceTests(NeoTestBase):
self.assertEquals(state, FEEDING_STATE) self.assertEquals(state, FEEDING_STATE)
else: else:
self.assertEquals(state, OUT_OF_DATE_STATE) self.assertEquals(state, OUT_OF_DATE_STATE)
lptid = self.app.lptid lptid = self.app.pt.getID()
service.handleNotifyPartitionChanges(conn, packet, self.app.lptid, cell_list) service.handleNotifyPartitionChanges(conn, packet, self.app.pt.getID(), cell_list)
self.failUnless(lptid < self.app.lptid) self.failUnless(lptid < self.app.pt.getID())
cells = self.app.pt.getRow(offset) cells = self.app.pt.getRow(offset)
for cell, state in cells: for cell, state in cells:
if cell == uuid: if cell == uuid:
...@@ -674,23 +674,23 @@ class MasterServiceTests(NeoTestBase): ...@@ -674,23 +674,23 @@ class MasterServiceTests(NeoTestBase):
self.assertTrue(self.app.pt.filled()) self.assertTrue(self.app.pt.filled())
self.assertTrue(self.app.pt.operational()) self.assertTrue(self.app.pt.operational())
conn = self.getFakeConnection(storage_uuid, ('127.0.0.1', self.storage_port+1)) conn = self.getFakeConnection(storage_uuid, ('127.0.0.1', self.storage_port+1))
lptid = self.app.lptid lptid = self.app.pt.getID()
self.assertEquals(self.app.nm.getNodeByUUID(storage_uuid).getState(), RUNNING_STATE) self.assertEquals(self.app.nm.getNodeByUUID(storage_uuid).getState(), RUNNING_STATE)
service.peerBroken(conn) service.peerBroken(conn)
self.assertEquals(self.app.nm.getNodeByUUID(storage_uuid).getState(), BROKEN_STATE) self.assertEquals(self.app.nm.getNodeByUUID(storage_uuid).getState(), BROKEN_STATE)
self.failUnless(lptid < self.app.lptid) self.failUnless(lptid < self.app.pt.getID())
# give an uuid, must raise as no other storage node available # give an uuid, must raise as no other storage node available
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
lptid = self.app.lptid lptid = self.app.pt.getID()
self.assertEquals(self.app.nm.getNodeByUUID(uuid).getState(), RUNNING_STATE) self.assertEquals(self.app.nm.getNodeByUUID(uuid).getState(), RUNNING_STATE)
self.assertRaises(OperationFailure, service.peerBroken, conn) self.assertRaises(OperationFailure, service.peerBroken, conn)
self.assertEquals(self.app.nm.getNodeByUUID(uuid).getState(), BROKEN_STATE) self.assertEquals(self.app.nm.getNodeByUUID(uuid).getState(), BROKEN_STATE)
self.failUnless(lptid < self.app.lptid) self.failUnless(lptid < self.app.pt.getID())
# give a client uuid which have unfinished transactions # give a client uuid which have unfinished transactions
client_uuid = self.identifyToMasterNode(node_type=CLIENT_NODE_TYPE, client_uuid = self.identifyToMasterNode(node_type=CLIENT_NODE_TYPE,
port = self.client_port) port = self.client_port)
conn = self.getFakeConnection(client_uuid, self.client_address) conn = self.getFakeConnection(client_uuid, self.client_address)
lptid = self.app.lptid lptid = self.app.pt.getID()
packet = Packet(msg_type=ASK_NEW_TID) packet = Packet(msg_type=ASK_NEW_TID)
service.handleAskNewTID(conn, packet) service.handleAskNewTID(conn, packet)
service.handleAskNewTID(conn, packet) service.handleAskNewTID(conn, packet)
...@@ -700,7 +700,7 @@ class MasterServiceTests(NeoTestBase): ...@@ -700,7 +700,7 @@ class MasterServiceTests(NeoTestBase):
service.peerBroken(conn) service.peerBroken(conn)
# node must be have been remove, and no more transaction must remains # node must be have been remove, and no more transaction must remains
self.assertEquals(self.app.nm.getNodeByUUID(client_uuid), None) self.assertEquals(self.app.nm.getNodeByUUID(client_uuid), None)
self.assertEquals(lptid, self.app.lptid) self.assertEquals(lptid, self.app.pt.getID())
self.assertEquals(len(self.app.finishing_transaction_dict.keys()), 0) self.assertEquals(len(self.app.finishing_transaction_dict.keys()), 0)
...@@ -720,23 +720,23 @@ class MasterServiceTests(NeoTestBase): ...@@ -720,23 +720,23 @@ class MasterServiceTests(NeoTestBase):
self.assertTrue(self.app.pt.filled()) self.assertTrue(self.app.pt.filled())
self.assertTrue(self.app.pt.operational()) self.assertTrue(self.app.pt.operational())
conn = self.getFakeConnection(storage_uuid, ('127.0.0.1', self.storage_port+1)) conn = self.getFakeConnection(storage_uuid, ('127.0.0.1', self.storage_port+1))
lptid = self.app.lptid lptid = self.app.pt.getID()
self.assertEquals(self.app.nm.getNodeByUUID(storage_uuid).getState(), RUNNING_STATE) self.assertEquals(self.app.nm.getNodeByUUID(storage_uuid).getState(), RUNNING_STATE)
service.timeoutExpired(conn) service.timeoutExpired(conn)
self.assertEquals(self.app.nm.getNodeByUUID(storage_uuid).getState(), TEMPORARILY_DOWN_STATE) self.assertEquals(self.app.nm.getNodeByUUID(storage_uuid).getState(), TEMPORARILY_DOWN_STATE)
self.assertEquals(lptid, self.app.lptid) self.assertEquals(lptid, self.app.pt.getID())
# give an uuid, must raise as no other storage node available # give an uuid, must raise as no other storage node available
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
lptid = self.app.lptid lptid = self.app.pt.getID()
self.assertEquals(self.app.nm.getNodeByUUID(uuid).getState(), RUNNING_STATE) self.assertEquals(self.app.nm.getNodeByUUID(uuid).getState(), RUNNING_STATE)
self.assertRaises(OperationFailure, service.timeoutExpired, conn) self.assertRaises(OperationFailure, service.timeoutExpired, conn)
self.assertEquals(self.app.nm.getNodeByUUID(uuid).getState(), TEMPORARILY_DOWN_STATE) self.assertEquals(self.app.nm.getNodeByUUID(uuid).getState(), TEMPORARILY_DOWN_STATE)
self.assertEquals(lptid, self.app.lptid) self.assertEquals(lptid, self.app.pt.getID())
# give a client uuid which have unfinished transactions # give a client uuid which have unfinished transactions
client_uuid = self.identifyToMasterNode(node_type=CLIENT_NODE_TYPE, client_uuid = self.identifyToMasterNode(node_type=CLIENT_NODE_TYPE,
port = self.client_port) port = self.client_port)
conn = self.getFakeConnection(client_uuid, self.client_address) conn = self.getFakeConnection(client_uuid, self.client_address)
lptid = self.app.lptid lptid = self.app.pt.getID()
packet = Packet(msg_type=ASK_NEW_TID) packet = Packet(msg_type=ASK_NEW_TID)
service.handleAskNewTID(conn, packet) service.handleAskNewTID(conn, packet)
service.handleAskNewTID(conn, packet) service.handleAskNewTID(conn, packet)
...@@ -746,7 +746,7 @@ class MasterServiceTests(NeoTestBase): ...@@ -746,7 +746,7 @@ class MasterServiceTests(NeoTestBase):
service.timeoutExpired(conn) service.timeoutExpired(conn)
# node must be have been remove, and no more transaction must remains # node must be have been remove, and no more transaction must remains
self.assertEquals(self.app.nm.getNodeByUUID(client_uuid), None) self.assertEquals(self.app.nm.getNodeByUUID(client_uuid), None)
self.assertEquals(lptid, self.app.lptid) self.assertEquals(lptid, self.app.pt.getID())
self.assertEquals(len(self.app.finishing_transaction_dict.keys()), 0) self.assertEquals(len(self.app.finishing_transaction_dict.keys()), 0)
...@@ -766,23 +766,23 @@ class MasterServiceTests(NeoTestBase): ...@@ -766,23 +766,23 @@ class MasterServiceTests(NeoTestBase):
self.assertTrue(self.app.pt.filled()) self.assertTrue(self.app.pt.filled())
self.assertTrue(self.app.pt.operational()) self.assertTrue(self.app.pt.operational())
conn = self.getFakeConnection(storage_uuid, ('127.0.0.1', self.storage_port+1)) conn = self.getFakeConnection(storage_uuid, ('127.0.0.1', self.storage_port+1))
lptid = self.app.lptid lptid = self.app.pt.getID()
self.assertEquals(self.app.nm.getNodeByUUID(storage_uuid).getState(), RUNNING_STATE) self.assertEquals(self.app.nm.getNodeByUUID(storage_uuid).getState(), RUNNING_STATE)
service.connectionClosed(conn) service.connectionClosed(conn)
self.assertEquals(self.app.nm.getNodeByUUID(storage_uuid).getState(), TEMPORARILY_DOWN_STATE) self.assertEquals(self.app.nm.getNodeByUUID(storage_uuid).getState(), TEMPORARILY_DOWN_STATE)
self.assertEquals(lptid, self.app.lptid) self.assertEquals(lptid, self.app.pt.getID())
# give an uuid, must raise as no other storage node available # give an uuid, must raise as no other storage node available
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
lptid = self.app.lptid lptid = self.app.pt.getID()
self.assertEquals(self.app.nm.getNodeByUUID(uuid).getState(), RUNNING_STATE) self.assertEquals(self.app.nm.getNodeByUUID(uuid).getState(), RUNNING_STATE)
self.assertRaises(OperationFailure, service.connectionClosed, conn) self.assertRaises(OperationFailure, service.connectionClosed, conn)
self.assertEquals(self.app.nm.getNodeByUUID(uuid).getState(), TEMPORARILY_DOWN_STATE) self.assertEquals(self.app.nm.getNodeByUUID(uuid).getState(), TEMPORARILY_DOWN_STATE)
self.assertEquals(lptid, self.app.lptid) self.assertEquals(lptid, self.app.pt.getID())
# give a client uuid which have unfinished transactions # give a client uuid which have unfinished transactions
client_uuid = self.identifyToMasterNode(node_type=CLIENT_NODE_TYPE, client_uuid = self.identifyToMasterNode(node_type=CLIENT_NODE_TYPE,
port = self.client_port) port = self.client_port)
conn = self.getFakeConnection(client_uuid, self.client_address) conn = self.getFakeConnection(client_uuid, self.client_address)
lptid = self.app.lptid lptid = self.app.pt.getID()
packet = Packet(msg_type=ASK_NEW_TID) packet = Packet(msg_type=ASK_NEW_TID)
service.handleAskNewTID(conn, packet) service.handleAskNewTID(conn, packet)
service.handleAskNewTID(conn, packet) service.handleAskNewTID(conn, packet)
...@@ -792,7 +792,7 @@ class MasterServiceTests(NeoTestBase): ...@@ -792,7 +792,7 @@ class MasterServiceTests(NeoTestBase):
service.connectionClosed(conn) service.connectionClosed(conn)
# node must be have been remove, and no more transaction must remains # node must be have been remove, and no more transaction must remains
self.assertEquals(self.app.nm.getNodeByUUID(client_uuid), None) self.assertEquals(self.app.nm.getNodeByUUID(client_uuid), None)
self.assertEquals(lptid, self.app.lptid) self.assertEquals(lptid, self.app.pt.getID())
self.assertEquals(len(self.app.finishing_transaction_dict.keys()), 0) self.assertEquals(len(self.app.finishing_transaction_dict.keys()), 0)
......
neo/master/tests/testMasterVerificationHandler.py
View file @ a26e93f6
...@@ -456,14 +456,14 @@ class MasterVerificationTests(NeoTestBase): ...@@ -456,14 +456,14 @@ class MasterVerificationTests(NeoTestBase):
packet = Packet(msg_type=ANSWER_LAST_IDS) packet = Packet(msg_type=ANSWER_LAST_IDS)
loid = self.app.loid loid = self.app.loid
ltid = self.app.ltid ltid = self.app.ltid
lptid = self.app.lptid lptid = self.app.pt.getID()
# do not answer if no uuid # do not answer if no uuid
conn = self.getFakeConnection(None, self.storage_address) conn = self.getFakeConnection(None, self.storage_address)
node_list = [] node_list = []
self.checkIdenficationRequired(verification.handleAnswerLastIDs, conn, packet, None, None, None) self.checkIdenficationRequired(verification.handleAnswerLastIDs, conn, packet, None, None, None)
self.assertEquals(loid, self.app.loid) self.assertEquals(loid, self.app.loid)
self.assertEquals(ltid, self.app.ltid) self.assertEquals(ltid, self.app.ltid)
self.assertEquals(lptid, self.app.lptid) self.assertEquals(lptid, self.app.pt.getID())
# do not care if master node call it # do not care if master node call it
master_uuid = self.identifyToMasterNode(node_type=MASTER_NODE_TYPE, port=self.master_port) master_uuid = self.identifyToMasterNode(node_type=MASTER_NODE_TYPE, port=self.master_port)
conn = self.getFakeConnection(master_uuid, self.master_address) conn = self.getFakeConnection(master_uuid, self.master_address)
...@@ -471,7 +471,7 @@ class MasterVerificationTests(NeoTestBase): ...@@ -471,7 +471,7 @@ class MasterVerificationTests(NeoTestBase):
self.checkUnexpectedPacketRaised(verification.handleAnswerLastIDs, conn, packet, None, None, None) self.checkUnexpectedPacketRaised(verification.handleAnswerLastIDs, conn, packet, None, None, None)
self.assertEquals(loid, self.app.loid) self.assertEquals(loid, self.app.loid)
self.assertEquals(ltid, self.app.ltid) self.assertEquals(ltid, self.app.ltid)
self.assertEquals(lptid, self.app.lptid) self.assertEquals(lptid, self.app.pt.getID())
# send information which are later to what PMN knows, this must raise # send information which are later to what PMN knows, this must raise
conn = self.getFakeConnection(uuid, self.storage_address) conn = self.getFakeConnection(uuid, self.storage_address)
node_list = [] node_list = []
...@@ -481,13 +481,13 @@ class MasterVerificationTests(NeoTestBase): ...@@ -481,13 +481,13 @@ class MasterVerificationTests(NeoTestBase):
new_oid = pack('!Q', oid + 1) new_oid = pack('!Q', oid + 1)
upper, lower = unpack('!LL', ltid) upper, lower = unpack('!LL', ltid)
new_tid = pack('!LL', upper, lower + 10) new_tid = pack('!LL', upper, lower + 10)
self.failUnless(new_ptid > self.app.lptid) self.failUnless(new_ptid > self.app.pt.getID())
self.failUnless(new_oid > self.app.loid) self.failUnless(new_oid > self.app.loid)
self.failUnless(new_tid > self.app.ltid) self.failUnless(new_tid > self.app.ltid)
self.assertRaises(VerificationFailure, verification.handleAnswerLastIDs, conn, packet, new_oid, new_tid, new_ptid) self.assertRaises(VerificationFailure, verification.handleAnswerLastIDs, conn, packet, new_oid, new_tid, new_ptid)
self.assertNotEquals(new_oid, self.app.loid) self.assertNotEquals(new_oid, self.app.loid)
self.assertNotEquals(new_tid, self.app.ltid) self.assertNotEquals(new_tid, self.app.ltid)
self.assertNotEquals(new_ptid, self.app.lptid) self.assertNotEquals(new_ptid, self.app.pt.getID())
def test_10_handleAnswerPartitionTable(self): def test_10_handleAnswerPartitionTable(self):
verification = self.verification verification = self.verification
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7