-
Notifications
You must be signed in to change notification settings - Fork 9.1k
HADOOP-19047: Support InMemory Tracking Of S3A Magic Commits #6468
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.
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
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
325306d
HADOOP-19047: Support InMemory Tracking Of S3A Magic Commits
shameersss1 e43fa54
Address PR review commnents
shameersss1 dcf2b12
Fix import ordering, Test in ITestTerasortOnS3A and other minor fix
shameersss1 85361f1
HADOOP-19047: Support InMemory Tracking Of S3A Magic Commits
shameersss1 f8e9a1e
Fix PR comments
shameersss1 8d739be
remove unwanted changes
shameersss1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
146 changes: 146 additions & 0 deletions
146
...p-aws/src/main/java/org/apache/hadoop/fs/s3a/commit/magic/InMemoryMagicCommitTracker.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.hadoop.fs.s3a.commit.magic; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
|
|
||
| import software.amazon.awssdk.services.s3.model.CompletedPart; | ||
|
|
||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.apache.hadoop.fs.Path; | ||
| import org.apache.hadoop.fs.s3a.WriteOperationHelper; | ||
| import org.apache.hadoop.fs.s3a.commit.files.SinglePendingCommit; | ||
| import org.apache.hadoop.fs.s3a.statistics.PutTrackerStatistics; | ||
| import org.apache.hadoop.fs.statistics.IOStatistics; | ||
| import org.apache.hadoop.fs.statistics.IOStatisticsSnapshot; | ||
| import org.apache.hadoop.util.Preconditions; | ||
|
|
||
| import static org.apache.hadoop.fs.s3a.commit.magic.MagicCommitTrackerUtils.extractTaskAttemptIdFromPath; | ||
|
|
||
| /** | ||
| * InMemoryMagicCommitTracker stores the commit data in memory. | ||
| * The commit data and related data stores are flushed out from | ||
| * the memory when the task is committed or aborted. | ||
| */ | ||
| public class InMemoryMagicCommitTracker extends MagicCommitTracker { | ||
steveloughran marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| /** | ||
| * Map to store taskAttemptId, and it's corresponding list of pending commit data. | ||
| * The entries in the Map gets removed when a task commits or aborts. | ||
| */ | ||
| private final static Map<String, List<SinglePendingCommit>> TASK_ATTEMPT_ID_TO_MPU_METADATA = new ConcurrentHashMap<>(); | ||
|
|
||
| /** | ||
| * Map to store path of the file, and it's corresponding size. | ||
| * The entries in the Map gets removed when a task commits or aborts. | ||
| */ | ||
| private final static Map<Path, Long> PATH_TO_BYTES_WRITTEN = new ConcurrentHashMap<>(); | ||
|
|
||
| /** | ||
| * Map to store taskAttemptId, and list of paths to files written by it. | ||
| * The entries in the Map gets removed when a task commits or aborts. | ||
| */ | ||
| private final static Map<String, List<Path>> TASK_ATTEMPT_ID_TO_PATH = new ConcurrentHashMap<>(); | ||
|
|
||
| public InMemoryMagicCommitTracker(Path path, | ||
| String bucket, | ||
| String originalDestKey, | ||
| String destKey, | ||
| String pendingsetKey, | ||
| WriteOperationHelper writer, | ||
| PutTrackerStatistics trackerStatistics) { | ||
| super(path, bucket, originalDestKey, destKey, pendingsetKey, writer, trackerStatistics); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean aboutToComplete(String uploadId, | ||
| List<CompletedPart> parts, | ||
| long bytesWritten, | ||
| final IOStatistics iostatistics) | ||
| throws IOException { | ||
| Preconditions.checkArgument(StringUtils.isNotEmpty(uploadId), | ||
| "empty/null upload ID: " + uploadId); | ||
| Preconditions.checkArgument(parts != null, "No uploaded parts list"); | ||
| Preconditions.checkArgument(!parts.isEmpty(), "No uploaded parts to save"); | ||
|
|
||
| // build the commit summary | ||
| SinglePendingCommit commitData = new SinglePendingCommit(); | ||
| commitData.touch(System.currentTimeMillis()); | ||
| commitData.setDestinationKey(getDestKey()); | ||
| commitData.setBucket(getBucket()); | ||
| commitData.setUri(getPath().toUri().toString()); | ||
| commitData.setUploadId(uploadId); | ||
| commitData.setText(""); | ||
| commitData.setLength(bytesWritten); | ||
| commitData.bindCommitData(parts); | ||
| commitData.setIOStatistics(new IOStatisticsSnapshot(iostatistics)); | ||
|
|
||
| // extract the taskAttemptId from the path | ||
| String taskAttemptId = extractTaskAttemptIdFromPath(getPath()); | ||
|
|
||
| // store the commit data with taskAttemptId as the key | ||
| TASK_ATTEMPT_ID_TO_MPU_METADATA.computeIfAbsent(taskAttemptId, | ||
| k -> Collections.synchronizedList(new ArrayList<>())).add(commitData); | ||
|
|
||
| // store the byteswritten(length) for the corresponding file | ||
| PATH_TO_BYTES_WRITTEN.put(getPath(), bytesWritten); | ||
|
|
||
| // store the mapping between taskAttemptId and path | ||
| // This information is used for removing entries from | ||
| // the map once the taskAttempt is completed/committed. | ||
| TASK_ATTEMPT_ID_TO_PATH.computeIfAbsent(taskAttemptId, | ||
| k -> Collections.synchronizedList(new ArrayList<>())).add(getPath()); | ||
|
|
||
| LOG.info("commit metadata for {} parts in {}. size: {} byte(s) " | ||
| + "for the taskAttemptId: {} is stored in memory", | ||
| parts.size(), getPendingPartKey(), bytesWritten, taskAttemptId); | ||
| LOG.debug("Closed MPU to {}, saved commit information to {}; data=:\n{}", | ||
| getPath(), getPendingPartKey(), commitData); | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| final StringBuilder sb = new StringBuilder( | ||
| "InMemoryMagicCommitTracker{"); | ||
| sb.append(", Number of taskAttempts=").append(TASK_ATTEMPT_ID_TO_MPU_METADATA.size()); | ||
| sb.append(", Number of files=").append(PATH_TO_BYTES_WRITTEN.size()); | ||
| sb.append('}'); | ||
| return sb.toString(); | ||
| } | ||
|
|
||
|
|
||
| public static Map<String, List<SinglePendingCommit>> getTaskAttemptIdToMpuMetadata() { | ||
| return TASK_ATTEMPT_ID_TO_MPU_METADATA; | ||
| } | ||
|
|
||
| public static Map<Path, Long> getPathToBytesWritten() { | ||
| return PATH_TO_BYTES_WRITTEN; | ||
| } | ||
|
|
||
| public static Map<String, List<Path>> getTaskAttemptIdToPath() { | ||
| return TASK_ATTEMPT_ID_TO_PATH; | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is a bit of a hack. not saying that's bad, just wondering if there is a more elegant solution.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree this an ugly hack. I couldn't find any better alternative. This will be used by downstream application like Spark which wants to get the file size of the file written by the task. This is supposed to be used in the same process which writes the file/initiated and upload the MPU.