Merge pull request #38871 from cbodley/wip-qa-rgw-valgrind-on

qa/rgw: reenable valgrind in rgw/verify suite

Reviewed-by: Ali Maredia <amaredia@redhat.com>

qa/suites/rgw/verify/tasks/0-install.yaml

@@ -1,14 +1,9 @@
-# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-os_type: centos
-
 tasks:
 - install:
-#    flavor: notcmalloc
 - ceph:
 - openssl_keys:
 - rgw:
     client.0:
-#      valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
 
 overrides:
   ceph:

qa/suites/rgw/verify/validater/valgrind.yaml

@@ -5,8 +5,11 @@ os_version: "8.0"
 overrides:
   install:
     ceph:
-#      flavor: notcmalloc
+      flavor: notcmalloc
       #debuginfo: true
+  rgw:
+    client.0:
+      valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
   ceph:
     conf:
       global:

qa/workunits/rgw/test_rgw_reshard.py

@@ -5,6 +5,7 @@ import time
 import subprocess
 import json
 import boto3
+import botocore.exceptions
 
 """
 Rgw manual and dynamic resharding  testing against a running instance
@@ -47,15 +48,6 @@ def exec_cmd(cmd):
         return False
 
 
-def get_radosgw_port():
-    out = exec_cmd('sudo netstat -nltp | grep radosgw')
-    log.debug('output: %s' % out)
-    x = out.decode('utf8').split(" ")
-    port = [i for i in x if ':' in i][0].split(':')[1]
-    log.info('radosgw port: %s' % port)
-    return port
-
-
 class BucketStats:
     def __init__(self, bucket_name, bucket_id, num_objs=0, size_kb=0, num_shards=0):
         self.bucket_name = bucket_name
@@ -118,14 +110,22 @@ def main():
                               verify=False,
                               config=None,
                               )
+        try:
+            list(conn.buckets.limit(1)) # just verify we can list buckets
+        except botocore.exceptions.ConnectionError as e:
+            print(e)
+            raise
+        print('connected to', endpoint)
         return conn
 
-    port = get_radosgw_port()
-
-    if port == '80':
-        connection = boto_connect(port, ssl=False, proto='http')
-    elif port == '443':
-        connection = boto_connect(port, ssl=True, proto='https')
+    try:
+        connection = boto_connect('80', False, 'http')
+    except botocore.exceptions.ConnectionError:
+        try: # retry on non-privileged http port
+            connection = boto_connect('8000', False, 'http')
+        except botocore.exceptions.ConnectionError:
+            # retry with ssl
+            connection = boto_connect('443', True, 'https')
 
     # create a bucket
     bucket1 = connection.create_bucket(Bucket=BUCKET_NAME1)