Skip to content

NIFI-14944 - Fix flow upgrade when CS reference goes from external to scoped controller service#10286

Open
pvillard31 wants to merge 1 commit intoapache:mainfrom
pvillard31:NIFI-14944
Open

NIFI-14944 - Fix flow upgrade when CS reference goes from external to scoped controller service#10286
pvillard31 wants to merge 1 commit intoapache:mainfrom
pvillard31:NIFI-14944

Conversation

@pvillard31
Copy link
Contributor

Summary

NIFI-14944 - Fix flow upgrade when CS reference goes from external to scoped controller service

Current situation:

  • Considering a versioned flow PG1 containing GenerateFlowFile -> ConvertRecord -> UpdateAttribute.
  • Where, in v1, ConvertRecord references a JSON Reader and JSON Writer defined at root level (external controller services in the versioned flow definition).
  • Where, in v2, ConvertRecord references newly created JSON Reader and JSON Writer defined at PG1 level.

Then, when upgrading from v1 to v2, ConvertRecord would still reference the external controller services, which is not expected.

This PR fixes the logic to identify the controller service that should be referenced. A unit test has been added to reproduce the above scenario with versioned flow definitions. I also added another unit test to show that if the processor ConvertRecord is in a nested PG2 process group, then we would still update the referenced controller services to the ones defined in PG1. We basically do a lookup starting in the current process group and then go up to the parent, and so on.

Tracking

Please complete the following tracking steps prior to pull request creation.

Issue Tracking

Pull Request Tracking

  • Pull Request title starts with Apache NiFi Jira issue number, such as NIFI-00000
  • Pull Request commit message starts with Apache NiFi Jira issue number, as such NIFI-00000

Pull Request Formatting

  • Pull Request based on current revision of the main branch
  • Pull Request refers to a feature branch with one commit containing changes

Verification

Please indicate the verification steps performed prior to pull request creation.

Build

  • Build completed using ./mvnw clean install -P contrib-check
    • JDK 21

Licensing

  • New dependencies are compatible with the Apache License 2.0 according to the License Policy
  • New dependencies are documented in applicable LICENSE and NOTICE files

Documentation

  • Documentation formatting appears as expected in rendered files

@github-actions
Copy link

github-actions bot commented Jan 8, 2026

Automated review is marking this PR as stale due to lack of updates in the past four months. This PR will be closed in 15 days if the stale label is not removed. This stale label and automated closure does not indicate a judgement of the PR, just lack of reviewer bandwidth and helps us keep the PR queue more manageable. If you would like this PR re-opened you can do so and a committer can remove the stale label. Or you can open a new PR. Try to help review other PRs to increase PR review bandwidth which in turn helps yours.

@github-actions github-actions bot added the Stale label Jan 8, 2026
@pvillard31 pvillard31 removed the Stale label Jan 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant