From b7b830e9ac1e58ef432edf892eb972c98817ffdf Mon Sep 17 00:00:00 2001
From: Fabio Oliveira <fabioaurelio1269@gmail.com>
Date: Wed, 21 Jul 2021 15:31:51 -0300
Subject: [PATCH] NetApp SolidFire: Fix request errors while Element OS upgrade

When Element OS is being upgraded, the requests received will
get exceptions as result, but the operation will normally succeed
a few attempts after.

This patch fixes this issue by adding the following exceptions to
our list of retryable exceptions in SolidFire driver:
    - xDBOperationTimeout.
    - xDBConnectionLoss.
    - xNoHandler.
    - xSnapshotFailed.
    - xRecvTimeout.
    - xDBNoSuchPath.
    - xPermissionDenied.

Change-Id: Idef086c55885687684875603481582f763355885
Closes-Bug: #1934435
---
 cinder/volume/drivers/solidfire.py               | 16 ++++++++++++++--
 ...tions-while-eos-upgrade-1e3df89b5fb79165.yaml |  7 +++++++
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/netapp-solidfire-fix-exceptions-while-eos-upgrade-1e3df89b5fb79165.yaml

diff --git a/cinder/volume/drivers/solidfire.py b/cinder/volume/drivers/solidfire.py
index a5e50e9cca6..0f99ed04fb5 100644
--- a/cinder/volume/drivers/solidfire.py
+++ b/cinder/volume/drivers/solidfire.py
@@ -280,9 +280,14 @@ class SolidFireDriver(san.SanISCSIDriver):
                    as retyping.
                    Fix bug #1932964 SolidFire duplicate volume name exception
                    on migration and replication.
+          2.2.4  - Fix bug #1934435 fix driver failing with multiple exceptions
+                   during Element OS upgrade by adding xDBOperationTimeout,
+                   xDBConnectionLoss, xNoHandler, xSnapshotFailed,
+                   xRecvTimeout, xDBNoSuchPath, xPermissionDenied to the
+                   retryable exception list
     """
 
-    VERSION = '2.2.3'
+    VERSION = '2.2.4'
 
     SUPPORTS_ACTIVE_ACTIVE = True
 
@@ -321,7 +326,14 @@ class SolidFireDriver(san.SanISCSIDriver):
                         'xMaxClonesPerNodeExceeded',
                         'xSliceNotRegistered',
                         'xNotReadyForIO',
-                        'xNotPrimary']
+                        'xNotPrimary',
+                        'xDBOperationTimeout',
+                        'xDBConnectionLoss',
+                        'xNoHandler',
+                        'xSnapshotFailed',
+                        'xRecvTimeout',
+                        'xDBNoSuchPath',
+                        'xPermissionDenied']
 
     def __init__(self, *args, **kwargs):
         super(SolidFireDriver, self).__init__(*args, **kwargs)
diff --git a/releasenotes/notes/netapp-solidfire-fix-exceptions-while-eos-upgrade-1e3df89b5fb79165.yaml b/releasenotes/notes/netapp-solidfire-fix-exceptions-while-eos-upgrade-1e3df89b5fb79165.yaml
new file mode 100644
index 00000000000..1e3a63b1e5a
--- /dev/null
+++ b/releasenotes/notes/netapp-solidfire-fix-exceptions-while-eos-upgrade-1e3df89b5fb79165.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    NetApp SolidFire driver `Bug #1934435
+    <https://bugs.launchpad.net/cinder/+bug/1934435>`_:
+    Fixed errors that might occur when an operation is made to a volume at the
+    same time as the Element OS upgrades.
\ No newline at end of file