NIFI-1755 Fixed remote process group status counts by only considering connected remote ports

This closes #347
This commit is contained in:
Pierre Villard 2016-04-13 11:31:23 +02:00 committed by Oleg Zhurakousky
parent 87d96c0225
commit b2ce6f1f96
1 changed files with 15 additions and 15 deletions

View File

@ -2472,7 +2472,7 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R
// determine if this input port is connected // determine if this input port is connected
final boolean isConnected = port.hasIncomingConnection(); final boolean isConnected = port.hasIncomingConnection();
// we only want to conside remote ports that we are connected to // we only want to consider remote ports that we are connected to
if (isConnected) { if (isConnected) {
if (port.isRunning()) { if (port.isRunning()) {
activePortCount++; activePortCount++;
@ -2481,15 +2481,15 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R
} }
activeThreadCount += processScheduler.getActiveThreadCount(port); activeThreadCount += processScheduler.getActiveThreadCount(port);
}
final FlowFileEvent portEvent = statusReport.getReportEntry(port.getIdentifier()); final FlowFileEvent portEvent = statusReport.getReportEntry(port.getIdentifier());
if (portEvent != null) { if (portEvent != null) {
lineageMillis += portEvent.getAggregateLineageMillis(); lineageMillis += portEvent.getAggregateLineageMillis();
flowFilesRemoved += portEvent.getFlowFilesRemoved(); flowFilesRemoved += portEvent.getFlowFilesRemoved();
flowFilesTransferred += portEvent.getFlowFilesOut(); flowFilesTransferred += portEvent.getFlowFilesOut();
sentCount += portEvent.getFlowFilesSent(); sentCount += portEvent.getFlowFilesSent();
sentContentSize += portEvent.getBytesSent(); sentContentSize += portEvent.getBytesSent();
}
} }
} }
@ -2497,7 +2497,7 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R
// determine if this output port is connected // determine if this output port is connected
final boolean isConnected = !port.getConnections().isEmpty(); final boolean isConnected = !port.getConnections().isEmpty();
// we only want to conside remote ports that we are connected from // we only want to consider remote ports that we are connected from
if (isConnected) { if (isConnected) {
if (port.isRunning()) { if (port.isRunning()) {
activePortCount++; activePortCount++;
@ -2506,12 +2506,12 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R
} }
activeThreadCount += processScheduler.getActiveThreadCount(port); activeThreadCount += processScheduler.getActiveThreadCount(port);
}
final FlowFileEvent portEvent = statusReport.getReportEntry(port.getIdentifier()); final FlowFileEvent portEvent = statusReport.getReportEntry(port.getIdentifier());
if (portEvent != null) { if (portEvent != null) {
receivedCount += portEvent.getFlowFilesReceived(); receivedCount += portEvent.getFlowFilesReceived();
receivedContentSize += portEvent.getBytesReceived(); receivedContentSize += portEvent.getBytesReceived();
}
} }
} }