NIFI-14472: Fix potential NPE in PutKinesisFirehose batch accumulation#11211
Open
rakesh-rsky wants to merge 3 commits into
Open
NIFI-14472: Fix potential NPE in PutKinesisFirehose batch accumulation#11211rakesh-rsky wants to merge 3 commits into
rakesh-rsky wants to merge 3 commits into
Conversation
…eam name evaluates to null The onTrigger() method used a two-step pattern to populate the recordHash map: 1. recordHash.computeIfAbsent(firehoseStreamName, k -> new ArrayList<>()) 2. recordHash.get(firehoseStreamName).add(record) // ← NPE here When the KINESIS_FIREHOSE_DELIVERY_STREAM_NAME expression evaluates to null (e.g., the referenced FlowFile attribute is absent), computeIfAbsent(null, ...) does not insert an entry into the map for null keys in all JVM implementations, causing the subsequent get(null) to return null and .add() to throw: NullPointerException: Cannot invoke List.add() because Map.get() returns null - Collapsed the two-step lookup into a single atomic computeIfAbsent().add() call, eliminating the null-return window between the two statements - The fix applies to the recordHash population step; hashFlowFiles already used computeIfAbsent correctly in a single step on the following line Co-authored-by: Rakesh Kumar Singh <rsky.rakesh@gmail.com>
rakesh-rsky
force-pushed
the
fix/NIFI-14472-kinesis-firehose-npe
branch
from
36af390 to
67c2d4c
Compare
…n macOS The test class was missing an @AfterEach to shut down the provider after each test. Tests that called provider.initialize() but not provider.shutdown() left the Kubernetes client's Netty event loop open. On macOS with Zulu JDK 21, the GC collected the event loop before KubernetesMockServerExtension.afterEach() ran, causing MockWebServer.await() to throw RejectedExecutionException: 'event executor terminated' Fix: add @AfterEach shutdownProvider() to guarantee the Kubernetes client is closed before the mock server extension tears down, ensuring deterministic cleanup across all platforms and JVM implementations. Co-authored-by: Rakesh Kumar Singh <rsky.rakesh@gmail.com>
6 tasks
…pStateProvider.shutdown() shutdown() was calling kubernetesClient.close() unconditionally. If the provider was never initialized (e.g. in unit tests that only call getSupportedScopes()), kubernetesClient is null and a NullPointerException is thrown from the @AfterEach teardown. Also null-guard the logger reference for the same reason.
Contributor
|
@rakesh-rsky It looks like the last update to this branch brought in a commit instead of rebasing, can you rebase your branch against |
exceptionfactory
requested changes
May 16, 2026
Contributor
exceptionfactory
left a comment
exceptionfactory
left a comment
There was a problem hiding this comment.
Thanks for addressing this problem @rakesh-rsky. The core functional change appears to be correct, but the comments are unnecessary and the implementation line should be broken out into several lines for readability. If you can make that change, remove the extra commit, and rebase against the current main branch, this should be good to go.
Comment on lines
+137
to
+143
| // Use a single computeIfAbsent().add() call so the list lookup is atomic. | ||
| // The previous two-step pattern (computeIfAbsent then a separate get()) could | ||
| // throw NullPointerException when firehoseStreamName evaluates to null via | ||
| // expression language, because get(null) returned null after the absent-key | ||
| // entry was never actually inserted. (NIFI-14472) | ||
| session.read(flowFile, in -> recordHash.computeIfAbsent(firehoseStreamName, k -> new ArrayList<>()) | ||
| .add(Record.builder().data(SdkBytes.fromInputStream(in)).build())); |
Contributor
There was a problem hiding this comment.
Commenting on the previous behavior is unnecessary and should be removed. In addition, it would be helpful to separate the callback implementation across multiple lines for readability.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
Fixes a race condition / NPE in PutKinesisFirehose.onTrigger() where a two-step computeIfAbsent() + get() on the batch-accumulation map could return
ull if the entry was evicted between the two calls.
Changes
Testing
Fixes: https://issues.apache.org/jira/browse/NIFI-14472