You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2021/07/30 07:13:34 UTC
[nifi] branch main updated: NIFI-8953: When Process Group's default
flowfile expiration / backpressure threshold change,
note that as a flow difference
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new a466e71 NIFI-8953: When Process Group's default flowfile expiration / backpressure threshold change, note that as a flow difference
a466e71 is described below
commit a466e714a0b4ad1c6acd088faf131610097ac9a1
Author: Mark Payne <ma...@hotmail.com>
AuthorDate: Wed Jul 28 11:47:02 2021 -0400
NIFI-8953: When Process Group's default flowfile expiration / backpressure threshold change, note that as a flow difference
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #5258.
---
.../apache/nifi/registry/flow/diff/DifferenceType.java | 18 +++++++++++++++++-
.../registry/flow/diff/StandardFlowComparator.java | 4 ++++
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java b/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java
index b4f29f7..3546dc8 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java
@@ -268,7 +268,23 @@ public enum DifferenceType {
/**
* The Process Group's configured FlowFile Outbound Policy is different in each of the flows
*/
- FLOWFILE_OUTBOUND_POLICY_CHANGED("FlowFile Outbound Policy Changed");
+ FLOWFILE_OUTBOUND_POLICY_CHANGED("FlowFile Outbound Policy Changed"),
+
+ /**
+ * The Process Group's Default value for connections' Backpressure Data Size Threshold is different in each of the flows
+ */
+ DEFAULT_BACKPRESSURE_DATA_SIZE_CHANGED("Default Back Pressure Data Size Changed"),
+
+ /**
+ * The Process Group's Default value for connections' Backpressure Object Threshold is different in each of the flows
+ */
+ DEFAULT_BACKPRESSURE_OBJECT_COUNT_CHANGED("Default Back Pressure Object Count Changed"),
+
+ /**
+ * The Process Group's Default value for connections' FlowFile Expiration is different in each of the flows
+ */
+ DEFAULT_FLOWFILE_EXPIRATION_CHANGED("Default FlowFile Expiration Changed")
+ ;
private final String description;
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java b/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java
index 6a0baad..8ecfeea 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java
@@ -338,6 +338,10 @@ public class StandardFlowComparator implements FlowComparator {
addIfDifferent(differences, DifferenceType.FLOWFILE_OUTBOUND_POLICY_CHANGED, groupA, groupB, VersionedProcessGroup::getFlowFileOutboundPolicy,
true, DEFAULT_OUTBOUND_FLOW_FILE_POLICY);
+ addIfDifferent(differences, DifferenceType.DEFAULT_BACKPRESSURE_DATA_SIZE_CHANGED, groupA, groupB, VersionedProcessGroup::getDefaultBackPressureDataSizeThreshold, true, "1 GB");
+ addIfDifferent(differences, DifferenceType.DEFAULT_BACKPRESSURE_OBJECT_COUNT_CHANGED, groupA, groupB, VersionedProcessGroup::getDefaultBackPressureObjectThreshold, true, 10_000L);
+ addIfDifferent(differences, DifferenceType.DEFAULT_FLOWFILE_EXPIRATION_CHANGED, groupA, groupB, VersionedProcessGroup::getDefaultFlowFileExpiration, true, "0 sec");
+
final VersionedFlowCoordinates groupACoordinates = groupA.getVersionedFlowCoordinates();
final VersionedFlowCoordinates groupBCoordinates = groupB.getVersionedFlowCoordinates();