Skip to content

HADOOP-19184. S3A Fix TestStagingCommitter.testJobCommitFailure #6843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mukund-thakur merged 2 commits into from
May 28, 2024
Merged

HADOOP-19184. S3A Fix TestStagingCommitter.testJobCommitFailure #6843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdbc61d
HADOOP-19184. Fix UT TestStagingCommitter.testJobCommitFailure
mukund-thakur May 22, 2024
2485212
checkstyle
mukund-thakur May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/MockS3AFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,11 @@ void deleteObjectAtPath(Path f,
String key,
boolean isFile)
throws SdkException, IOException {
deleteObject(key);
mock.getS3AInternals()
.getAmazonS3Client("test")
.deleteObject(getRequestFactory()
.newDeleteObjectRequestBuilder(key)
.build());
}

@Override
Expand Down
17 changes: 13 additions & 4 deletions ...ols/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/staging/StagingTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
import software.amazon.awssdk.services.s3.model.MultipartUpload;
import software.amazon.awssdk.services.s3.model.UploadPartRequest;
import software.amazon.awssdk.services.s3.model.UploadPartResponse;

import org.apache.hadoop.fs.s3a.S3AInternals;
import org.apache.hadoop.fs.s3a.S3AStore;
import org.apache.hadoop.util.Lists;
import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
import org.junit.AfterClass;
Expand Down Expand Up @@ -129,9 +132,10 @@ protected StagingTestBase() {
* @throws IOException IO problems.
*/
protected static S3AFileSystem createAndBindMockFSInstance(Configuration conf,
Pair<StagingTestBase.ClientResults, StagingTestBase.ClientErrors> outcome)
Pair<StagingTestBase.ClientResults, StagingTestBase.ClientErrors> outcome,
S3Client mockS3Client)
throws IOException {
S3AFileSystem mockFs = mockS3AFileSystemRobustly();
S3AFileSystem mockFs = mockS3AFileSystemRobustly(mockS3Client);
MockS3AFileSystem wrapperFS = new MockS3AFileSystem(mockFs, outcome);
URI uri = RAW_BUCKET_URI;
wrapperFS.initialize(uri, conf);
Expand All @@ -142,8 +146,13 @@ protected static S3AFileSystem createAndBindMockFSInstance(Configuration conf,
return mockFs;
}

private static S3AFileSystem mockS3AFileSystemRobustly() {
private static S3AFileSystem mockS3AFileSystemRobustly(S3Client mockS3Client) {
S3AFileSystem mockFS = mock(S3AFileSystem.class);
S3AInternals s3AInternals = mock(S3AInternals.class);
when(mockFS.getS3AInternals()).thenReturn(s3AInternals);
when(s3AInternals.getStore()).thenReturn(mock(S3AStore.class));
when(s3AInternals.getAmazonS3Client(anyString()))
.thenReturn(mockS3Client);
doNothing().when(mockFS).incrementReadOperations();
doNothing().when(mockFS).incrementWriteOperations();
doNothing().when(mockFS).incrementWriteOperations();
Expand Down Expand Up @@ -350,7 +359,7 @@ public void setupJob() throws Exception {
this.errors = new StagingTestBase.ClientErrors();
this.mockClient = newMockS3Client(results, errors);
this.mockFS = createAndBindMockFSInstance(jobConf,
Pair.of(results, errors));
Pair.of(results, errors), mockClient);
this.wrapperFS = lookupWrapperFS(jobConf);
// and bind the FS
wrapperFS.setAmazonS3Client(mockClient);
Expand Down
2 changes: 1 addition & 1 deletion ...adoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/staging/TestStagingCommitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public void setupCommitter() throws Exception {
this.errors = new StagingTestBase.ClientErrors();
this.mockClient = newMockS3Client(results, errors);
this.mockFS = createAndBindMockFSInstance(jobConf,
Pair.of(results, errors));
Pair.of(results, errors), mockClient);
this.wrapperFS = lookupWrapperFS(jobConf);
// and bind the FS
wrapperFS.setAmazonS3Client(mockClient);
Expand Down