From acfb3361cddedbf148935427c2840e7141800b58 Mon Sep 17 00:00:00 2001
From: Kazumasa Nomura <kazumasa.nomura.rx@hitachi.com>
Date: Thu, 24 Dec 2020 05:10:27 +0000
Subject: [PATCH] Hitachi: Wait until the volume can be deleted

In Hitachi Storage, after create cloned volume, it may take time to transition
a volume status in the storage, and it may not be possible to delete the cloned
source volume immediately.
This issue must be resolved for the Hitachi driver to work successfuly
cinder-tempest-plugin.
We add wait processing in the function for checking status to solve this issue.

Change-Id: Ic79066792294d6efb3aa70b5811af4d143d7d271
Closes-Bug: #1908792
---
 .../hitachi/test_hitachi_hbsd_rest_fc.py      | 42 +++++++++++++++++++
 cinder/volume/drivers/hitachi/hbsd_rest.py    |  3 ++
 ...delete-volume-issues-e648525e597505fd.yaml |  6 +++
 3 files changed, 51 insertions(+)
 create mode 100644 releasenotes/notes/hitachi-fix-delete-volume-issues-e648525e597505fd.yaml

diff --git a/cinder/tests/unit/volume/drivers/hitachi/test_hitachi_hbsd_rest_fc.py b/cinder/tests/unit/volume/drivers/hitachi/test_hitachi_hbsd_rest_fc.py
index 6945b4fe6d5..006df106838 100644
--- a/cinder/tests/unit/volume/drivers/hitachi/test_hitachi_hbsd_rest_fc.py
+++ b/cinder/tests/unit/volume/drivers/hitachi/test_hitachi_hbsd_rest_fc.py
@@ -205,6 +205,18 @@ GET_SNAPSHOTS_RESULT = {
     ],
 }
 
+GET_SNAPSHOTS_RESULT_BUSY = {
+    "data": [
+        {
+            "primaryOrSecondary": "P-VOL",
+            "status": "PSUP",
+            "pvolLdevId": 0,
+            "muNumber": 1,
+            "svolLdevId": 1,
+        },
+    ],
+}
+
 GET_POOLS_RESULT = {
     "data": [
         {
@@ -284,6 +296,8 @@ def reduce_retrying_time(func):
         backup_exec_retry_interval = hbsd_rest_api._EXEC_RETRY_INTERVAL
         backup_rest_server_restart_timeout = (
             hbsd_rest_api._REST_SERVER_RESTART_TIMEOUT)
+        backup_default_process_waittime = (
+            hbsd_utils.DEFAULT_PROCESS_WAITTIME)
         hbsd_rest_api._LOCK_WAITTIME = 0.01
         hbsd_rest_api._EXEC_MAX_WAITTIME = 0.01
         hbsd_rest_api._JOB_API_RESPONSE_TIMEOUT = 0.01
@@ -291,6 +305,7 @@ def reduce_retrying_time(func):
         hbsd_rest_api._EXTEND_WAITTIME = 0.01
         hbsd_rest_api._EXEC_RETRY_INTERVAL = 0.004
         hbsd_rest_api._REST_SERVER_RESTART_TIMEOUT = 0.02
+        hbsd_utils.DEFAULT_PROCESS_WAITTIME = 0.01
         func(*args, **kwargs)
         hbsd_rest_api._LOCK_WAITTIME = backup_lock_waittime
         hbsd_rest_api._EXEC_MAX_WAITTIME = backup_exec_max_waittime
@@ -302,6 +317,8 @@ def reduce_retrying_time(func):
         hbsd_rest_api._EXEC_RETRY_INTERVAL = backup_exec_retry_interval
         hbsd_rest_api._REST_SERVER_RESTART_TIMEOUT = (
             backup_rest_server_restart_timeout)
+        hbsd_utils.DEFAULT_PROCESS_WAITTIME = (
+            backup_default_process_waittime)
     return wrapper
 
 
@@ -544,6 +561,31 @@ class HBSDRESTFCDriverTest(test.TestCase):
         self.driver.delete_volume(TEST_VOLUME[0])
         self.assertEqual(4, request.call_count)
 
+    @mock.patch.object(requests.Session, "request")
+    def test_delete_volume_temporary_busy(self, request):
+        request.side_effect = [FakeResponse(200, GET_LDEV_RESULT_PAIR),
+                               FakeResponse(200, GET_SNAPSHOTS_RESULT_BUSY),
+                               FakeResponse(200, GET_LDEV_RESULT),
+                               FakeResponse(200, GET_LDEV_RESULT),
+                               FakeResponse(200, GET_LDEV_RESULT),
+                               FakeResponse(200, GET_LDEV_RESULT),
+                               FakeResponse(202, COMPLETED_SUCCEEDED_RESULT)]
+        self.driver.delete_volume(TEST_VOLUME[0])
+        self.assertEqual(7, request.call_count)
+
+    @reduce_retrying_time
+    @mock.patch.object(requests.Session, "request")
+    def test_delete_volume_busy_timeout(self, request):
+        request.side_effect = [FakeResponse(200, GET_LDEV_RESULT_PAIR),
+                               FakeResponse(200, GET_SNAPSHOTS_RESULT_BUSY),
+                               FakeResponse(200, GET_LDEV_RESULT_PAIR),
+                               FakeResponse(200, GET_LDEV_RESULT_PAIR),
+                               FakeResponse(200, GET_LDEV_RESULT_PAIR)]
+        self.assertRaises(hbsd_utils.HBSDError,
+                          self.driver.delete_volume,
+                          TEST_VOLUME[0])
+        self.assertGreater(request.call_count, 2)
+
     @mock.patch.object(requests.Session, "request")
     def test_extend_volume(self, request):
         request.side_effect = [FakeResponse(200, GET_LDEV_RESULT),
diff --git a/cinder/volume/drivers/hitachi/hbsd_rest.py b/cinder/volume/drivers/hitachi/hbsd_rest.py
index 18b121413cc..21368c9dcd6 100644
--- a/cinder/volume/drivers/hitachi/hbsd_rest.py
+++ b/cinder/volume/drivers/hitachi/hbsd_rest.py
@@ -648,6 +648,9 @@ class HBSDREST(common.HBSDCommon):
             return None
 
         pvol, svol_info = self._get_copy_pair_info(ldev)
+        if svol_info and svol_info[0]['status'] in ('SMPP', 'PSUP'):
+            self._wait_copy_pair_deleting(svol_info[0]['ldev'])
+            return self.get_pair_info(ldev)
         if pvol is not None:
             pair_info['pvol'] = pvol
             pair_info.setdefault('svol_info', [])
diff --git a/releasenotes/notes/hitachi-fix-delete-volume-issues-e648525e597505fd.yaml b/releasenotes/notes/hitachi-fix-delete-volume-issues-e648525e597505fd.yaml
new file mode 100644
index 00000000000..2315c56bf61
--- /dev/null
+++ b/releasenotes/notes/hitachi-fix-delete-volume-issues-e648525e597505fd.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Hitachi driver `bug #1908792
+    <https://bugs.launchpad.net/cinder/+bug/1908792>`_: Fix for Hitachi driver
+    allowing delete_volume after create_cloned_volume.