Moving out scrub tests to a separate file

Signed-off-by: Aishwarya Mathuria <[email protected]>

benchmark/fio.py

@@ -66,11 +66,11 @@ def initialize_endpoints(self):
         # Create the recovery image based on test type requested
         if 'recovery_test' in self.cluster.config and self.recov_test_type == 'background':
             self.client_endpoints_object.create_recovery_image()
-        if 'scrubbing_test' in self.cluster.config:
-            self.client_endpoints_object.create_scrubbing_image()
+        if 'scrub_test' in self.cluster.config:
+            self.client_endpoints_object.create_scrub_image()
         if 'scrub_recov_test' in self.cluster.config:
             self.client_endpoints_object.create_recovery_image()
-            self.client_endpoints_object.create_scrubbing_image()
+            self.client_endpoints_object.create_scrub_image()
         self.create_endpoints()
 
     def create_endpoints(self):
@@ -218,10 +218,10 @@ def run(self):
             # Wait for signal to start client IO
             self.cluster.wait_start_io()
 
-        if 'scrubbing_test' in self.cluster.config:
-            logger.info('Scrubbing test in config')
-            scrubbing_callback = self.scrubbing_callback
-            self.cluster.create_scrubbing_test(self.run_dir, scrubbing_callback)
+        if 'scrub_test' in self.cluster.config:
+            logger.info('Scrub test in config')
+            scrub_callback = self.scrub_callback
+            self.cluster.create_scrub_test(self.run_dir, scrub_callback)
             self.cluster.wait_start_io()
 
         if 'scrub_recov_test' in self.cluster.config:
@@ -242,9 +242,9 @@ def run(self):
         # If we were doing recovery, wait until it's done.
         if 'recovery_test' in self.cluster.config:
             self.cluster.wait_recovery_done()
-        # If we were doing scrubbing, wait until it's done.
-        if 'scrubbing_test' in self.cluster.config:
-            self.cluster.wait_scrubbing_done()
+        # If we were doing scrub, wait until it's done.
+        if 'scrub_test' in self.cluster.config:
+            self.cluster.wait_scrub_done()
 
         if 'scrub_recov_test' in self.cluster.config:
             self.cluster.wait_scrub_recovery_done()
@@ -263,7 +263,7 @@ def recovery_callback_blocking(self):
     def recovery_callback_background(self):
         logger.info('Recovery thread completed!')
 
-    def scrubbing_callback(self):
+    def scrub_callback(self):
         logger.info('Scrubbing thread completed')
 
     def scrub_recov_callback(self):

benchmark/librbdfio.py

@@ -267,7 +267,7 @@ def recovery_callback_blocking(self):
     def recovery_callback_background(self):
         logger.info('Recovery thread completed!')
 
-    def scrubbing_callback(self):
+    def scrub_callback(self):
         logger.info('Scrubbing thread completed!')
 
     def parse(self, out_dir):

client_endpoints/ceph_client_endpoints.py

@@ -116,7 +116,7 @@ def create_rbd_recovery(self):
                 rbd_name = '%s-%s' % (self.pool, self.get_rbd_name(node, ep_num))
                 self.cluster.mkimage(rbd_name, self.endpoint_size, self.pool, self.data_pool, self.order)
 
-    def create_rbd_scrubbing(self):
+    def create_rbd_scrub_pool(self):
         self.pool = '%s-scrub' % self.name
         self.cluster.rmpool(self.pool, self.scrub_pool_profile)
         self.cluster.mkpool(self.pool, self.scrub_pool_profile, 'rbd')

client_endpoints/client_endpoints.py

@@ -46,5 +46,5 @@ def remove(self):
     def create_recovery_image(self):
         pass
 
-    def create_scrubbing_image(self):
+    def create_scrub_image(self):
         pass

client_endpoints/librbd_client_endpoints.py

@@ -20,5 +20,5 @@ def mount(self):
     def create_recovery_image(self):
         self.create_rbd_recovery()
 
-    def create_scrubbing_image(self):
-        self.create_rbd_scrubbing()
+    def create_scrub_image(self):
+        self.create_rbd_scrub_pool()

client_endpoints/rbdfuse_client_endpoints.py

@@ -32,5 +32,5 @@ def map_rbd(self, node, rbd_name):
     def create_recovery_image(self):
         self.create_rbd_recovery()
 
-    def create_scrubbing_image(self):
-        self.create_rbd_scrubbing()
+    def create_scrub_image(self):
+        self.create_rbd_scrub_pool()

client_endpoints/rbdkernel_client_endpoints.py

@@ -23,5 +23,5 @@ def map_rbd(self, node, rbd_name):
     def create_recovery_image(self):
         self.create_rbd_recovery()
 
-    def create_scrubbing_image(self):
-        self.create_rbd_scrubbing()
+    def create_scrub_image(self):
+        self.create_rbd_scrub_pool()

client_endpoints/rbdnbd_client_endpoints.py

@@ -17,5 +17,5 @@ def map_rbd(self, node, rbd_name):
     def create_recovery_image(self):
         self.create_rbd_recovery()
 
-    def create_scrubbing_image(self):
-        self.create_rbd_scrubbing()
+    def create_scrub_image(self):
+        self.create_rbd_scrub_pool()

client_endpoints/rbdtcmu_client_endpoints.py

@@ -24,5 +24,5 @@ def map_rbd(self, node, rbd_name):
     def create_recovery_image(self):
         self.create_rbd_recovery()
 
-    def create_scrubbing_image(self):
-        self.create_rbd_scrubbing()
+    def create_scrub_image(self):
+        self.create_rbd_scrub_pool()