Browse Source

Merge "Fix potential NameError of rc_id"

changes/89/680889/1
Zuul 1 week ago
parent
commit
e74236d819

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

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

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

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

Loading…
Cancel
Save