Skip to content

Commit 236b9aa

Browse files
modithahsteveloughran
authored andcommitted
HADOOP-18757. S3A Committer only finalizes the commits in a single thread (apache#5706)
Contributed by Moditha Hewasinghage
1 parent 850b8ab commit 236b9aa

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/commit/impl/CommitContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ private ExecutorService buildThreadPool(
236236
.setDaemon(true)
237237
.setNameFormat(THREAD_PREFIX + jobId + "-%d")
238238
.build();
239-
return new HadoopThreadPoolExecutor(0, numThreads,
239+
return new HadoopThreadPoolExecutor(numThreads, numThreads,
240240
THREAD_KEEP_ALIVE_TIME,
241241
TimeUnit.SECONDS,
242242
new LinkedBlockingQueue<>(),

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/staging/integration/ITestStagingCommitProtocolFailure.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl;
3333

3434
import static org.apache.hadoop.fs.s3a.Constants.MULTIPART_UPLOADS_ENABLED;
35+
import static org.apache.hadoop.fs.s3a.S3ATestUtils.disableFilesystemCaching;
3536
import static org.apache.hadoop.fs.s3a.S3ATestUtils.getTestBucketName;
3637
import static org.apache.hadoop.fs.s3a.S3ATestUtils.removeBucketOverrides;
3738
import static org.apache.hadoop.fs.s3a.commit.CommitConstants.FS_S3A_COMMITTER_NAME;
@@ -54,6 +55,7 @@ protected Configuration createConfiguration() {
5455
conf.setBoolean(MULTIPART_UPLOADS_ENABLED, false);
5556
conf.set(S3A_COMMITTER_FACTORY_KEY, CommitConstants.S3A_COMMITTER_FACTORY);
5657
conf.set(FS_S3A_COMMITTER_NAME, InternalCommitterConstants.COMMITTER_NAME_STAGING);
58+
disableFilesystemCaching(conf);
5759
return conf;
5860
}
5961

0 commit comments

Comments
 (0)