HADOOP-19232: [ABFS][FNSOverBlob] Implementing Ingress Support with various Fallback Handling #7272
Conversation
This file contains 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
anmolanmol1234
changed the title
This comment was marked as outdated.
This comment was marked as outdated.
anujmodi2021
reviewed
Jan 6, 2025
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsConfiguration.java
Outdated
Show resolved
Hide resolved
...tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java
Outdated
Show resolved
Hide resolved
...op-azure/src/main/java/org/apache/hadoop/fs/azurebfs/constants/FileSystemConfigurations.java
Show resolved
Hide resolved
...ls/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/constants/AbfsHttpConstants.java
Show resolved
Hide resolved
.../java/org/apache/hadoop/fs/azurebfs/contracts/exceptions/InvalidIngressServiceException.java
Outdated
Show resolved
Hide resolved
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsBlock.java
Show resolved
Hide resolved
...tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsBlockStatus.java
Show resolved
Hide resolved
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsErrors.java
Outdated
Show resolved
Hide resolved
|
|
||
| /** | ||
| * Creates or retrieves an existing Azure ingress handler based on the service type and provided parameters. | ||
| * <p> |
There was a problem hiding this comment.
seems like xml tag is not closed
There was a problem hiding this comment.
which tag is not closed ?
...ools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsOutputStream.java
Show resolved
Hide resolved
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
anujmodi2021
reviewed
Jan 8, 2025
hadoop-tools/hadoop-azure/src/config/checkstyle-suppressions.xml
Outdated
Show resolved
Hide resolved
.../java/org/apache/hadoop/fs/azurebfs/contracts/exceptions/InvalidIngressServiceException.java
Show resolved
Hide resolved
...ools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAbfsCustomEncryption.java
Outdated
Show resolved
Hide resolved
...ls/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/AbstractAbfsIntegrationTest.java
Outdated
Show resolved
Hide resolved
...ools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAbfsCustomEncryption.java
Show resolved
Hide resolved
...hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemAppend.java
Outdated
Show resolved
Hide resolved
...hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemAppend.java
Outdated
Show resolved
Hide resolved
...hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemAppend.java
Outdated
Show resolved
Hide resolved
...hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemAppend.java
Outdated
Show resolved
Hide resolved
...hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemAppend.java
Outdated
Show resolved
Hide resolved
anujmodi2021
requested changes
Jan 9, 2025
...hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/AzcopyExecutionException.java
Outdated
Show resolved
Hide resolved
...hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/AzcopyExecutionException.java
Show resolved
Hide resolved
...oop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/ITestAbfsPaginatedDelete.java
Show resolved
Hide resolved
...hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/ITestAbfsOutputStream.java
Show resolved
Hide resolved
...hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/ITestAbfsOutputStream.java
Outdated
Show resolved
Hide resolved
...hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/ITestAbfsOutputStream.java
Outdated
Show resolved
Hide resolved
...src/test/java/org/apache/hadoop/fs/azurebfs/services/ITestAbfsHttpClientRequestExecutor.java
Show resolved
Hide resolved
...ls/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFilesystemAcl.java
Outdated
Show resolved
Hide resolved
...ls/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/constants/AbfsHttpConstants.java
Show resolved
Hide resolved
...ls/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/constants/AbfsHttpConstants.java
Show resolved
Hide resolved
| @@ -1140,7 +1387,7 @@ public boolean checkIsDir(AbfsHttpOperation result) { | |||
| public boolean checkUserError(int responseStatusCode) { | |||
| return (responseStatusCode >= HttpURLConnection.HTTP_BAD_REQUEST | |||
| && responseStatusCode < HttpURLConnection.HTTP_INTERNAL_ERROR | |||
| && responseStatusCode != HttpURLConnection.HTTP_CONFLICT); | |||
| && responseStatusCode != HTTP_CONFLICT); | |||
There was a problem hiding this comment.
We can do same changes for above two codes (HTTP_INTERNAL_ERROR, HTTP_BAD_REQUEST) as well.
There was a problem hiding this comment.
reverted this change
| this.outputStream = outputStream; | ||
| this.offset = offset; | ||
| DataBlocks.BlockFactory blockFactory = outputStream.getBlockManager().getBlockFactory(); | ||
| long blockCount = outputStream.getBlockManager().getBlockCount(); |
There was a problem hiding this comment.
Since we are using these variables (blockCount, blockSize) only at one place, it would be better to call it inplace.
There was a problem hiding this comment.
better to store them as variables for better readability
| + "exists and its resource type is invalid for this operation."; | ||
| public static final String BLOB_OPERATION_NOT_SUPPORTED = "Blob operation is not supported."; | ||
| public static final String INVALID_APPEND_OPERATION = "The resource was created or modified by the Azure Blob Service API " | ||
| + "and cannot be appended to by the Azure Data Lake Storage Service API"; |
There was a problem hiding this comment.
Typo error: and cannot be appended by the Azure Data Lake Storage Service API.
There was a problem hiding this comment.
This is how the error message comes from the backend
| boolean hasActiveBlockDataToUpload() { | ||
| AzureBlockManager blockManager = getBlockManager(); | ||
| AbfsBlock activeBlock = blockManager.getActiveBlock(); | ||
| return blockManager.hasActiveBlock() && activeBlock.hasData(); |
There was a problem hiding this comment.
Can blockManager and activeBlock be null in any of the case?
There was a problem hiding this comment.
hasActiveBlock checks for null for activeBlock and blockManager can not be null
| if (hasActiveBlock()) { | ||
| clearActiveBlock(); | ||
| } | ||
| getBlockManager().clearActiveBlock(); |
There was a problem hiding this comment.
Should we not have check on hasActiveBlock before clearActiveBlock?
| @VisibleForTesting | ||
| AbfsClient getClient() { | ||
| synchronized AbfsClient getClient() { |
There was a problem hiding this comment.
What is the need of this change?
There was a problem hiding this comment.
was reported as a spot bug hence I added it but dont see the need for it hence reverting
| AbfsBlobClient blobClient = abfsOutputStream.getClientHandler().getBlobClient(); | ||
| final AbfsRestOperation op = blobClient | ||
| .getBlockList(abfsOutputStream.getPath(), tracingContext); | ||
| committedBlockIdList = op.getResult().getBlockIdList(); |
There was a problem hiding this comment.
A check on op and op.getResult before calling getBlockIdList is needed.
| BlobAppendRequestParameters blobParams = new BlobAppendRequestParameters(blockToUpload.getBlockId(), getETag()); | ||
| reqParams.setBlobParams(blobParams); | ||
| AbfsRestOperation op; | ||
| long threadId = Thread.currentThread().getId(); |
There was a problem hiding this comment.
Can we get Thread.currentThread().getId() inplace as we are only using it once?
| TracingContext tracingContext) throws IOException { | ||
| TracingContext tracingContextAppend = new TracingContext(tracingContext); | ||
| long threadId = Thread.currentThread().getId(); | ||
| String threadIdStr = String.valueOf(threadId); |
There was a problem hiding this comment.
Same as above, if threadIf is getting used at only one place, can we keep it inplace?
| IOUtils.closeStreams(uploadData, activeBlock); | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
Please remove 1 extra empty line.
| AbfsRestOperation op; | ||
| TracingContext tracingContextAppend = new TracingContext(tracingContext); | ||
| long threadId = Thread.currentThread().getId(); | ||
| String threadIdStr = String.valueOf(threadId); |
| throws IOException { | ||
| TracingContext tracingContextFlush = new TracingContext(tracingContext); | ||
| if (tracingContextFlush.getIngressHandler().equals(EMPTY_STRING)) { | ||
| tracingContextFlush.setIngressHandler("DFlush"); |
There was a problem hiding this comment.
Can we create constant for DFlush and use it whereever required?
| // Perform the upload within a performance tracking context. | ||
| try (AbfsPerfInfo perfInfo = new AbfsPerfInfo( | ||
| dfsClient.getAbfsPerfTracker(), | ||
| "writeCurrentBufferToService", "append")) { |
There was a problem hiding this comment.
can we create constant for append?
There was a problem hiding this comment.
already present, added it here
| } | ||
| try { | ||
| TracingContext tracingContextFlush = new TracingContext(tracingContext); | ||
| tracingContextFlush.setIngressHandler("FBFlush"); |
There was a problem hiding this comment.
Same as above, constant for FBFlush
| // Perform the upload within a performance tracking context. | ||
| try (AbfsPerfInfo perfInfo = new AbfsPerfInfo( | ||
| getClient().getAbfsPerfTracker(), | ||
| "writeCurrentBufferToService", "append")) { |
There was a problem hiding this comment.
Same as above, constant for append.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
anujmodi2021
requested changes
Jan 16, 2025
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java
Outdated
Show resolved
Hide resolved
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java
Outdated
Show resolved
Hide resolved
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java
Outdated
Show resolved
Hide resolved
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java
Outdated
Show resolved
Hide resolved
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java
Show resolved
Hide resolved
...ls/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/constants/AbfsHttpConstants.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/hadoop/fs/azurebfs/contracts/exceptions/InvalidIngressServiceException.java
Show resolved
Hide resolved
...hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemCreate.java
Outdated
Show resolved
Hide resolved
.../hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemLease.java
Outdated
Show resolved
Hide resolved
This comment was marked as outdated.
This comment was marked as outdated.
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
============================================================
|
anujmodi2021
approved these changes
Jan 24, 2025
|
💔 -1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
rakeshadr
reviewed
Jan 26, 2025
|
|
||
| import static org.apache.hadoop.fs.azurebfs.constants.FileSystemConfigurations.BLOCK_ID_LENGTH; | ||
|
|
||
| public class AbfsBlobBlock extends AbfsBlock { |
| @@ -145,6 +145,11 @@ public final class FileSystemConfigurations { | |||
| */ | |||
| public static final int BLOCK_UPLOAD_ACTIVE_BLOCKS_DEFAULT = 20; | |||
|
|
|||
| /** | |||
| * Length of the block ID used for appends. | |||
There was a problem hiding this comment.
Whats the reason for choosing the value 60, looks to me a magic number. Why not provided config option for this param?
There was a problem hiding this comment.
This value has been taken as in from how the backend team computes the blockId for the DFS appends.
| @@ -328,7 +337,7 @@ public AbfsRestOperation listPath(final String relativePath, final boolean recur | |||
| abfsUriQueryBuilder.addQuery(QUERY_PARAM_DELIMITER, FORWARD_SLASH); | |||
| } | |||
| abfsUriQueryBuilder.addQuery(QUERY_PARAM_MAX_RESULTS, String.valueOf(listMaxResults)); | |||
| appendSASTokenToQuery(relativePath, SASTokenProvider.LIST_OPERATION, abfsUriQueryBuilder); | |||
| appendSASTokenToQuery(relativePath, SASTokenProvider.FIXED_SAS_STORE_OPERATION, abfsUriQueryBuilder); | |||
There was a problem hiding this comment.
Why do we change "LIST_OPERATION" to "FIXED_SAS_STORE_OPERATION"
There was a problem hiding this comment.
"This is because the driver currently only supports fixed SAS for FNS Blob. This will be updated to the exact operation once user delegation SAS support is added."
| throw new InvalidConfigurationValueException(FS_DEFAULT_NAME_KEY, | ||
| "Blob Endpoint Support not yet available"); | ||
| } | ||
| // if (getFsConfiguredServiceType() == AbfsServiceType.BLOB) { |
There was a problem hiding this comment.
Please remove commented lines
| try { | ||
| return getSASTokenProvider() instanceof FixedSASTokenProvider; | ||
| } catch (AzureBlobFileSystemException e) { | ||
| return false; |
There was a problem hiding this comment.
Please add a debug log message with exception trace for better troubleshooting
| * @return whether we have some data to commit or not. | ||
| * @throws IOException if an I/O error occurs | ||
| */ | ||
| protected boolean hasListToCommit() throws IOException { |
There was a problem hiding this comment.
Should this method be synchronized ?and make it threadsafe ?
There was a problem hiding this comment.
The caller of this method is synchronized.
| throw new IOException(errorMessage); | ||
| } | ||
| } | ||
| committedBlockEntries.add(current.getBlockId()); |
There was a problem hiding this comment.
committedBlockEntries is growing and adding entries into this list. When do you clean this list. Otw, it would leads to OOME, right?
There was a problem hiding this comment.
With the current testing with all scale workloads, we have observed that this list never grows too big to lead to OOM errors but I will pick up the optimization for this in the next iteration of the PR.
| * @throws IOException if an I/O error occurs. | ||
| */ | ||
| @Override | ||
| protected synchronized AbfsRestOperation remoteFlush(final long offset, |
There was a problem hiding this comment.
Have we used the synchronized threadsafe philosophy accurately in this entire class. Could you please double check all the methods in this class.
| * | ||
| * @param eTag the eTag to set. | ||
| */ | ||
| synchronized void setETag(String eTag) { |
There was a problem hiding this comment.
Whats the reasoning for synchronized here?
There was a problem hiding this comment.
yes this can be removed as eTag is already volatile and setEtag is called inside synchronized method
| */ | ||
| @VisibleForTesting | ||
| @Override | ||
| public synchronized String getETag() { |
There was a problem hiding this comment.
same applicable here as well, please explain the reason for synchroinzed
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description of PR :
This Pr is in correlation to the series of work done under Parent Jira: [HADOOP-19179]
(https://issues.apache.org/jira/browse/HADOOP-19179)
Jira for this Patch: https://issues.apache.org/jira/browse/HADOOP-19232
Scope of this task is to refactor the AbfsOutputStream class to handle the ingress for DFS and Blob endpoint effectively.
Production code changes :
The
AbfsOutputStreamclass is crucial for handling the data being written to Azure Storage. Its primary responsibilities include:New Additions
The new additions introduce a more modular and flexible approach to managing data ingress (data being written to storage), catering to both Azure Data Lake Storage (ADLS) and Azure Blob Storage.
AzureIngressHandler
The
AzureIngressHandleris a new parent class designed to encapsulate common logic for data ingress operations. It simplifies the process of writing data to Azure Storage by providing a unified interface. This class has two specialized child classes:AzureDfsIngressHandler:
AzureBlobIngressHandler:
blockId.AbfsBlock and AbfsBlobBlock
Data is managed in discrete blocks to improve efficiency and manageability.
AbfsBlock:
AbfsBlobBlock:
AbfsBlocktailored for Blob Storage.blockIdfor each block, which is necessary for the Blob Storage API.Block Managers
To manage these data blocks, new manager classes have been introduced. These classes handle the lifecycle of blocks, including creation, appending, and flushing.
AzureBlockManager:
AzureDFSBlockManager:
AbfsBlockinstances for DFS.AzureBlobBlockManager:
AbfsBlobBlockinstances for Blob Storage.blockId.Integration with AbfsOutputStream
The
AbfsOutputStreamclass has been updated to incorporate the new ingress flow logic, enhancing its ability to handle data writes to both DFS and Blob Storage. Here’s how it integrates:Configuration Selection:
AbfsOutputStreamreads the configuration parameterfs.azure.ingress.service.typeto determine whether the user has configured the system to useBLOBorDFSfor data ingress.Handler Initialization:
AbfsOutputStreaminitializes the appropriate handler (AzureBlobIngressHandlerorAzureDfsIngressHandler).Buffering Data:
AbfsOutputStream, it is buffered into blocks (AbfsBlockfor DFS orAbfsBlobBlockfor Blob Storage).Managing Blocks:
AzureDFSBlockManagerorAzureBlobBlockManager) manages the lifecycle of these blocks, ensuring that data is correctly created, appended, and flushed.Block Id Management (Blob Specific):
AzureBlobBlockManagerensures that each block has a uniqueblockId, adhering to the requirements of the Blob Storage API.Detailed Flow
Creating Data Blocks:
AbfsOutputStream, it is divided into blocks (AbfsBlockfor DFS orAbfsBlobBlockfor Blob Storage).Appending Data:
AzureBlobIngressHandlerorAzureDfsIngressHandler).Flushing Data:
Lifecycle Management:
AzureDFSBlockManagerandAzureBlobBlockManager) oversee the lifecycle of blocks, handling retries, errors, and ensuring data integrity.Test Code Changes: