From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 18 Jun 2014 19:51:40 +0000 (+0000)
Subject: Merge "debug level logs should not be translated"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f2a2d5763785759cb6446298349504df3a0d8519;p=openstack-build%2Fcinder-build.git

Merge "debug level logs should not be translated"
---

f2a2d5763785759cb6446298349504df3a0d8519
diff --cc cinder/brick/local_dev/lvm.py
index b7fc057f3,e0608f979..5f5aad280
--- a/cinder/brick/local_dev/lvm.py
+++ b/cinder/brick/local_dev/lvm.py
@@@ -582,21 -601,13 +582,21 @@@ class LVM(executor.Executor)
                      {'command': err.cmd, 'response': err.stderr})
              LOG.debug(mesg)
  
-             LOG.debug(_('Attempting udev settle and retry of lvremove...'))
+             LOG.debug('Attempting udev settle and retry of lvremove...')
              run_udevadm_settle()
  
 -            self._execute('lvremove',
 -                          '-f',
 -                          '%s/%s' % (self.vg_name, name),
 -                          root_helper=self._root_helper, run_as_root=True)
 +            # The previous failing lvremove -f might leave behind
 +            # suspended devices; when lvmetad is not available, any
 +            # further lvm command will block forever.
 +            # Therefore we need to skip suspended devices on retry.
 +            LVM_CONFIG += 'devices { ignore_suspended_devices = 1}'
 +
 +            self._execute(
 +                'lvremove',
 +                '--config', LVM_CONFIG,
 +                '-f',
 +                '%s/%s' % (self.vg_name, name),
 +                root_helper=self._root_helper, run_as_root=True)
  
      def revert(self, snapshot_name):
          """Revert an LV from snapshot.