summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-05-04 07:49:44 +0000
committerGerrit Code Review <review@openstack.org>2023-05-04 07:49:44 +0000
commit40a33360ade30abb1656aa3762051a0d96c76186 (patch)
tree9bd46d50bddd0b77622b3e0ed126fe5a3ee82f8b
parentb858a1d29629b94ebde3223fa59efafeafb6995d (diff)
parent44217eca7cbfcf79ea13bb9bc6a95d7ad75b0898 (diff)
downloadcinder-40a33360ade30abb1656aa3762051a0d96c76186.tar.gz
Merge "[Pure Storage] Add check for new error message"
-rw-r--r--cinder/volume/drivers/pure.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/cinder/volume/drivers/pure.py b/cinder/volume/drivers/pure.py
index 30004cae0..fcaecda08 100644
--- a/cinder/volume/drivers/pure.py
+++ b/cinder/volume/drivers/pure.py
@@ -158,6 +158,7 @@ ERR_MSG_NOT_CONNECTED = "is not connected"
ERR_MSG_ALREADY_BELONGS = "already belongs to"
ERR_MSG_EXISTING_CONNECTIONS = "cannot be deleted due to existing connections"
ERR_MSG_ALREADY_IN_USE = "already in use"
+ERR_MSG_ARRAY_LIMIT = "limit reached"
EXTRA_SPECS_REPL_ENABLED = "replication_enabled"
EXTRA_SPECS_REPL_TYPE = "replication_type"
@@ -2424,8 +2425,9 @@ class PureBaseVolumeDriver(san.SanDriver):
except purestorage.PureHTTPError as err:
with excutils.save_and_reraise_exception() as ctxt:
if err.code == 400 and (
- ERR_MSG_ALREADY_EXISTS
- in err.text):
+ ERR_MSG_ALREADY_EXISTS in err.text
+ or ERR_MSG_ARRAY_LIMIT in err.text
+ ):
ctxt.reraise = False
LOG.info("Skipping add array %(target_array)s to pod"
" %(pod_name)s since it's already added.",