openstack/cinder
Code Issues Proposed changes

Correct Extend lvm Volume

Browse Source 
A volume extened which has some snapshot will be deactivated.
With this change, the volume will be reactivated.

Change-Id: I11c9b5935d74a5a3d4562ec1ce534b9e412d6030
Closes-Bug: #1663525
(cherry picked from commit 5e0957b20d)
This commit is contained in:
Huangsm 2017-02-14 18:09:31 +08:00
parent bb721035be
commit 7c3bfd2c31
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cinder/brick/local_dev/lvm.py
View File

@ -800,11 +800,13 @@ class LVM(executor.Executor):
def extend_volume(self, lv_name, new_size):
"""Extend the size of an existing volume."""
# Volumes with snaps have attributes 'o' or 'O' and will be
# deactivated, but Thin Volumes with snaps have attribute 'V'
# and won't be deactivated because the lv_has_snapshot method looks
# for 'o' or 'O'
if self.lv_has_snapshot(lv_name):
# A volume with snaps is forbidden to extend if it is activated.
# So, deactivate it first, extend it second, and then activate it.
# But a thin volume with snaps can be extended regardless their status,
# and lv_has_snapshot method return false for a thin volume.
# So it won't be deactivated or be activated.
has_snapshot = self.lv_has_snapshot(lv_name)
if has_snapshot:
self.deactivate_lv(lv_name)
try:
cmd = LVM.LVM_CMD_PREFIX + ['lvextend', '-L', new_size,
@ -817,6 +819,8 @@ class LVM(executor.Executor):
LOG.error(_LE('StdOut :%s'), err.stdout)
LOG.error(_LE('StdErr :%s'), err.stderr)
raise
if has_snapshot:
self.activate_lv(lv_name)
def vg_mirror_free_space(self, mirror_count):
free_capacity = 0.0

25
cinder/tests/unit/brick/test_brick_lvm.py
View File

@ -12,6 +12,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import ddt
import mock
from oslo_concurrency import processutils
@ -21,6 +22,7 @@ from cinder import test
from cinder.volume import configuration as conf
@ddt.ddt
class BrickLvmTestCase(test.TestCase):
def setUp(self):
if not hasattr(self, 'configuration'):
@ -389,20 +391,23 @@ class BrickLvmTestCase(test.TestCase):
def test_get_mirrored_available_capacity(self):
self.assertEqual(2.0, self.vg.vg_mirror_free_space(1))
def test_lv_extend(self):
@ddt.data(True, False)
def test_lv_extend(self, has_snapshot):
with mock.patch.object(self.vg, '_execute'):
with mock.patch.object(self.vg, 'lv_has_snapshot'):
self.vg.deactivate_lv = mock.MagicMock()
self.vg.activate_lv = mock.MagicMock()
# Extend lv with snapshot and make sure deactivate called
self.vg.create_volume("test", "1G")
self.vg.lv_has_snapshot.return_value = has_snapshot
self.vg.extend_volume("test", "2G")
self.vg.deactivate_lv.assert_called_once_with('test')
self.vg.deactivate_lv.reset_mock()
# Extend lv without snapshot so deactivate should not be called
self.vg.create_volume("test", "1G")
self.vg.vg_name = "test-volumes"
self.vg.extend_volume("test", "2G")
self.assertFalse(self.vg.deactivate_lv.called)
self.vg.lv_has_snapshot.assert_called_once_with("test")
if has_snapshot:
self.vg.activate_lv.assert_called_once_with("test")
self.vg.deactivate_lv.assert_called_once_with("test")
else:
self.vg.activate_lv.assert_not_called()
self.vg.deactivate_lv.assert_not_called()
def test_lv_deactivate(self):
with mock.patch.object(self.vg, '_execute'):