Fix ADLS Gen2 plugin to support Azure Blob Soft Delete by xiangfu0 · Pull Request #17806 · apache/pinot

xiangfu0 · 2026-03-03T18:57:01Z

The DFS (Data Lake) API endpoint does not support Azure Blob Soft Delete, causing 409 EndpointUnsupportedAccountFeatures errors when uploading segments to storage accounts with org-mandated Soft Delete policies.

This change adds a BlobContainerClient alongside the existing DataLakeFileSystemClient, using the Blob API (*.blob.core.windows.net) for file uploads which is fully compatible with Soft Delete. The DFS API is retained for read/metadata operations (list, exists, open, etc.) and as a write fallback when the BlobContainerClient is not initialized.

Copilot

Pull request overview

Adds Azure Blob API uploads to the ADLS Gen2 PinotFS implementation to support storage accounts with Blob Soft Delete enabled, while retaining DFS for reads/metadata and as a fallback.

Changes:

Introduces BlobContainerClient initialization (blob endpoint) alongside the existing DFS client.
Routes uploads through Blob API with DFS upload as a fallback when Blob client isn’t available.
Adds unit tests covering Blob upload success and Blob upload failure paths.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File	Description
pinot-plugins/pinot-file-system/pinot-adls/src/main/java/org/apache/pinot/plugin/filesystem/ADLSGen2PinotFS.java	Initializes Blob SDK client and uses it for uploads; retains DFS upload fallback.
pinot-plugins/pinot-file-system/pinot-adls/src/test/java/org/apache/pinot/plugin/filesystem/test/ADLSGen2PinotFSTest.java	Adds tests validating Blob upload path and exception wrapping.
pinot-plugins/pinot-file-system/pinot-adls/pom.xml	Adds `azure-storage-blob` dependency to support Blob API uploads.

Comments suppressed due to low confidence (1)

pinot-plugins/pinot-file-system/pinot-adls/src/main/java/org/apache/pinot/plugin/filesystem/ADLSGen2PinotFS.java:1

In the DEFAULT auth case, defaultAzureCredentialBuilder.build() is invoked twice, creating two separate credential instances. Build once into a local variable (e.g., TokenCredential credential = defaultAzureCredentialBuilder.build()) and pass the same instance to both builders to avoid duplicate initialization work and potential differences in internal caching behavior.

/**

codecov-commenter · 2026-03-03T19:42:19Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 63.03%. Comparing base (2e80bff) to head (56f124c).

Additional details and impacted files

@@             Coverage Diff              @@
##             master   #17806      +/-   ##
============================================
- Coverage     63.04%   63.03%   -0.02%     
  Complexity     1617     1617              
============================================
  Files          3202     3202              
  Lines        194718   194718              
  Branches      30047    30047              
============================================
- Hits         122760   122740      -20     
- Misses        62233    62246      +13     
- Partials       9725     9732       +7

Flag	Coverage Δ
custom-integration1	`100.00% <ø> (ø)`
integration	`100.00% <ø> (ø)`
integration1	`100.00% <ø> (ø)`
integration2	`0.00% <ø> (ø)`
java-11	`62.99% <ø> (-0.02%)`	⬇️
java-21	`63.00% <ø> (-0.02%)`	⬇️
temurin	`63.03% <ø> (-0.02%)`	⬇️
unittests	`63.03% <ø> (-0.02%)`	⬇️
unittests1	`55.54% <ø> (-0.03%)`	⬇️
unittests2	`33.44% <ø> (+<0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

Copilot · 2026-03-08T04:56:07Z

+  private boolean copyInputStreamToDst(InputStream inputStream, URI dstUri, byte[] contentMd5, long contentLength)
+      throws IOException {
+    String path = AzurePinotFSUtil.convertUriToAzureStylePath(dstUri);
+
+    if (_blobContainerClient != null) {
+      return copyInputStreamToDstViaBlob(inputStream, dstUri, path, contentMd5);
+    }
+    return copyInputStreamToDstViaDfs(inputStream, dstUri, path, contentMd5);
+  }


contentLength is passed into copyInputStreamToDst(...) but never used. Either remove it to avoid dead parameters, or use it to select/parameterize the Blob upload call (e.g., provide the known length to the SDK upload options).

Copilot · 2026-03-08T04:56:08Z

+    int bytesRead;
+    int blockIdCounter = 0;
+    byte[] buffer = new byte[BUFFER_SIZE];
+    List<String> blockIds = new ArrayList<>();
+
+    try {
+      MessageDigest md5Block = MessageDigest.getInstance("MD5");
+      while ((bytesRead = inputStream.read(buffer)) != -1) {
+        md5Block.reset();
+        md5Block.update(buffer, 0, bytesRead);
+        byte[] md5BlockHash = md5Block.digest();
+
+        String blockId = Base64.getEncoder()
+            .encodeToString(String.format("%08d", blockIdCounter).getBytes(StandardCharsets.UTF_8));
+        blockIdCounter++;
+        blockIds.add(blockId);
+
+        try (ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(buffer, 0, bytesRead)) {
+          blockBlobClient.stageBlockWithResponse(blockId, byteArrayInputStream, bytesRead, md5BlockHash, null, null,
+              Context.NONE);
+        }
+      }
+      if (blobHttpHeaders != null) {
+        blockBlobClient.commitBlockListWithResponse(blockIds, blobHttpHeaders, null, null, null, null, Context.NONE);
+      } else {
+        blockBlobClient.commitBlockList(blockIds);
+      }


uploadWithBlockLevelChecksum(...) reuses the DFS buffer size (4MB) for Blob block staging. For Block Blobs, small blocks can dramatically increase block count and risk hitting Azure's max-blocks-per-blob limit (which effectively caps max upload size at ~4MB * maxBlocks). Consider using a larger block size (or making it configurable) when staging blocks via the Blob API.

The DFS (Data Lake) API endpoint does not support Azure Blob Soft Delete, causing 409 EndpointUnsupportedAccountFeatures errors when uploading segments to storage accounts with org-mandated Soft Delete policies. This change adds a BlobContainerClient alongside the existing DataLakeFileSystemClient, using the Blob API (*.blob.core.windows.net) for file uploads which is fully compatible with Soft Delete. The DFS API is retained for read/metadata operations (list, exists, open, etc.) and as a write fallback when the BlobContainerClient is not initialized. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Use BlobParallelUploadOptions with uploadWithResponse to ensure consistent overwrite behavior across all non-checksum upload paths. Remove unused contentLength parameter from copyInputStreamToDstViaBlob. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

xiangfu0 requested a review from Copilot March 3, 2026 18:57

Copilot AI reviewed Mar 3, 2026

View reviewed changes

Comment thread ...file-system/pinot-adls/src/main/java/org/apache/pinot/plugin/filesystem/ADLSGen2PinotFS.java

Comment thread ...file-system/pinot-adls/src/main/java/org/apache/pinot/plugin/filesystem/ADLSGen2PinotFS.java Outdated

xiangfu0 force-pushed the fix/adls-blob-soft-delete-support branch 3 times, most recently from cfd6e35 to 69add46 Compare March 4, 2026 21:25

xiangfu0 requested a review from Copilot March 5, 2026 05:58

xiangfu0 added plugins Related to the plugin system pinot-filesystem Related to PinotFS abstraction (S3, GCS, ADLS, HDFS) AZURE Related to Azure-specific features or deployment labels Mar 5, 2026

Copilot started reviewing on behalf of xiangfu0 March 5, 2026 05:59 View session

Copilot AI reviewed Mar 5, 2026

View reviewed changes

xiangfu0 requested a review from Copilot March 5, 2026 06:04

Copilot started reviewing on behalf of xiangfu0 March 5, 2026 06:04 View session

Copilot AI reviewed Mar 5, 2026

View reviewed changes

Comment thread ...file-system/pinot-adls/src/main/java/org/apache/pinot/plugin/filesystem/ADLSGen2PinotFS.java

xiangfu0 force-pushed the fix/adls-blob-soft-delete-support branch from 69add46 to 1e6b02d Compare March 5, 2026 21:59

xiangfu0 requested a review from Copilot March 5, 2026 23:39

Copilot started reviewing on behalf of xiangfu0 March 5, 2026 23:40 View session

Copilot AI reviewed Mar 5, 2026

View reviewed changes

xiangfu0 force-pushed the fix/adls-blob-soft-delete-support branch from 1e6b02d to e85be0b Compare March 6, 2026 02:29

xiangfu0 requested a review from Copilot March 6, 2026 08:49

Copilot started reviewing on behalf of xiangfu0 March 6, 2026 08:50 View session

Copilot AI reviewed Mar 6, 2026

View reviewed changes

xiangfu0 requested a review from Copilot March 6, 2026 19:05

Copilot started reviewing on behalf of xiangfu0 March 6, 2026 19:06 View session

Copilot AI reviewed Mar 6, 2026

View reviewed changes

Comment thread ...file-system/pinot-adls/src/main/java/org/apache/pinot/plugin/filesystem/ADLSGen2PinotFS.java Outdated

Comment thread ...em/pinot-adls/src/test/java/org/apache/pinot/plugin/filesystem/test/ADLSGen2PinotFSTest.java

xiangfu0 commented Mar 6, 2026

View reviewed changes

Comment thread ...file-system/pinot-adls/src/main/java/org/apache/pinot/plugin/filesystem/ADLSGen2PinotFS.java

xiangfu0 force-pushed the fix/adls-blob-soft-delete-support branch 2 times, most recently from 0e06b62 to f56c65e Compare March 8, 2026 03:39

xiangfu0 requested a review from Copilot March 8, 2026 04:51

Copilot started reviewing on behalf of xiangfu0 March 8, 2026 04:51 View session

Copilot AI reviewed Mar 8, 2026

View reviewed changes

xiangfu0 added rest-api Related to REST API endpoints bug Something is not working as expected labels Mar 20, 2026

xiangfu0 mentioned this pull request Apr 3, 2026

Support Azure blob store as Deep Store #8731

Closed

xiangfu0 and others added 2 commits April 8, 2026 21:54

xiangfu0 force-pushed the fix/adls-blob-soft-delete-support branch from f56c65e to 56f124c Compare April 9, 2026 04:54

Conversation

xiangfu0 commented Mar 3, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

codecov-commenter commented Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Mar 8, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 8, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov-commenter commented Mar 3, 2026 •

edited

Loading