openstack/manila
Code Issues Proposed changes

Merge "LOG marker mismatch in the code"

Browse Source
This commit is contained in:
Jenkins 2016-12-01 17:45:12 +00:00 committed by Gerrit Code Review
commit 00859d1acf
2 changed files with 3 additions and 3 deletions
manila/share
drivers
lvm.py
manager.py

4
manila/share/drivers/lvm.py

@ -244,7 +244,7 @@ class LVMShareDriver(LVMMixin, driver.ShareDriver):
try:
os.rmdir(mount_path)
except OSError:
LOG.warning(_LI('Unable to delete %s'), mount_path)
LOG.warning(_LW('Unable to delete %s'), mount_path)
def ensure_share(self, ctx, share, share_server=None):
"""Ensure that storage are mounted and exported."""
@ -259,7 +259,7 @@ class LVMShareDriver(LVMMixin, driver.ShareDriver):
self._get_helper(share).remove_export(self.share_server,
share['name'])
except exception.ProcessExecutionError:
LOG.warning(_LI("Can't remove share %r"), share['id'])
LOG.warning(_LW("Can't remove share %r"), share['id'])
except exception.InvalidShare as exc:
LOG.warning(exc.message)

2
manila/share/manager.py

@ -1988,7 +1988,7 @@ class ShareManager(manager.SchedulerDependentManager):
if not snapshot_update.get('size'):
snapshot_update['size'] = snapshot_ref['share']['size']
LOG.warning(_LI("Cannot get the size of the snapshot "
LOG.warning(_LW("Cannot get the size of the snapshot "
"%(snapshot_id)s. Using the size of "
"the share instead."),
{'snapshot_id': snapshot_id})