From: Lucian Petrut <lpetrut@cloudbasesolutions.com>
Date: Tue, 3 Jan 2023 09:56:30 +0000 (+0200)
Subject: qa: retry test_rbd_wnbd.py fs operations
X-Git-Tag: v18.1.0~567^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=65544da4008b49852fe7c861531777991bcf940a;p=ceph-ci.git

qa: retry test_rbd_wnbd.py fs operations

Certain FS related operations can fail, especially under load
(e.g. initializing partitions, volume formatting, etc).

For this reason, we're going to introduce some retries.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
---

diff --git a/qa/workunits/windows/test_rbd_wnbd.py b/qa/workunits/windows/test_rbd_wnbd.py
index 33572bd8147..bca76c564cc 100644
--- a/qa/workunits/windows/test_rbd_wnbd.py
+++ b/qa/workunits/windows/test_rbd_wnbd.py
@@ -374,18 +374,33 @@ class RbdImage(object):
             self.remove()
 
     @Tracer.trace
-    def init_fs(self):
-        if not self.mapped:
-            raise CephTestException("Unable to create fs, image not mapped.")
+    @retry_decorator()
+    def _init_disk(self):
+        cmd = ("powershell.exe", "-command",
+               f"Get-Disk -Number {self.disk_number} | "
+               "Initialize-Disk")
+        execute(*cmd)
 
+    @Tracer.trace
+    @retry_decorator()
+    def _create_partition(self):
         cmd = ("powershell.exe", "-command",
                f"Get-Disk -Number {self.disk_number} | "
-               "Initialize-Disk -PassThru | "
-               "New-Partition -AssignDriveLetter -UseMaximumSize | "
-               "Format-Volume -Force -Confirm:$false")
+               "New-Partition -AssignDriveLetter -UseMaximumSize")
         execute(*cmd)
 
-        # Retrieve the drive letter.
+    @Tracer.trace
+    @retry_decorator()
+    def _format_volume(self):
+        cmd = (
+            "powershell.exe", "-command",
+             f"(Get-Partition -DiskNumber {self.disk_number}"
+             " | ? { $_.DriveLetter }) | Format-Volume -Force -Confirm:$false")
+        execute(*cmd)
+
+    @Tracer.trace
+    @retry_decorator()
+    def _get_drive_letter(self):
         cmd = (
             "powershell.exe", "-command",
             f"(Get-Partition -DiskNumber {self.disk_number}"
@@ -399,6 +414,16 @@ class RbdImage(object):
             raise CephTestException(
                 "Invalid drive letter received: %s" % self.drive_letter)
 
+    @Tracer.trace
+    def init_fs(self):
+        if not self.mapped:
+            raise CephTestException("Unable to create fs, image not mapped.")
+
+        self._init_disk()
+        self._create_partition()
+        self._format_volume()
+        self._get_drive_letter()
+
     @Tracer.trace
     def get_fs_capacity(self):
         if not self.drive_letter: