Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-730: Ensure that we always populate queue counts when initiating a Drop FlowFile request

This commit is contained in:
Mark Payne 2015-11-02 08:36:50 -05:00
parent edf238e004
commit f5727cfb0f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
View File

@ -923,7 +923,15 @@ public final class StandardFlowFileQueue implements FlowFileQueue {
}
final DropFlowFileRequest dropRequest = new DropFlowFileRequest(requestIdentifier);
dropRequest.setCurrentSize(size());
final QueueSize originalSize = getQueueSize();
dropRequest.setCurrentSize(originalSize);
dropRequest.setOriginalSize(originalSize);
if (originalSize.getObjectCount() == 0) {
dropRequest.setDroppedSize(originalSize);
dropRequest.setState(DropFlowFileState.COMPLETE);
return dropRequest;
}
final Thread t = new Thread(new Runnable() {
@Override
public void run() {
@ -931,7 +939,6 @@ public final class StandardFlowFileQueue implements FlowFileQueue {
try {
dropRequest.setState(DropFlowFileState.DROPPING_FLOWFILES);
logger.debug("For DropFlowFileRequest {}, original size is {}", requestIdentifier, getQueueSize());
dropRequest.setOriginalSize(getQueueSize());
try {
final List<FlowFileRecord> activeQueueRecords = new ArrayList<>(activeQueue);