openstack
/
cinder
Code Issues Proposed changes

Merge "Add the -f option back to lvremove" into stable/icehouse

This commit is contained in:
Jenkins 2014-07-10 22:37:59 +00:00 committed by Gerrit Code Review
parent c304e1cda9 570c90f8fb
commit ac9b6a9094
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -566,7 +566,6 @@ class LVM(executor.Executor):
check_exit_code=False)
try:
need_force_remove = False
# LV removal seems to be a race with udev in
# some cases (see LP #1270192), so we do it in several steps:
@ -583,15 +582,11 @@ class LVM(executor.Executor):
'RESPONSE: %(response)s') %
{'command': err.cmd, 'response': err.stderr})
LOG.debug(mesg)
need_force_remove = True
run_udevadm_settle()
cmd = ['lvremove', ]
# if deactivation failed, use the --force, lvm!
if need_force_remove:
cmd.append('-f')
# Note(jdg): use -f for bug #1336811
cmd = ['lvremove', '-f']
cmd.append('%s/%s' % (self.vg_name, name))
self._execute(*cmd,
root_helper=self._root_helper, run_as_root=True)