openstack/deb-cinder
Code Issues Proposed changes

Fix Live Migration for Nimble Storage Driver

Browse Source 
The previous fix for Live Migration
https://review.openstack.org/#/c/420214/ broke our Live
Migration. When checking for Error message in exception,
it needs to be typecast to six.text_type()
This patch resolves the problem.

Change-Id: I0871fb0f5a63cfe17ebf328e7ce8a2fff34fcdb4
Closes-Bug: #1481953
This commit is contained in:
Raunak Kumar 2017-01-27 09:21:37 -08:00
parent 6932b2b517
commit 0b7e783837
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/volume/drivers/nimble.py
View File

@ -1321,7 +1321,7 @@ class NimbleRestAPIExecutor(object):
self.post(api, data)
except NimbleAPIException as ex:
LOG.debug("add_acl_exception: %s", ex)
if SM_OBJ_EXIST_MSG in ex:
if SM_OBJ_EXIST_MSG in six.text_type(ex):
LOG.warning(_LW('Volume %(vol)s : %(state)s'),
{'vol': volume['name'],
'state': SM_OBJ_EXIST_MSG})
@ -1359,7 +1359,7 @@ class NimbleRestAPIExecutor(object):
self.delete(api)
except NimbleAPIException as ex:
LOG.debug("remove_acl_exception: %s", ex)
if SM_OBJ_ENOENT_MSG in ex:
if SM_OBJ_ENOENT_MSG in six.text_type(ex):
LOG.warning(_LW('Volume %(vol)s : %(state)s'),
{'vol': volume['name'],
'state': SM_OBJ_ENOENT_MSG})