Merge pull request ceph#52444 from pritha-srivastava/wip-rgw-d4n

d4n topic branch

Reviewed-by: Ali Maredia <[email protected]>

Author: alimaredia

.gitmodules

@@ -59,9 +59,6 @@
 [submodule "s3select"]
 	path = src/s3select
 	url = https://github.com/ceph/s3select.git
-[submodule "src/cpp_redis"]
-	path = src/cpp_redis
-	url = https://github.com/ceph/cpp_redis.git
 [submodule "src/libkmip"]
 	path = src/libkmip
 	url = https://github.com/ceph/libkmip
@@ -81,3 +78,6 @@
 [submodule "src/qatzip"]
 	path = src/qatzip
 	url = https://github.com/intel/qatzip.git
+[submodule "src/boost_redis"]
+	path = src/boost_redis
+	url = https://github.com/boostorg/redis.git

cmake/modules/BuildBoost.cmake

@@ -11,6 +11,8 @@
 #  Boost_USE_STATIC_LIBS : boolean (default: OFF)
 #  Boost_USE_MULTITHREADED : boolean (default: OFF)
 #  BOOST_J: integer (defanult 1)
+#
+# Note: Remove boost_redis submodule once upgraded to Boost version that includes it
 
 function(check_boost_version source_dir expected_version)
   set(version_hpp "${source_dir}/boost/version.hpp")

qa/suites/rgw/d4n/tasks/rgw_d4ntests.yaml

@@ -5,6 +5,8 @@ tasks:
       deb: ['s3cmd', 'redis']
       rpm: ['s3cmd', 'redis']
 - ceph:
+- redis:
+    client.0:
 - rgw: [client.0]
 - tox: [client.0]
 - exec:

qa/tasks/d4ntests.py

@@ -2,18 +2,10 @@
 
 from teuthology import misc as teuthology
 from teuthology.task import Task
-from teuthology.orchestra import run
 from teuthology.packaging import remove_package
 
 log = logging.getLogger(__name__)
 
-def get_toxvenv_dir(ctx):
-    return ctx.tox.venv_path
-
-def toxvenv_sh(ctx, remote, args, **kwargs):
-    activate = get_toxvenv_dir(ctx) + '/bin/activate'
-    return remote.sh(['source', activate, run.Raw('&&')] + args, **kwargs)
-
 display_name='Foo'
 email='[email protected]'
 access_key='test3'
@@ -50,14 +42,11 @@ def begin(self):
             log.debug('D4N Tests: Host is: {host}'.format(host=host))
 
         self.create_user()
-        self.redis_startup()
 
     def end(self):
         super(D4NTests, self).end()
         log.info('D4N Tests: END')
 
-        self.redis_shutdown()
-
         for client in self.all_clients:
             self.remove_packages(client)
             self.delete_user(client)
@@ -92,41 +81,9 @@ def create_user(self):
                         ],
                     )
 
-    def redis_startup(self):
-        try:
-            for client in self.all_clients:
-                self.ctx.cluster.only(client).run(
-                    args=[
-                        'sudo',
-                        'redis-server',
-                        '--daemonize',
-                        'yes'
-                        ],
-                    )
-    
-        except Exception as err:
-            log.debug('D4N Tests: Error starting up a Redis server')
-            log.debug(err)
-
-    def redis_shutdown(self):
-        try:
-            for client in self.all_clients:
-                self.ctx.cluster.only(client).run(
-                    args=[
-                        'sudo',
-                        'redis-cli',
-                        'shutdown',
-                        ],
-                    )
-    
-        except Exception as err:
-            log.debug('D4N Tests: Error shutting down a Redis server')
-            log.debug(err)
-
     def remove_packages(self, client):
         (remote,) = self.ctx.cluster.only(client).remotes.keys()
         remove_package('s3cmd', remote)
-        remove_package('redis', remote)
 
     def delete_user(self, client):
         log.info("D4N Tests: Deleting S3 user...")

qa/tasks/redis.py

@@ -0,0 +1,83 @@
+import logging
+
+from teuthology import misc as teuthology
+from teuthology.task import Task
+from teuthology.packaging import remove_package
+
+log = logging.getLogger(__name__)
+
+class Redis(Task):
+
+    def __init__(self, ctx, config):
+        super(Redis, self).__init__(ctx, config)
+        self.log = log
+        log.info('Redis Task: __INIT__ ')
+        
+        clients = ['client.{id}'.format(id=id_)
+                   for id_ in teuthology.all_roles_of_type(self.ctx.cluster, 'client')]
+        self.all_clients = []
+        for client in clients:
+            if client in self.config:
+                self.all_clients.extend([client])
+        if self.all_clients is None:
+            self.all_clients = 'client.0'
+
+    def setup(self):
+        super(Redis, self).setup()
+        log.info('Redis Task: SETUP')
+
+    def begin(self):
+        super(Redis, self).begin()
+        log.info('Redis Task: BEGIN')
+
+        for (host, roles) in self.ctx.cluster.remotes.items():
+            log.debug('Redis Task: Cluster config is: {cfg}'.format(cfg=roles))
+            log.debug('Redis Task: Host is: {host}'.format(host=host))
+
+        self.redis_startup()
+
+    def end(self):
+        super(Redis, self).end()
+        log.info('Redis Task: END')
+
+        self.redis_shutdown()
+
+        for client in self.all_clients:
+            self.remove_redis_package(client)
+
+    def redis_startup(self):
+        try:
+            for client in self.all_clients:
+                self.ctx.cluster.only(client).run(
+                    args=[
+                        'sudo',
+                        'redis-server',
+                        '--daemonize',
+                        'yes'
+                        ],
+                    )
+    
+        except Exception as err:
+            log.debug('Redis Task: Error starting up a Redis server')
+            log.debug(err)
+
+    def redis_shutdown(self):
+        try:
+            for client in self.all_clients:
+                self.ctx.cluster.only(client).run(
+                    args=[
+                        'sudo',
+                        'redis-cli',
+                        'shutdown',
+                        ],
+                    )
+    
+        except Exception as err:
+            log.debug('Redis Task: Error shutting down a Redis server')
+            log.debug(err)
+
+    def remove_redis_package(self, client):
+        (remote,) = self.ctx.cluster.only(client).remotes.keys()
+        remove_package('redis', remote)
+
+task = Redis