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

NIFI-730: reordered states for drop flowfile request

This commit is contained in:
Mark Payne 2015-10-14 16:32:39 -04:00
parent 98a04eec74
commit 09a3f6dadd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nifi-api/src/main/java/org/apache/nifi/controller/queue/DropFlowFileState.java
View File

@ -23,10 +23,10 @@ package org.apache.nifi.controller.queue;
public enum DropFlowFileState { public enum DropFlowFileState {
WAITING_FOR_LOCK("Waiting for Destination Component to complete its action"), WAITING_FOR_LOCK("Waiting for Destination Component to complete its action"),
DROPPING_ACTIVE_FLOWFILES("Dropping FlowFiles from queue"), DROPPING_FLOWFILES("Dropping FlowFiles from queue"),
COMPLETE("Completed Successfully"),
FAILURE("Failed"), FAILURE("Failed"),
CANCELED("Cancelled by User"); CANCELED("Canceled by User"),
COMPLETE("Completed Successfully");
private final String description; private final String description;

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

@ -944,7 +944,7 @@ public final class StandardFlowFileQueue implements FlowFileQueue {
public void run() { public void run() {
writeLock.lock(); writeLock.lock();
try { try {
dropRequest.setState(DropFlowFileState.DROPPING_ACTIVE_FLOWFILES); dropRequest.setState(DropFlowFileState.DROPPING_FLOWFILES);
logger.debug("For DropFlowFileRequest {}, original size is {}", requestIdentifier, getQueueSize()); logger.debug("For DropFlowFileRequest {}, original size is {}", requestIdentifier, getQueueSize());
dropRequest.setOriginalSize(getQueueSize()); dropRequest.setOriginalSize(getQueueSize());