Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-03-04 00:19:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-11473 Flow version change in NiFi should not stop a component when only position is changed

Browse Source 
Signed-off-by: Matthew Burgess <mattyb149@apache.org>

This closes #7185
This commit is contained in:
Timea Barna 2023-04-20 13:40:25 +02:00 committed by Matthew Burgess
parent afdbed5749
commit d54940c397
No known key found for this signature in database
GPG Key ID: 05D3DEB8126DAD24
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
View File

@ -217,6 +217,10 @@ public class StandardVersionedComponentSynchronizer implements VersionedComponen
} }
} }
if (diff.getDifferenceType() == DifferenceType.POSITION_CHANGED) {
continue;
}
final VersionedComponent component = diff.getComponentA() == null ? diff.getComponentB() : diff.getComponentA(); final VersionedComponent component = diff.getComponentA() == null ? diff.getComponentB() : diff.getComponentA();
updatedVersionedComponentIds.add(component.getIdentifier()); updatedVersionedComponentIds.add(component.getIdentifier());

1
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
View File

@ -5505,6 +5505,7 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
.filter(diff -> !FlowDifferenceFilters.isScheduledStateNew(diff)) .filter(diff -> !FlowDifferenceFilters.isScheduledStateNew(diff))
.filter(diff -> !FlowDifferenceFilters.isLocalScheduleStateChange(diff)) .filter(diff -> !FlowDifferenceFilters.isLocalScheduleStateChange(diff))
.filter(diff -> !FlowDifferenceFilters.isPropertyMissingFromGhostComponent(diff, flowManager)) .filter(diff -> !FlowDifferenceFilters.isPropertyMissingFromGhostComponent(diff, flowManager))
.filter(difference -> difference.getDifferenceType() != DifferenceType.POSITION_CHANGED)
.map(difference -> { .map(difference -> {
final VersionedComponent localComponent = difference.getComponentA(); final VersionedComponent localComponent = difference.getComponentA();