openstack
/
cinder
Code Issues Proposed changes

LVM: Retry lvdisplay and lvcreate calls on segfault 

This is a follow-up to I0a2420f3e4a411f5fa52ebe2d22859b138ef387f.

LVM commands segfault occasionally, exiting with code 139.
Change I6824ba4f introduced a workaround to retry the command
when code 139 is returned, which generally works.

Closes-Bug: #1932188
Change-Id: I7c0f4d4ea7de635afede3c8514a5da9e85ad9b48
(cherry picked from commit a8552ed2d6)
(cherry picked from commit 77d4aa6a89)
This commit is contained in:
Sofia Enriquez 2021-06-17 20:44:09 +00:00 committed by Eric Harney
parent 11b79553ec
commit ee1674b5a8
2 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,12 +153,14 @@ class LVM(executor.Executor):
backoff_rate=0.5)
def _run_lvm_command(self,
cmd_arg_list: list,
root_helper: str,
root_helper: str = None,
run_as_root: bool = True) -> tuple:
"""Run LVM commands with a retry on code 139 to work around LVM bugs.
Refer to LP bug 1901783, LP bug 1932188.
"""
if not root_helper:
root_helper = self._root_helper
(out, err) = self._execute(*cmd_arg_list,
root_helper=root_helper,
@ -185,9 +187,7 @@ class LVM(executor.Executor):
free_space = 0.0
try:
(out, err) = self._run_lvm_command(cmd,
root_helper=self._root_helper,
run_as_root=True)
(out, err) = self._run_lvm_command(cmd)
if out is not None:
out = out.strip()
data = out.split(':')
@ -545,9 +545,7 @@ class LVM(executor.Executor):
'size': size_str,
'free': self.vg_free_space})
self._execute(*cmd,
root_helper=self._root_helper,
run_as_root=True)
self._run_lvm_command(cmd)
self.vg_thin_pool = name
return size_str
@ -581,9 +579,7 @@ class LVM(executor.Executor):
cmd.extend(['-R', str(rsize)])
try:
self._execute(*cmd,
root_helper=self._root_helper,
run_as_root=True)
self._run_lvm_command(cmd)
except putils.ProcessExecutionError as err:
LOG.exception('Error creating Volume')
LOG.error('Cmd :%s', err.cmd)
@ -614,9 +610,7 @@ class LVM(executor.Executor):
cmd.extend(['-L', '%sg' % (size)])
try:
self._execute(*cmd,
root_helper=self._root_helper,
run_as_root=True)
self._run_lvm_command(cmd)
except putils.ProcessExecutionError as err:
LOG.exception('Error creating snapshot')
LOG.error('Cmd :%s', err.cmd)
@ -634,9 +628,7 @@ class LVM(executor.Executor):
def _lv_is_active(self, name):
cmd = LVM.LVM_CMD_PREFIX + ['lvdisplay', '--noheading', '-C', '-o',
'Attr', '%s/%s' % (self.vg_name, name)]
out, _err = self._execute(*cmd,
root_helper=self._root_helper,
run_as_root=True)
out, _err = self._run_lvm_command(cmd)
if out:
out = out.strip()
if (out[4] == 'a'):
@ -782,9 +774,7 @@ class LVM(executor.Executor):
cmd = LVM.LVM_CMD_PREFIX + ['lvdisplay', '--noheading', '-C', '-o',
'Attr', '--readonly',
'%s/%s' % (self.vg_name, name)]
out, _err = self._execute(*cmd,
root_helper=self._root_helper,
run_as_root=True)
out, _err = self._run_lvm_command(cmd)
if out:
out = out.strip()
if (out[0] == 'o') or (out[0] == 'O'):
@ -795,9 +785,7 @@ class LVM(executor.Executor):
"""Return True if LV is a snapshot, False otherwise."""
cmd = LVM.LVM_CMD_PREFIX + ['lvdisplay', '--noheading', '-C', '-o',
'Attr', '%s/%s' % (self.vg_name, name)]
out, _err = self._execute(*cmd,
root_helper=self._root_helper,
run_as_root=True)
out, _err = self._run_lvm_command(cmd)
out = out.strip()
if out:
if (out[0] == 's'):
@ -808,9 +796,7 @@ class LVM(executor.Executor):
"""Return True if LV is currently open, False otherwise."""
cmd = LVM.LVM_CMD_PREFIX + ['lvdisplay', '--noheading', '-C', '-o',
'Attr', '%s/%s' % (self.vg_name, name)]
out, _err = self._execute(*cmd,
root_helper=self._root_helper,
run_as_root=True)
out, _err = self._run_lvm_command(cmd)
out = out.strip()
if out:
if (out[5] == 'o'):
@ -821,9 +807,7 @@ class LVM(executor.Executor):
"""Return the origin of an LV that is a snapshot, None otherwise."""
cmd = LVM.LVM_CMD_PREFIX + ['lvdisplay', '--noheading', '-C', '-o',
'Origin', '%s/%s' % (self.vg_name, name)]
out, _err = self._execute(*cmd,
root_helper=self._root_helper,
run_as_root=True)
out, _err = self._run_lvm_command(cmd)
out = out.strip()
if out:
return out

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

@ -397,7 +397,7 @@ class BrickLvmTestCase(test.TestCase):
pool_name = vg_name + "-pool"
self.vg.create_thin_pool(pool_name, "1G")
with mock.patch.object(self.vg, '_execute'):
with mock.patch.object(self.vg, '_execute', return_value=(0, 0)):
self.vg.create_volume("test", "1G", lv_type='thin')
if self.configuration.lvm_suppress_fd_warnings is False:
self.vg._execute.assert_called_once_with(
@ -473,7 +473,7 @@ class BrickLvmTestCase(test.TestCase):
self.vg.deactivate_lv.assert_not_called()
def test_lv_deactivate(self):
with mock.patch.object(self.vg, '_execute'):
with mock.patch.object(self.vg, '_execute', return_value=(0, 0)):
is_active_mock = mock.Mock()
is_active_mock.return_value = False
self.vg._lv_is_active = is_active_mock
@ -482,7 +482,7 @@ class BrickLvmTestCase(test.TestCase):
@mock.patch('time.sleep')
def test_lv_deactivate_timeout(self, _mock_sleep):
with mock.patch.object(self.vg, '_execute'):
with mock.patch.object(self.vg, '_execute', return_value=(0, 0)):
is_active_mock = mock.Mock()
is_active_mock.return_value = True
self.vg._lv_is_active = is_active_mock