NIFI-16071 - Enable newly added controller services on versioned flow upgrade - #11390
Merged
Conversation
exceptionfactory
approved these changes
Jul 3, 2026
exceptionfactory
left a comment
Contributor
There was a problem hiding this comment.
Thanks for finding and resolving this issue @pvillard31, the adjusted approach for enabling added Controller Services looks good. +1 merging
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
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
NIFI-16071 - Enable newly added controller services on versioned flow upgrade
NIFI-15749 made a versioned flow upgrade start/enable components that are newly added in the new version when the process group is active (mirroring the state of the components that were already running). It only worked for newly added processors. A newly added controller service that is referenced solely by an existing processor (via a new property) was left DISABLED after the upgrade, so the referencing processor became invalid and could not run. Controller services are always persisted in a versioned flow as DISABLED (
VersionedComponentStateLookup.ENABLED_OR_DISABLED), so the synchronizer's "enable if proposed state is ENABLED" step never selected them, andRetainExistingStateComponentScheduler's "new service + active group -> enable" logic was never handed these services.What changed:
ComponentScheduler.enableAddedControllerServicesAsync(...)with a default no-op implementation.StandardVersionedComponentSynchronizernow routes the services that were newly added during synchronization through this method.RetainExistingStateComponentScheduleroverrides it to enable those services when the process group is active, consistent with how newly added processors are handled.Because the new method defaults to a no-op, startup, cluster reconnect, and restore paths are unchanged; only the versioned-flow upgrade path enables newly added controller services.
Added a system test reproducing the scenario (new controller service referenced only by an existing processor across a version change) and unit tests for the scheduler.
Tracking
Please complete the following tracking steps prior to pull request creation.
Issue Tracking
Pull Request Tracking
NIFI-00000NIFI-00000VerifiedstatusPull Request Formatting
mainbranchVerification
Please indicate the verification steps performed prior to pull request creation.
Build
./mvnw clean install -P contrib-checkLicensing
LICENSEandNOTICEfilesDocumentation