Repository: nifi Updated Branches: refs/heads/0.x 2cdb1c190 -> 139831241 refs/heads/master e6250d18c -> 406d8a199
NIFI-1805 Expose BackPressureObjectThreshold and BackPressureDataSizeThreshold to ConnectionStatus This closes #377. Signed-off-by: Aldrin Piri <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/13983124 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/13983124 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/13983124 Branch: refs/heads/0.x Commit: 139831241cbe95e2a6a05113c910b04b02602a00 Parents: 2cdb1c1 Author: Jeremy Dyer <[email protected]> Authored: Fri Apr 22 13:28:29 2016 -0400 Committer: Aldrin Piri <[email protected]> Committed: Sat Jun 18 23:05:11 2016 -0400 ---------------------------------------------------------------------- .../controller/status/ConnectionStatus.java | 24 ++++++++++++++++++++ .../apache/nifi/controller/FlowController.java | 2 ++ 2 files changed, 26 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/13983124/nifi-api/src/main/java/org/apache/nifi/controller/status/ConnectionStatus.java ---------------------------------------------------------------------- diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/status/ConnectionStatus.java b/nifi-api/src/main/java/org/apache/nifi/controller/status/ConnectionStatus.java index cebb2b4..7301abb 100644 --- a/nifi-api/src/main/java/org/apache/nifi/controller/status/ConnectionStatus.java +++ b/nifi-api/src/main/java/org/apache/nifi/controller/status/ConnectionStatus.java @@ -27,6 +27,8 @@ public class ConnectionStatus implements Cloneable { private String sourceName; private String destinationId; private String destinationName; + private String backPressureDataSizeThreshold; + private long backPressureObjectThreshold; private int inputCount; private long inputBytes; private int queuedCount; @@ -106,6 +108,22 @@ public class ConnectionStatus implements Cloneable { this.destinationName = destinationName; } + public String getBackPressureDataSizeThreshold() { + return backPressureDataSizeThreshold; + } + + public void setBackPressureDataSizeThreshold(String backPressureDataSizeThreshold) { + this.backPressureDataSizeThreshold = backPressureDataSizeThreshold; + } + + public long getBackPressureObjectThreshold() { + return backPressureObjectThreshold; + } + + public void setBackPressureObjectThreshold(long backPressureObjectThreshold) { + this.backPressureObjectThreshold = backPressureObjectThreshold; + } + public long getInputBytes() { return inputBytes; } @@ -154,6 +172,8 @@ public class ConnectionStatus implements Cloneable { clonedObj.sourceName = sourceName; clonedObj.destinationId = destinationId; clonedObj.destinationName = destinationName; + clonedObj.backPressureDataSizeThreshold = backPressureDataSizeThreshold; + clonedObj.backPressureObjectThreshold = backPressureObjectThreshold; return clonedObj; } @@ -174,6 +194,10 @@ public class ConnectionStatus implements Cloneable { builder.append(destinationId); builder.append(", destinationName="); builder.append(destinationName); + builder.append(", backPressureDataSizeThreshold="); + builder.append(backPressureDataSizeThreshold); + builder.append(", backPressureObjectThreshold="); + builder.append(backPressureObjectThreshold); builder.append(", inputCount="); builder.append(inputCount); builder.append(", inputBytes="); http://git-wip-us.apache.org/repos/asf/nifi/blob/13983124/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java index ae8e50f..d28075b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java @@ -2233,6 +2233,8 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R connStatus.setSourceName(conn.getSource().getName()); connStatus.setDestinationId(conn.getDestination().getIdentifier()); connStatus.setDestinationName(conn.getDestination().getName()); + connStatus.setBackPressureDataSizeThreshold(conn.getFlowFileQueue().getBackPressureDataSizeThreshold()); + connStatus.setBackPressureObjectThreshold(conn.getFlowFileQueue().getBackPressureObjectThreshold()); final FlowFileEvent connectionStatusReport = statusReport.getReportEntry(conn.getIdentifier()); if (connectionStatusReport != null) {
