Repository: hadoop Updated Branches: refs/heads/trunk 3d89c3e73 -> 26d0c63a1
HADOOP-15754. s3guard: testDynamoTableTagging should clear existing config. Contributed by Gabor Bota. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/26d0c63a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/26d0c63a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/26d0c63a Branch: refs/heads/trunk Commit: 26d0c63a1e2eea6558fca2c55c134c02ecc93bf8 Parents: 3d89c3e Author: Steve Loughran <ste...@apache.org> Authored: Mon Sep 17 22:40:08 2018 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Mon Sep 17 22:40:08 2018 +0100 ---------------------------------------------------------------------- .../fs/s3a/s3guard/AbstractS3GuardToolTestBase.java | 8 +++++--- .../fs/s3a/s3guard/ITestDynamoDBMetadataStore.java | 6 ++++++ .../fs/s3a/s3guard/ITestS3GuardToolDynamoDB.java | 16 +++++++++++++++- 3 files changed, 26 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/26d0c63a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/AbstractS3GuardToolTestBase.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/AbstractS3GuardToolTestBase.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/AbstractS3GuardToolTestBase.java index 242f616..632676f 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/AbstractS3GuardToolTestBase.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/AbstractS3GuardToolTestBase.java @@ -300,16 +300,18 @@ public abstract class AbstractS3GuardToolTestBase extends AbstractS3ATestBase { @Test public void testSetCapacityFailFastOnReadWriteOfZero() throws Exception{ Configuration conf = getConfiguration(); + String bucket = getFileSystem().getBucket(); conf.set(S3GUARD_DDB_TABLE_NAME_KEY, getFileSystem().getBucket()); S3GuardTool.SetCapacity cmdR = new S3GuardTool.SetCapacity(conf); - String[] argsR = new String[]{cmdR.getName(), "-read", "0", "s3a://bucket"}; + String[] argsR = + new String[]{cmdR.getName(), "-read", "0", "s3a://" + bucket}; intercept(IllegalArgumentException.class, S3GuardTool.SetCapacity.READ_CAP_INVALID, () -> cmdR.run(argsR)); S3GuardTool.SetCapacity cmdW = new S3GuardTool.SetCapacity(conf); - String[] argsW = new String[]{cmdW.getName(), "-write", "0", - "s3a://bucket"}; + String[] argsW = + new String[]{cmdW.getName(), "-write", "0", "s3a://" + bucket}; intercept(IllegalArgumentException.class, S3GuardTool.SetCapacity.WRITE_CAP_INVALID, () -> cmdW.run(argsW)); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/26d0c63a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/ITestDynamoDBMetadataStore.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/ITestDynamoDBMetadataStore.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/ITestDynamoDBMetadataStore.java index a8425bf..5355910 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/ITestDynamoDBMetadataStore.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/ITestDynamoDBMetadataStore.java @@ -630,6 +630,12 @@ public class ITestDynamoDBMetadataStore extends MetadataStoreTestBase { @Test public void testTableTagging() throws IOException { final Configuration conf = getFileSystem().getConf(); + + // clear all table tagging config before this test + conf.getPropsWithPrefix(S3GUARD_DDB_TABLE_TAG).keySet().forEach( + propKey -> conf.unset(S3GUARD_DDB_TABLE_TAG + propKey) + ); + String tableName = "testTableTagging-" + UUID.randomUUID(); conf.set(S3GUARD_DDB_TABLE_NAME_KEY, tableName); conf.set(S3GUARD_DDB_TABLE_CREATE_KEY, "true"); http://git-wip-us.apache.org/repos/asf/hadoop/blob/26d0c63a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/ITestS3GuardToolDynamoDB.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/ITestS3GuardToolDynamoDB.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/ITestS3GuardToolDynamoDB.java index 66a8239..65e2619 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/ITestS3GuardToolDynamoDB.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/ITestS3GuardToolDynamoDB.java @@ -44,7 +44,9 @@ import org.apache.hadoop.fs.s3a.s3guard.S3GuardTool.Destroy; import org.apache.hadoop.fs.s3a.s3guard.S3GuardTool.Init; import org.apache.hadoop.test.LambdaTestUtils; +import static org.apache.hadoop.fs.s3a.Constants.S3GUARD_DDB_REGION_KEY; import static org.apache.hadoop.fs.s3a.Constants.S3GUARD_DDB_TABLE_NAME_KEY; +import static org.apache.hadoop.fs.s3a.Constants.S3GUARD_DDB_TABLE_TAG; import static org.apache.hadoop.fs.s3a.s3guard.DynamoDBMetadataStore.*; import static org.apache.hadoop.fs.s3a.s3guard.S3GuardTool.*; import static org.apache.hadoop.test.LambdaTestUtils.intercept; @@ -101,8 +103,20 @@ public class ITestS3GuardToolDynamoDB extends AbstractS3GuardToolTestBase { @Test public void testDynamoTableTagging() throws Exception { - // setup Configuration conf = getConfiguration(); + // If the region is not set in conf, skip the test. + String ddbRegion = conf.get(S3GUARD_DDB_REGION_KEY); + Assume.assumeTrue( + S3GUARD_DDB_REGION_KEY + " should be set to run this test", + ddbRegion != null && !ddbRegion.isEmpty() + ); + + // setup + // clear all table tagging config before this test + conf.getPropsWithPrefix(S3GUARD_DDB_TABLE_TAG).keySet().forEach( + propKey -> conf.unset(S3GUARD_DDB_TABLE_TAG + propKey) + ); + conf.set(S3GUARD_DDB_TABLE_NAME_KEY, "testDynamoTableTagging-" + UUID.randomUUID()); S3GuardTool.Init cmdR = new S3GuardTool.Init(conf); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
