openstack
/
cinder
Code Issues Proposed changes

Merge "Fix potential NameError of rc_id"

This commit is contained in:
Zuul 2019-09-08 06:03:13 +00:00 committed by Gerrit Code Review
parent 6cf1656a94 2c67d2938f
commit e74236d819
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py
View File

@ -2124,6 +2124,7 @@ class StorwizeHelpers(object):
rc_id = self.ssh.mkrcrelationship(master, aux, system, rc_id = self.ssh.mkrcrelationship(master, aux, system,
asyncmirror, cyclingmode) asyncmirror, cyclingmode)
except exception.VolumeBackendAPIException as e: except exception.VolumeBackendAPIException as e:
rc_id = None
# CMMVC5959E is the code in Stowize storage, meaning that # CMMVC5959E is the code in Stowize storage, meaning that
# there is a relationship that already has this name on the # there is a relationship that already has this name on the
# master cluster. # master cluster.

1
cinder/volume/drivers/inspur/instorage/instorage_common.py
View File

@ -2902,6 +2902,7 @@ class InStorageAssistant(object):
rc_id = self.ssh.mkrcrelationship(master, aux, system, rc_id = self.ssh.mkrcrelationship(master, aux, system,
asynccopy) asynccopy)
except exception.VolumeBackendAPIException as e: except exception.VolumeBackendAPIException as e:
rc_id = None
# CMMVC5959E is the code in InStorage, meaning that # CMMVC5959E is the code in InStorage, meaning that
# there is a relationship that already has this name on the # there is a relationship that already has this name on the
# master cluster. # master cluster.