openstack/nova
Code Issues Proposed changes

Merge "Extending delete_cell --force to delete instance_mappings"

Browse Source
This commit is contained in:
Zuul 2018-02-22 20:47:17 +00:00 committed by Gerrit Code Review
commit a32e22d005
3 changed files with 79 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
doc/source/cli/nova-manage.rst
View File

@ -214,14 +214,15 @@ Nova Cells v2
``nova-manage cell_v2 delete_cell [--force] --cell_uuid <cell_uuid>``
Delete a cell by the given uuid. Returns 0 if the empty cell is
found and deleted successfully or the cell that has hosts is found and
the cell and the hosts are deleted successfully with ``--force`` option,
1 if a cell with that uuid could not be found, 2 if host mappings were
found for the cell (cell not empty) without ``--force`` option, and 3
if there are instances mapped to the cell (cell not empty), 4 if there are
instance mappings to the cell but all instances have been deleted
in the cell.
Delete a cell by the given uuid. Returns 0 if the empty cell is found and
deleted successfully or the cell that has hosts is found and the cell, hosts
and the instance_mappings are deleted successfully with ``--force`` option
(this happens if there are no living instances), 1 if a cell with that uuid
could not be found, 2 if host mappings were found for the cell (cell not empty)
without ``--force`` option, 3 if there are instances mapped to the cell
(cell not empty) irrespective of the ``--force`` option, and 4 if there are
instance mappings to the cell but all instances have been deleted in the cell,
again without the ``--force`` option.
``nova-manage cell_v2 list_hosts [--cell_uuid <cell_uuid>]``

35
nova/cmd/manage.py
View File

@ -1360,7 +1360,8 @@ class CellV2Commands(object):
return 0
@args('--force', action='store_true', default=False,
help=_('Delete hosts that belong to the cell as well.'))
help=_('Delete hosts and instance_mappings that belong '
'to the cell as well.'))
@args('--cell_uuid', metavar='<cell_uuid>', dest='cell_uuid',
required=True, help=_('The uuid of the cell to delete.'))
def delete_cell(self, cell_uuid, force=False):
@ -1370,15 +1371,17 @@ class CellV2Commands(object):
* The cell is not found by uuid.
* It has hosts and force is False.
* It has instance mappings.
* It has instance mappings and force is False.
If force is True and the cell has host, hosts are deleted as well.
If force is True and the cell has hosts and/or instance_mappings, they
are deleted as well (as long as there are no living instances).
Returns 0 in the following cases.
* The empty cell is found and deleted successfully.
* The cell has hosts and force is True and the cell and the hosts are
deleted successfully.
* The cell has hosts and force is True then the cell, hosts and
instance_mappings are deleted successfully; if there are no
living instances.
"""
ctxt = context.get_admin_context()
# Find the CellMapping given the uuid.
@ -1407,14 +1410,20 @@ class CellV2Commands(object):
print(_('There are existing instances mapped to cell with '
'uuid %s.') % cell_uuid)
return 3
# There are no instances in the cell but the records remains
# in the 'instance_mappings' table.
print(_("There are instance mappings to cell with uuid %s, "
"but all instances have been deleted "
"in the cell.") % cell_uuid)
print(_("So execute 'nova-manage db archive_deleted_rows' to "
"delete the instance mappings."))
return 4
else:
if not force:
# There are no instances in the cell but the records remain
# in the 'instance_mappings' table.
print(_("There are instance mappings to cell with uuid "
"%s, but all instances have been deleted "
"in the cell.") % cell_uuid)
print(_("So execute 'nova-manage db archive_deleted_rows' "
"to delete the instance mappings."))
return 4
# Delete instance_mappings of the deleted instances
for instance_mapping in instance_mappings:
instance_mapping.destroy()
# Delete hosts mapped to the cell.
for host_mapping in host_mappings:

48
nova/tests/unit/test_nova_manage.py
View File

@ -1805,6 +1805,54 @@ class CellV2CommandsTestCase(test.NoDBTestCase):
mock_hm_destroy.assert_called_once_with()
mock_cell_destroy.assert_called_once_with()
@mock.patch.object(context, 'target_cell')
@mock.patch.object(objects.InstanceMapping, 'destroy')
@mock.patch.object(objects.HostMapping, 'destroy')
@mock.patch.object(objects.CellMapping, 'destroy')
def test_delete_cell_force_with_inst_mappings_of_deleted_instances(self,
mock_cell_destroy, mock_hm_destroy,
mock_im_destroy, mock_target_cell):
# Test for verifying the deletion of instance_mappings
# of deleted instances when using the --force option
ctxt = context.get_admin_context()
# create the cell mapping
cm = objects.CellMapping(
context=ctxt, uuid=uuidsentinel.cell1,
database_connection='fake:///db', transport_url='fake:///mq')
cm.create()
mock_target_cell.return_value.__enter__.return_value = ctxt
# create a host mapping in this cell
hm = objects.HostMapping(
context=ctxt, host='fake-host', cell_mapping=cm)
hm.create()
# create an instance and its mapping.
inst_uuid = uuidutils.generate_uuid()
proj_uuid = uuidutils.generate_uuid()
instance = objects.Instance(ctxt, project_id=proj_uuid,
uuid=inst_uuid)
instance.create()
im = objects.InstanceMapping(ctxt, project_id=proj_uuid,
cell_mapping=cm,
instance_uuid=inst_uuid)
im.create()
res = self.commands.delete_cell(uuidsentinel.cell1, force=True)
self.assertEqual(3, res)
output = self.output.getvalue().strip()
self.assertIn('There are existing instances mapped to cell', output)
# delete the instance such that we now have only its mapping
instance.destroy()
res = self.commands.delete_cell(uuidsentinel.cell1, force=True)
self.assertEqual(0, res)
mock_hm_destroy.assert_called_once_with()
mock_cell_destroy.assert_called_once_with()
mock_im_destroy.assert_called_once_with()
self.assertEqual(2, mock_target_cell.call_count)
def test_update_cell_not_found(self):
self.assertEqual(1, self.commands.update_cell(
uuidsentinel.cell1, 'foo', 'fake://new', 'fake:///new'))