diff --git a/cinder/volume/drivers/solidfire.py b/cinder/volume/drivers/solidfire.py
index 7bb6defae46..ebcc36abd99 100644
--- a/cinder/volume/drivers/solidfire.py
+++ b/cinder/volume/drivers/solidfire.py
@@ -262,9 +262,11 @@ class SolidFireDriver(san.SanISCSIDriver):
                     - Enable Active/Active support flag
                     - Implement Active/Active replication support
           2.2.0  - Add storage assisted volume migration support
+          2.2.1  - Fix bug #1891914 fix error on cluster workload rebalancing
+                   by adding xNotPrimary to the retryable exception list
     """
 
-    VERSION = '2.2.0'
+    VERSION = '2.2.1'
 
     SUPPORTS_ACTIVE_ACTIVE = True
 
@@ -302,7 +304,8 @@ class SolidFireDriver(san.SanISCSIDriver):
                         'xMaxSnapshotsPerNodeExceeded',
                         'xMaxClonesPerNodeExceeded',
                         'xSliceNotRegistered',
-                        'xNotReadyForIO']
+                        'xNotReadyForIO',
+                        'xNotPrimary']
 
     def __init__(self, *args, **kwargs):
         super(SolidFireDriver, self).__init__(*args, **kwargs)
diff --git a/releasenotes/notes/sf-fix-error-on-cluster-rebalancing-515bf41104cd181a.yaml b/releasenotes/notes/sf-fix-error-on-cluster-rebalancing-515bf41104cd181a.yaml
new file mode 100644
index 00000000000..8ccdb8765d6
--- /dev/null
+++ b/releasenotes/notes/sf-fix-error-on-cluster-rebalancing-515bf41104cd181a.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    NetApp SolidFire driver `Bug #1891914
+    <https://bugs.launchpad.net/cinder/+bug/1891914>`_:
+    Fix an error that might occur on cluster workload rebalancing or
+    system upgrade, when an operation is made to a volume at the same
+    time its connection is being moved to a secondary node.