openstack/senlin
Code Issues Proposed changes

Merge "Fix node join behavior"

Browse Source
This commit is contained in:
Jenkins 2016-08-18 02:53:12 +00:00 committed by Gerrit Code Review
commit 20c3b796cf
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
senlin/engine/node.py
View File

@ -319,16 +319,24 @@ class Node(object):
def do_join(self, context, cluster_id):
if self.cluster_id == cluster_id:
return True
timestamp = timeutils.utcnow(True)
db_node = no.Node.migrate(context, self.id, cluster_id, timestamp)
self.cluster_id = cluster_id
self.updated_at = timestamp
self.index = db_node.index
res = pb.Profile.join_cluster(context, self, cluster_id)
if res:
timestamp = timeutils.utcnow(True)
db_node = no.Node.migrate(context, self.id, cluster_id, timestamp)
self.cluster_id = cluster_id
self.updated_at = timestamp
self.index = db_node.index
return True
else:
return False
# rollback
db_node = no.Node.migrate(context, self.id, None, timestamp)
self.cluster_id = ''
self.updated_at = timestamp
self.index = -1
return False
def do_leave(self, context):
if self.cluster_id == '':

15
senlin/tests/unit/engine/test_node.py
View File

@ -506,7 +506,9 @@ class TestNode(base.SenlinTestCase):
node = nodem.Node('node1', PROFILE_ID, CLUSTER_ID, self.context)
mock_join_cluster.return_value = True
cluster_id = 'fb8bca7a-a82b-4442-a40f-92d3e3cfb0b9'
res = node.do_join(self.context, cluster_id)
self.assertTrue(res)
mock_migrate.assert_called_once_with(self.context, node.id,
cluster_id, mock.ANY)
@ -516,17 +518,24 @@ class TestNode(base.SenlinTestCase):
self.assertEqual(mock_migrate.return_value.index, node.index)
self.assertIsNotNone(node.updated_at)
@mock.patch.object(node_obj.Node, 'migrate')
@mock.patch.object(pb.Profile, 'join_cluster')
def test_node_join_fail_update_server_metadata(self, mock_join):
def test_node_join_fail_profile_call(self, mock_join, mock_migrate):
node = nodem.Node('node1', PROFILE_ID, None, self.context)
node.id = uuidutils.generate_uuid()
mock_join.return_value = False
cluster_id = 'fb8bca7a-a82b-4442-a40f-92d3e3cfb0b9'
res = node.do_join(self.context, cluster_id)
self.assertFalse(res)
mock_join.assert_called_once_with(self.context, node, cluster_id)
mock_migrate.assert_has_calls([
mock.call(self.context, node.id, cluster_id, mock.ANY),
mock.call(self.context, node.id, None, mock.ANY),
])
self.assertEqual('', node.cluster_id)
self.assertEqual(-1, node.index)
self.assertIsNone(node.updated_at)
mock_join.assert_called_once_with(self.context, node, cluster_id)
@mock.patch.object(node_obj.Node, 'migrate')
def test_node_leave_no_cluster(self, mock_migrate):