openstack/nova
Code Issues Proposed changes

Merge "XenAPI: Pass expected return codes to resize2fs"

Browse Source
This commit is contained in:
Zuul
2018-05-15 00:03:17 +00:00
committed by Gerrit Code Review
parent 863f6ec9a6 eec0fe59ff
commit c6e82f3da5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/unit/virt/xenapi/test_vm_utils.py
View File

@@ -353,7 +353,7 @@ class ResizeHelpersTestCase(VMUtilsTestBase):
mock_fsck.assert_has_calls([
mock.call(partition_path)])
mock_resize2fs.assert_has_calls([
mock.call(partition_path, None, size='10s')])
mock.call(partition_path, [0], size='10s')])
mock_resize.assert_has_calls([
mock.call(dev_path, 0, 9, True)])
mock_disable_journal.assert_has_calls([
@@ -408,7 +408,7 @@ class ResizeHelpersTestCase(VMUtilsTestBase):
mock_fsck.assert_has_calls([
mock.call(partition_path)])
mock_resize2fs.assert_has_calls([
mock.call(partition_path, None)])
mock.call(partition_path, [0])])
mock_resize.assert_has_calls([
mock.call(dev_path, 0, 29, False)])
mock_disable_journal.assert_has_calls([

4
nova/virt/xenapi/vm_utils.py
View File

@@ -2294,7 +2294,7 @@ def _resize_part_and_fs(dev, start, old_sectors, new_sectors, flags):
if new_sectors < old_sectors:
# Resizing down, resize filesystem before partition resize
try:
nova.privsep.fs.resize2fs(partition_path, None, size='%ds' % size)
nova.privsep.fs.resize2fs(partition_path, [0], size='%ds' % size)
except processutils.ProcessExecutionError as exc:
LOG.error(six.text_type(exc))
reason = _("Shrinking the filesystem down with resize2fs "
@@ -2307,7 +2307,7 @@ def _resize_part_and_fs(dev, start, old_sectors, new_sectors, flags):
if new_sectors > old_sectors:
# Resizing up, resize filesystem after partition resize
nova.privsep.fs.resize2fs(partition_path, None)
nova.privsep.fs.resize2fs(partition_path, [0])
# Add back journal
nova.privsep.fs.ext_journal_enable(partition_path)