You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by GitBox <gi...@apache.org> on 2022/08/18 18:20:00 UTC
[GitHub] [nifi] markap14 opened a new pull request, #6314: NIFI-10371: When a component is moved between groups, ensure that its…
markap14 opened a new pull request, #6314:
URL: https://github.com/apache/nifi/pull/6314
… versioned component id is unique within the destination group. Also ensure that when adding a connection to a PG with the VersionedComponentSynchronizer that we prefer obtaining source/destination by instance id instead of versioned id.
<!-- Licensed to the Apache Software Foundation (ASF) under one or more -->
<!-- contributor license agreements. See the NOTICE file distributed with -->
<!-- this work for additional information regarding copyright ownership. -->
<!-- The ASF licenses this file to You under the Apache License, Version 2.0 -->
<!-- (the "License"); you may not use this file except in compliance with -->
<!-- the License. You may obtain a copy of the License at -->
<!-- http://www.apache.org/licenses/LICENSE-2.0 -->
<!-- Unless required by applicable law or agreed to in writing, software -->
<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -->
<!-- See the License for the specific language governing permissions and -->
<!-- limitations under the License. -->
# Summary
[NIFI-00000](https://issues.apache.org/jira/browse/NIFI-00000)
# Tracking
Please complete the following tracking steps prior to pull request creation.
### Issue Tracking
- [ ] [Apache NiFi Jira](https://issues.apache.org/jira/browse/NIFI) issue created
### 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 `mvn clean install -P contrib-check`
- [ ] JDK 8
- [ ] JDK 11
- [ ] JDK 17
### Licensing
- [ ] New dependencies are compatible with the [Apache License 2.0](https://apache.org/licenses/LICENSE-2.0) according to the [License Policy](https://www.apache.org/legal/resolved.html)
- [ ] New dependencies are documented in applicable `LICENSE` and `NOTICE` files
### Documentation
- [ ] Documentation formatting appears as expected in rendered files
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] exceptionfactory commented on a diff in pull request #6314: NIFI-10371: When a component is moved between groups, ensure that its…
Posted by GitBox <gi...@apache.org>.
exceptionfactory commented on code in PR #6314:
URL: https://github.com/apache/nifi/pull/6314#discussion_r950407648
##########
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java:
##########
@@ -971,6 +978,50 @@ public void addProcessor(final ProcessorNode processor) {
}
}
+ /**
+ * A component's Versioned Component ID is used to link a component on the canvas to a component in a versioned flow.
+ * There may, however, be multiple instances of the same versioned flow in a single NiFi instance. In this case, we will have
+ * multiple components with the same Versioned Component ID. This is acceptable as long as no two components within the same Process Group
+ * have the same Versioned Component ID. However, it is not acceptable to have two components within the same Process Group that have the same
+ * Versioned Component ID. If this happens, we will have no way to know which component in our flow maps to which component in the versioned flow.
+ * We don't have an issue with this when a flow is imported, etc. because it is always imported to a new Process Group. However, because it's possible
+ * to move most components between groups, we can have a situation in which a component is moved to a higher group, and that can result in a conflict.
+ * In such a case, we handle this by nulling out the Versioned Component ID if there is a conflict. This essentially makes NiFi behave as if a component
+ * is copied & pasted instead of being moved whenever a conflict occurs.
+ *
+ * @param component the component whose Versioned Component ID should be nulled if there's a conflict
+ * @param componentsToCheck the components to check to determine if there's a conflict
+ */
+ private void ensureUniqueVersionControlId(final org.apache.nifi.components.VersionedComponent component,
+ final Collection<? extends org.apache.nifi.components.VersionedComponent> componentsToCheck) {
+ final Optional<String> optionalVersionControlId = component.getVersionedComponentId();
+ if (!optionalVersionControlId.isPresent()) {
+ return;
+ }
+
+ final String versionControlId = optionalVersionControlId.get();
+ final boolean duplicateId = containsVersionedComponentId(componentsToCheck, versionControlId);
+
+ if (duplicateId) {
+ LOG.debug("Adding {} to {}, found conflicting Version Component ID {} so marking Version Component ID of {} as null", component, this, versionControlId, component);
+ setVersionedComponentId(null);
Review Comment:
This line sets the `versionedComponentId` of the ProcessGroup to `null`, as opposed to setting the `versionedComponentId` of the `VersionedComponent` to `null`, which causes the new test in `StandardProcessGroupIT` to fail.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] exceptionfactory closed pull request #6314: NIFI-10371: When a component is moved between groups, ensure that its…
Posted by GitBox <gi...@apache.org>.
exceptionfactory closed pull request #6314: NIFI-10371: When a component is moved between groups, ensure that its…
URL: https://github.com/apache/nifi/pull/6314
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] joewitt commented on pull request #6314: NIFI-10371: When a component is moved between groups, ensure that its…
Posted by GitBox <gi...@apache.org>.
joewitt commented on PR #6314:
URL: https://github.com/apache/nifi/pull/6314#issuecomment-1219867606
full clean build with contrib check and full suite of system test integration tests pass on local machine. Assuming all checks pass i plan to merge it. Code changes make sense as doc'd and the test seems to cover the affected case.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org