openstack/cinder
Code Issues Proposed changes

Merge "Fix missing print format in log messages"

Browse Source
This commit is contained in:
Zuul 2020-04-17 00:48:34 +00:00 committed by Gerrit Code Review
commit 12b01e916a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cinder/volume/drivers/dell_emc/unity/adapter.py
View File

@ -1114,11 +1114,11 @@ class CommonAdapter(object):
return cg
group_update = {}
group_id = group.id
if not volumes:
LOG.warning('There is no Volume in group: %s, cannot enable '
'group replication')
'group replication', group_id)
return group_update, []
group_id = group.id
# check whether the group was created as cg in unity
group_is_cg = utils.group_is_cg(group)
if not group_is_cg:
@ -1165,12 +1165,12 @@ class CommonAdapter(object):
def disable_replication(self, context, group, volumes):
"""Disable the group replication."""
group_update = {}
group_id = group.id
if not volumes:
# Return if empty group
LOG.warning('There is no Volume in group: %s, cannot disable '
'group replication')
'group replication', group_id)
return group_update, []
group_id = group.id
group_is_cg = utils.group_is_cg(group)
if not group_is_cg:
msg = (_('Cannot disable replication on generic group '

2
cinder/volume/drivers/fusionstorage/fs_client.py
View File

@ -69,7 +69,7 @@ class RestCommon(object):
result = func(call_url, **kwargs)
except Exception as err:
LOG.error('Bad response from server: %(url)s. '
'Error: %(err)s'), {'url': url, 'err': err}
'Error: %(err)s', {'url': url, 'err': err})
return {"error": {
"code": constants.CONNECT_ERROR,
"description": "Connect to server error."}}