Repository: hadoop Updated Branches: refs/heads/trunk 3ce99e32f -> 085f10e75
HADOOP-15947. Fix ITestDynamoDBMetadataStore test error issues. 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/085f10e7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/085f10e7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/085f10e7 Branch: refs/heads/trunk Commit: 085f10e75dea5446861253cf63aced337536481c Parents: e148c3f Author: Sean Mackrory <mackror...@apache.org> Authored: Mon Nov 26 10:42:34 2018 -0700 Committer: Sean Mackrory <mackror...@apache.org> Committed: Wed Nov 28 10:45:09 2018 -0700 ---------------------------------------------------------------------- .../fs/s3a/s3guard/DynamoDBMetadataStore.java | 2 +- .../s3a/s3guard/ITestDynamoDBMetadataStore.java | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/085f10e7/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DynamoDBMetadataStore.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DynamoDBMetadataStore.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DynamoDBMetadataStore.java index 6f892e5..90f6180 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DynamoDBMetadataStore.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DynamoDBMetadataStore.java @@ -633,7 +633,7 @@ public class DynamoDBMetadataStore implements MetadataStore { LOG.trace("Listing table {} in region {} for {} returning {}", tableName, region, path, metas); - return (metas.isEmpty() || dirPathMeta == null) + return (metas.isEmpty() && dirPathMeta == null) ? null : new DirListingMetadata(path, metas, isAuthoritative, dirPathMeta.getLastUpdated()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/085f10e7/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 5355910..5ae8356 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 @@ -80,6 +80,11 @@ import static org.apache.hadoop.test.LambdaTestUtils.*; * A table will be created and shared between the tests, */ public class ITestDynamoDBMetadataStore extends MetadataStoreTestBase { + + public ITestDynamoDBMetadataStore() { + super(); + } + private static final Logger LOG = LoggerFactory.getLogger(ITestDynamoDBMetadataStore.class); public static final PrimaryKey @@ -574,8 +579,8 @@ public class ITestDynamoDBMetadataStore extends MetadataStoreTestBase { } @Test - public void testProvisionTable() throws IOException { - final String tableName = "testProvisionTable"; + public void testProvisionTable() throws Exception { + final String tableName = "testProvisionTable-" + UUID.randomUUID(); Configuration conf = getFileSystem().getConf(); conf.set(S3GUARD_DDB_TABLE_NAME_KEY, tableName); @@ -587,13 +592,18 @@ public class ITestDynamoDBMetadataStore extends MetadataStoreTestBase { ddbms.provisionTable(oldProvision.getReadCapacityUnits() * 2, oldProvision.getWriteCapacityUnits() * 2); ddbms.initTable(); + // we have to wait until the provisioning settings are applied, + // so until the table is ACTIVE again and not in UPDATING + ddbms.getTable().waitForActive(); final ProvisionedThroughputDescription newProvision = dynamoDB.getTable(tableName).describe().getProvisionedThroughput(); LOG.info("Old provision = {}, new provision = {}", oldProvision, newProvision); - assertEquals(oldProvision.getReadCapacityUnits() * 2, + assertEquals("Check newly provisioned table read capacity units.", + oldProvision.getReadCapacityUnits() * 2, newProvision.getReadCapacityUnits().longValue()); - assertEquals(oldProvision.getWriteCapacityUnits() * 2, + assertEquals("Check newly provisioned table write capacity units.", + oldProvision.getWriteCapacityUnits() * 2, newProvision.getWriteCapacityUnits().longValue()); ddbms.destroy(); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
