This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 34b5297c93543a085fcfe98f7f325e728986af48 Author: Nissim Shiman <nshi...@yahoo.com> AuthorDate: Wed Jun 19 19:29:55 2024 +0000 NIFI-13420 Maintain consistent maxNonHeapBytes for clustered diagnostics - The merged value of maxNonHeapBytes should be -1 when at least one node has that value This closes #9055 Signed-off-by: David Handermann <exceptionfact...@apache.org> --- .../src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java index cfdd1ff597..d91c8f1ce4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java @@ -685,7 +685,11 @@ public class StatusMerger { target.setFreeHeapBytes(target.getFreeHeapBytes() + toMerge.getFreeHeapBytes()); target.setFreeNonHeapBytes(target.getFreeNonHeapBytes() + toMerge.getFreeNonHeapBytes()); target.setMaxHeapBytes(target.getMaxHeapBytes() + toMerge.getMaxHeapBytes()); - target.setMaxNonHeapBytes(target.getMaxNonHeapBytes() + toMerge.getMaxNonHeapBytes()); + if (target.getMaxNonHeapBytes() != -1 && toMerge.getMaxNonHeapBytes() != -1) { + target.setMaxNonHeapBytes(target.getMaxNonHeapBytes() + toMerge.getMaxNonHeapBytes()); + } else { + target.setMaxNonHeapBytes(-1L); + } double systemLoad = target.getProcessorLoadAverage(); double toMergeSystemLoad = toMerge.getProcessorLoadAverage(); if (systemLoad >= 0 && toMergeSystemLoad >= 0) {