Skip to content

Conversation

pvillard31
Copy link
Contributor

Summary

NIFI-15012 - FlowDifferenceFilters - fix handling of createControllerService()

In NIFI-14995, we tried to properly handle the case where a property is added to hold a newly created controller service but the logic was not correct in terms of how migrateProperties is called and the sequence of objects creation.

We only looked up the new property through the live ComponentNode to confirm it identified a controller service. In the real migration sequence, the property is added to the versioned component before there’s a live node (the component is a freshly imported controller service), so getComponent(...) returned null, the property was ignored, and the context never saw the controller-service ID. Without that linkage, the corresponding COMPONENT_ADDED diff wasn’t marked as environmental, leaving both the property addition and the service creation visible as local changes.

We are improving the logic to properly handle this scenario.

  • Captures the versioned property descriptors and property values from diffs themselves (getPropertyValue, getVersionedPropertyDescriptor, isControllerServiceProperty), so we can recognize when a PROPERTY_ADDED points at a controller service even if the live component node is not present.
  • Tracks controller-service IDs referenced by those new properties (controllerServicePropertyAddsByValue) and matches them against the IDs reported in accompanying COMPONENT_ADDED diffs, using both instance and versioned identifiers.
  • Updates the environmental-change context to record just the pairings we can actually confirm (serviceIdsCreatedForNewProperties), and reuses that context in isControllerServiceCreatedForNewProperty.
  • Adds unit coverage for the no component node scenario to ensure we don’t regress.

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
    • JDK 25

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

Copy link
Contributor

@bbende bbende left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks @pvillard31

@bbende bbende merged commit 6033076 into apache:main Sep 25, 2025
11 checks passed
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.

2 participants