nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marka...@apache.org
Subject nifi git commit: NIFI-1563: Removed ProcessGroupStatus from HeartbeatPayload
Date Mon, 21 Mar 2016 14:10:07 GMT
Repository: nifi
Updated Branches:
  refs/heads/NIFI-1563 3337ea951 -> ec4b1cebc


NIFI-1563: Removed ProcessGroupStatus from HeartbeatPayload


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/ec4b1ceb
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/ec4b1ceb
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/ec4b1ceb

Branch: refs/heads/NIFI-1563
Commit: ec4b1cebc90e5c70ae3962cfae9db8b4ba6f17c7
Parents: 3337ea9
Author: Mark Payne <markap14@hotmail.com>
Authored: Mon Mar 21 10:09:57 2016 -0400
Committer: Mark Payne <markap14@hotmail.com>
Committed: Mon Mar 21 10:09:57 2016 -0400

----------------------------------------------------------------------
 .../java/org/apache/nifi/cluster/HeartbeatPayload.java    | 10 ----------
 .../java/org/apache/nifi/controller/FlowController.java   |  3 +--
 2 files changed, 1 insertion(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/ec4b1ceb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java
index 94ed570..1146a39 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java
@@ -28,7 +28,6 @@ import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.apache.nifi.cluster.protocol.ProtocolException;
-import org.apache.nifi.controller.status.ProcessGroupStatus;
 
 /**
  * The payload of the heartbeat. The payload contains status to inform the cluster manager
the current workload of this node.
@@ -47,7 +46,6 @@ public class HeartbeatPayload {
         }
     }
 
-    private ProcessGroupStatus processGroupStatus;
     private int activeThreadCount;
     private long totalFlowFileCount;
     private long totalFlowFileBytes;
@@ -77,14 +75,6 @@ public class HeartbeatPayload {
         this.totalFlowFileBytes = totalFlowFileBytes;
     }
 
-    public ProcessGroupStatus getProcessGroupStatus() {
-        return processGroupStatus;
-    }
-
-    public void setProcessGroupStatus(final ProcessGroupStatus processGroupStatus) {
-        this.processGroupStatus = processGroupStatus;
-    }
-
     public long getSystemStartTime() {
         return systemStartTime;
     }

http://git-wip-us.apache.org/repos/asf/nifi/blob/ec4b1ceb/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 ce83baf..3c1062a 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
@@ -3684,11 +3684,10 @@ public class FlowController implements EventAccess, ControllerServiceProvider,
R
                     return null;
                 }
 
-                final ProcessGroupStatus procGroupStatus = getGroupStatus(bean.getRootGroup(),
getProcessorStats());
                 // create heartbeat payload
                 final HeartbeatPayload hbPayload = new HeartbeatPayload();
                 hbPayload.setSystemStartTime(systemStartTime);
-                hbPayload.setActiveThreadCount(procGroupStatus.getActiveThreadCount());
+                hbPayload.setActiveThreadCount(getActiveThreadCount());
 
                 final QueueSize queueSize = getTotalFlowFileCount(bean.getRootGroup());
                 hbPayload.setTotalFlowFileCount(queueSize.getObjectCount());


Mime
View raw message