fix: Enhance hudi-azure-bundle by linliu-code · Pull Request #18472 · apache/hudi

linliu-code · 2026-04-06T17:14:12Z

Describe the issue this Pull Request addresses

When running Hudi Spark jobs on Azure (ADLS Gen2), the Azure Storage SDK's Netty and Reactor dependencies conflict with Spark's bundled Netty, causing runtime NoSuchMethodError and StacklessClosedChannelException during lock acquisition. Specifically, reactor-netty-http calls HttpClientCodec.<init>(HttpDecoderConfig, boolean, boolean) — a constructor that only exists in Netty 4.1.94+ — but Spark's older Netty HttpClientCodec is loaded instead. This makes the Azure-based StorageBasedLockProvider (added in #17951) unusable in Spark environments.

Additionally, hudi-azure-bundle as it stands on master does not include reactor-netty, the Azure identity transitive deps, or Netty/Reactor relocations, so users still have to manage those jars manually on the Spark classpath.

Summary and Changelog

This PR is purely additive on top of master's existing hudi-azure-bundle skeleton. All changes are in packaging/hudi-azure-bundle/pom.xml:

Includes added to the shaded jar:
- com.nimbusds:* and net.minidev:* — Azure identity transitive deps required for DefaultAzureCredential and related auth providers.
- io.projectreactor.netty:* — the actual reactor-netty HTTP client used by the Azure SDK.
- org.reactivestreams:reactive-streams — required by Reactor.
Shading relocations added to isolate Netty/Reactor from Spark's classpath:
- io.netty.* → org.apache.hudi.io.netty.*
- io.projectreactor.* → org.apache.hudi.io.projectreactor.*
- reactor.* → org.apache.hudi.reactor.*
- org.reactivestreams.* → org.apache.hudi.org.reactivestreams.*
Avro compile dependency added so the bundle resolves Avro classes referenced by Hudi APIs without relying on the host classpath.
Minor: two whitespace fixes in the license header.

Note: this PR was rebased onto current master. The original AzureStorageLockClient commits were dropped because master already has an implementation of that class via #17951; this PR now contains only the bundle module additions.

Impact

Enables Hudi's StorageBasedLockProvider to work reliably on Azure/ADLS Gen2 in Spark environments.
Eliminates the need to manually place reactor-netty, reactor-core, reactive-streams, and netty-resolver-dns jars on the Spark classpath — everything is self-contained and relocated in the bundle.
No impact on existing AWS or GCP bundles — reactor-netty is only included in the Azure bundle.

Risk Level

Low

This PR only modifies packaging/hudi-azure-bundle/pom.xml; no source changes.
Shading Netty with relocation is a well-established pattern (used by HBase, gRPC, Snowflake, and DataHub in this same codebase).
One area to monitor: Netty native transports (epoll/kqueue) reference class names via JNI — however, Azure SDK's HTTP client uses reactor-netty over NIO, so relocated Netty classes function correctly.

Documentation Update

none

Contributor's checklist

Read through contributor's guide
Enough context is provided in the sections above
Adequate tests were added if applicable

yihua

🤖 This review was generated by an AI agent and may contain mistakes. Please verify any suggestions before applying.

Style & Readability Review — One code reuse issue: URI parsing and container validation logic is duplicated between readObject() and writeObject() methods.

yihua · 2026-04-06T17:28:37Z

+      } else {
+        logger.error("Error reading JSON config file: {}", filePath, e);
+      }
+      return Option.empty();


🤖 nit: this URI parsing and container validation (lines 288–297) is duplicated from readObject(). Could you extract into a private helper method?

yihua

🤖 This review was generated by an AI agent and may contain mistakes. Please verify any suggestions before applying.

Thanks for contributing! The overall structure of AzureStorageLockClient is clean and follows the S3/GCS pattern well. There's one functional bug worth addressing in the ETag handling before merging: the quote-stripping in readCurrentLockFile creates an inconsistency with the ETag format expected by BlobRequestConditions.setIfMatch(), which will break the "take over expired lock" scenario. Details in the inline comment.

yihua · 2026-04-06T17:38:17Z

+      String eTag = response.getHeaders().getValue("ETag");
+      if (eTag != null) {
+        // Azure returns ETags wrapped in quotes, remove them
+        eTag = eTag.replaceAll("^\"|\"$", "");


🤖 This quote-stripping creates an ETag format inconsistency that breaks conditional writes for the expired-lock takeover path. BlockBlobItem.getETag() (used in createOrUpdateLockFileInternal) returns the ETag WITH surrounding double-quotes (e.g. "0x8D4A"), which is exactly what BlobRequestConditions.setIfMatch() expects — it passes the value directly to the If-Match header, so the quotes must be present for a valid HTTP conditional request. By stripping them here, any setIfMatch call using an ETag sourced from readCurrentLockFile sends If-Match: 0x8D4A (unquoted), while a call using an ETag from a write sends If-Match: "0x8D4A" (correctly quoted). Removing the replaceAll and keeping the raw header value would align both paths and avoid this failure mode.

hudi-agent

🤖 This review was generated by an AI agent and may contain mistakes. Please verify any suggestions before applying.

Thanks for the contribution! This PR turns hudi-azure-bundle into a proper shaded fat jar with Netty/Reactor relocation, mirroring the AWS and GCP bundles. One question on a build-config divergence from the sibling bundles worth a second look. Please take a look at the inline comment, and this should be ready for a Hudi committer or PMC member to take it from here. A couple of spots where a short explanatory comment would save future readers some head-scratching.

hudi-agent · 2026-05-16T00:25:08Z

      <resource>
        <directory>src/main/resources</directory>
      </resource>
+      <resource>


🤖 Is there a reason to add src/test/resources to the main <resources> block? Maven's standard layout already exposes it for the test phase, and adding it here will package any test resources into the production shaded jar. The sibling hudi-aws-bundle and hudi-gcp-bundle only declare src/main/resources. Could you drop this entry unless something specifically requires it?

_{- AI-generated; verify before applying. React 👍/👎 to flag quality.}

hudi-agent · 2026-05-16T00:25:08Z

        <directory>src/main/resources</directory>
      </resource>
+      <resource>
+        <directory>src/test/resources</directory>


🤖 nit: including src/test/resources in the main build resources is unusual — could you add a comment explaining why it's needed here (e.g. which runtime config files live there that the bundle requires)?

_{- AI-generated; verify before applying. React 👍/👎 to flag quality.}

Good catch. This should be removed.

Co-authored-by: Y Ethan Guo <ethan.guoyihua@gmail.com>

hudi-bot · 2026-05-19T20:51:22Z

CI report:

e2d8a0a Azure: SUCCESS
d889e4a UNKNOWN

Bot commands

@hudi-bot supports the following commands:

@hudi-bot run azure re-run the last Azure build

yihua · 2026-05-19T20:51:50Z

        <directory>src/main/resources</directory>
      </resource>
+      <resource>
+        <directory>src/test/resources</directory>


Good catch. This should be removed.

yihua

LGTM

codecov-commenter · 2026-05-19T22:42:56Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 68.20%. Comparing base (4035f70) to head (bdc66e5).
⚠️ Report is 15 commits behind head on master.

Additional details and impacted files

@@             Coverage Diff              @@
##             master   #18472      +/-   ##
============================================
+ Coverage     68.14%   68.20%   +0.05%     
- Complexity    29105    29241     +136     
============================================
  Files          2518     2525       +7     
  Lines        141221   141667     +446     
  Branches      17534    17588      +54     
============================================
+ Hits          96237    96625     +388     
- Misses        37068    37088      +20     
- Partials       7916     7954      +38

Flag	Coverage Δ
common-and-other-modules	`44.34% <ø> (-0.07%)`	⬇️
hadoop-mr-java-client	`44.98% <ø> (-0.03%)`	⬇️
spark-client-hadoop-common	`48.29% <ø> (-0.03%)`	⬇️
spark-java-tests	`48.84% <ø> (-0.15%)`	⬇️
spark-scala-tests	`44.94% <ø> (+0.04%)`	⬆️
utilities	`37.46% <ø> (-0.15%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.
see 36 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

linliu-code changed the title ~~feat: Add azure bundle~~ feat: Add hudi-azure-bundle Apr 6, 2026

linliu-code marked this pull request as ready for review April 6, 2026 17:21

github-actions Bot added the size:L PR with lines of changes in (300, 1000] label Apr 6, 2026

yihua reviewed Apr 6, 2026

View reviewed changes

linliu-code added 2 commits May 15, 2026 16:09

Add hudi-azure-bundle

513b26b

Add io.netty related dependency

e2d8a0a

linliu-code force-pushed the add_azure_bundle branch from 260619a to e2d8a0a Compare May 15, 2026 23:13

github-actions Bot added size:S PR with lines of changes in (10, 100] and removed size:L PR with lines of changes in (300, 1000] labels May 15, 2026

hudi-agent reviewed May 16, 2026

View reviewed changes

yihua changed the title ~~feat: Add hudi-azure-bundle~~ fix: Enhance hudi-azure-bundle May 19, 2026

yihua mentioned this pull request May 19, 2026

fix: Update hudi-azure-bundle dependencies #18487

Closed

3 tasks

yihua reviewed May 19, 2026

View reviewed changes

Comment thread packaging/hudi-azure-bundle/pom.xml Outdated

Comment thread packaging/hudi-azure-bundle/pom.xml Outdated

Apply suggestions from code review

d889e4a

Co-authored-by: Y Ethan Guo <ethan.guoyihua@gmail.com>

yihua reviewed May 19, 2026

View reviewed changes

Update packaging/hudi-azure-bundle/pom.xml

bdc66e5

yihua approved these changes May 19, 2026

View reviewed changes

yihua merged commit f67dc26 into apache:master May 19, 2026
62 of 64 checks passed

yihua pushed a commit that referenced this pull request May 20, 2026

fix: Enhance hudi-azure-bundle (#18472)

a17949b

dwshmilyss pushed a commit to dwshmilyss/hudi that referenced this pull request May 21, 2026

fix: Enhance hudi-azure-bundle (apache#18472)

4022dc1

Conversation

linliu-code commented Apr 6, 2026 • edited by yihua Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Describe the issue this Pull Request addresses

Summary and Changelog

Impact

Risk Level

Documentation Update

Contributor's checklist

Uh oh!

yihua left a comment

Choose a reason for hiding this comment

Uh oh!

yihua Apr 6, 2026

Choose a reason for hiding this comment

Uh oh!

yihua left a comment

Choose a reason for hiding this comment

Uh oh!

yihua Apr 6, 2026

Choose a reason for hiding this comment

Uh oh!

hudi-agent left a comment

Choose a reason for hiding this comment

Uh oh!

hudi-agent May 16, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

hudi-agent May 16, 2026

Choose a reason for hiding this comment

Uh oh!

yihua May 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

hudi-bot commented May 19, 2026

CI report:

Uh oh!

yihua May 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

yihua left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

codecov-commenter commented May 19, 2026

Codecov Report

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

linliu-code commented Apr 6, 2026 •

edited by yihua

Loading