Repository: hadoop Updated Branches: refs/heads/HADOOP-13345 72bc8767e -> dfeca6dd1
HADOOP-14282. S3Guard: DynamoDBMetadata::prune() should self interrupt correctly. Contributed by Mingliang Liu Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dfeca6dd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dfeca6dd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dfeca6dd Branch: refs/heads/HADOOP-13345 Commit: dfeca6dd1ad5edbefc63f87ff86e2d5da83d5b86 Parents: 72bc876 Author: Mingliang Liu <[email protected]> Authored: Wed Apr 5 14:51:35 2017 -0700 Committer: Mingliang Liu <[email protected]> Committed: Wed Apr 5 14:51:35 2017 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/fs/s3a/s3guard/DynamoDBMetadataStore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dfeca6dd/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 c3718d1..b2f011c 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 @@ -651,7 +651,7 @@ public class DynamoDBMetadataStore implements MetadataStore { int itemCount = 0; try { Collection<Path> deletionBatch = - new ArrayList(S3GUARD_DDB_BATCH_WRITE_REQUEST_LIMIT); + new ArrayList<>(S3GUARD_DDB_BATCH_WRITE_REQUEST_LIMIT); int delay = conf.getInt(S3GUARD_DDB_BACKGROUND_SLEEP_MSEC_KEY, S3GUARD_DDB_BACKGROUND_SLEEP_MSEC_DEFAULT); for (Item item : expiredFiles(modTime)) { @@ -671,7 +671,7 @@ public class DynamoDBMetadataStore implements MetadataStore { processBatchWriteRequest(pathToKey(deletionBatch), new Item[0]); } } catch (InterruptedException e) { - Thread.currentThread().interrupted(); + Thread.currentThread().interrupt(); throw new InterruptedIOException("Pruning was interrupted"); } LOG.info("Finished pruning {} items in batches of {}", itemCount, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
