From: Vasu Kulkarni <vasu@redhat.com>
Date: Thu, 22 Mar 2018 21:38:23 +0000 (-0700)
Subject: qa/tests:  couple of improvements to s3a task to handle landsat tests, rgw daemon... 
X-Git-Tag: v13.1.0~28^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=43f2fdd081e7e41f0cc02bd040b7b9a0a4e7306e;p=ceph.git

qa/tests:  couple of improvements to s3a task to handle landsat tests, rgw daemon readiness
and timeout handling for huge files

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
---

diff --git a/qa/tasks/s3a_hadoop.py b/qa/tasks/s3a_hadoop.py
index ef9349ef26ef..f120726abb14 100644
--- a/qa/tasks/s3a_hadoop.py
+++ b/qa/tasks/s3a_hadoop.py
@@ -84,7 +84,9 @@ def task(ctx, config):
     if hadoop_ver.startswith('2.8'):
         # test all ITtests but skip AWS test using public bucket landsat-pds
         # which is not available from within this test
-        test_options = '-Dit.test=ITestS3A* -Dit.test=\!ITestS3AAWSCredentialsProvider* -Dparallel-tests -Dscale -Dfs.s3a.scale.test.huge.filesize=128M verify'
+        test_options = '-Dit.test=ITestS3A* -Dparallel-tests -Dscale \
+                        -Dfs.s3a.scale.test.timeout=1200 \
+                        -Dfs.s3a.scale.test.huge.filesize=256M verify'
     else:
         test_options = 'test -Dtest=S3a*,TestS3A*'
     try:
@@ -147,6 +149,8 @@ def fix_rgw_config(client, name):
     client.run(args=['cat', ceph_conf_path])
     client.run(args=['sudo', 'systemctl', 'restart', 'ceph-radosgw.target'])
     client.run(args=['sudo', 'systemctl', 'status', 'ceph-radosgw.target'])
+    # sleep for daemon to be completely up before creating admin user
+    time.sleep(10)
 
 
 def setup_user_bucket(client, dns_name, access_key, secret_key, bucket_name, testdir):
@@ -223,11 +227,16 @@ def run_s3atest(client, maven_version, testdir, test_options):
     """
     aws_testdir = '{testdir}/hadoop/hadoop-tools/hadoop-aws/'.format(testdir=testdir)
     run_test = '{testdir}/apache-maven-{maven_version}/bin/mvn'.format(testdir=testdir, maven_version=maven_version)
+    # Remove AWS CredentialsProvider tests as it hits public bucket from AWS
+    # better solution is to create the public bucket on local server and test
+    rm_test = 'rm src/test/java/org/apache/hadoop/fs/s3a/ITestS3AAWSCredentialsProvider.java'
     client.run(
         args=[
             'cd',
             run.Raw(aws_testdir),
             run.Raw('&&'),
+            run.Raw(rm_test),
+            run.Raw('&&'),
             run.Raw(run_test),
             run.Raw(test_options)
         ]
@@ -245,6 +254,11 @@ def configure_s3a(client, dns_name, access_key, secret_key, bucket_name, testdir
 <value>{name}</value>
 </property>
 
+<property>
+<name>fs.contract.test.fs.s3a</name>
+<value>s3a://{bucket_name}/</value>
+</property>
+
 <property>
 <name>fs.s3a.connection.ssl.enabled</name>
 <value>false</value>