Repository: nifi Updated Branches: refs/heads/NIFI-108-2 47e10dce7 -> f39b0f9b8
NIFI-108: - Updating the documentation regarding queue interaction. - Updating the error message when a flowfile is no longer in the active queue. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f39b0f9b Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f39b0f9b Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f39b0f9b Branch: refs/heads/NIFI-108-2 Commit: f39b0f9b827fcaa2872b818c490a134084734339 Parents: 47e10dc Author: Matt Gilman <[email protected]> Authored: Fri Jan 8 13:21:47 2016 -0500 Committer: Matt Gilman <[email protected]> Committed: Fri Jan 8 13:21:47 2016 -0500 ---------------------------------------------------------------------- nifi-docs/src/main/asciidoc/user-guide.adoc | 14 +++++++++----- .../nifi/web/dao/impl/StandardConnectionDAO.java | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/f39b0f9b/nifi-docs/src/main/asciidoc/user-guide.adoc ---------------------------------------------------------------------- diff --git a/nifi-docs/src/main/asciidoc/user-guide.adoc b/nifi-docs/src/main/asciidoc/user-guide.adoc index 3397e88..699ba2b 100644 --- a/nifi-docs/src/main/asciidoc/user-guide.adoc +++ b/nifi-docs/src/main/asciidoc/user-guide.adoc @@ -1252,19 +1252,23 @@ image:iconNotSecure.png["Not Secure"] -[[Queue_Listing]] -=== Listing FlowFiles in a Queue +[[Queue_Interaction]] +=== Queue Interaction The FlowFiles enqueued in a Connection can be viewed when necessary. The Queue listing is opened via a menu item in -a Connection's context menu. This option is only available when the source and destination of the Connection have -been stopped and all active threads have completed. The listing will return the top 100 FlowFiles according to -the currently sorted column. +a Connection's context menu. The listing will return the top 100 FlowFiles in the active queue according to the +configured priority. The listing can be performed even if the source and destination are actively running. Additionally, details for a Flowfile in the listing can be viewed by clicking on the Details icon ( image:iconDetails.png["Details"] ) in the left most column. From here, the FlowFile details and attributes are available as well buttons for downloading or viewing the content. Viewing the content is only available if the nifi.content.viewer.url has been configured. +If the source or destination of the Connection are actively running, there is a chance that the desired FlowFile will +no longer be in the active queue. +The FlowFiles enqueued in a Connection can also be deleted when necessary. The removal of the FlowFiles is initiated +via a menu item in the Connection's context menu. This action can also be performed if the source and destination +are actively running. [[Summary_Page]] http://git-wip-us.apache.org/repos/asf/nifi/blob/f39b0f9b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java index d98b590..e1faa14 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java @@ -124,7 +124,7 @@ public class StandardConnectionDAO extends ComponentDAO implements ConnectionDAO final FlowFileRecord flowFile = queue.getFlowFile(flowFileUuid); if (flowFile == null) { - throw new ResourceNotFoundException(String.format("The desired FlowFile[uuid=%s] is no longer in the active queue.", flowFileUuid)); + throw new ResourceNotFoundException(String.format("The FlowFile with UUID %s is no longer in the active queue.", flowFileUuid)); } return flowFile; @@ -604,7 +604,7 @@ public class StandardConnectionDAO extends ComponentDAO implements ConnectionDAO final FlowFileRecord flowFile = queue.getFlowFile(flowFileUuid); if (flowFile == null) { - throw new ResourceNotFoundException(String.format("Unable to find FlowFile '%s' in Connection '%s'.", flowFileUuid, id)); + throw new ResourceNotFoundException(String.format("The FlowFile with UUID %s is no longer in the active queue.", flowFileUuid)); } // calculate the dn chain
