NIFI-731: fixed issue with how bulletins were emitted by content claim manager
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/94b4eddb Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/94b4eddb Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/94b4eddb Branch: refs/heads/NIFI-731 Commit: 94b4eddb00055fccbe57c5e3fb2ed93c0e91c153 Parents: b3eb4a1 Author: Mark Payne <marka...@hotmail.com> Authored: Tue Jun 30 14:09:56 2015 -0400 Committer: Mark Payne <marka...@hotmail.com> Committed: Tue Jun 30 14:09:56 2015 -0400 ---------------------------------------------------------------------- .../repository/claim/StandardContentClaimManager.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/94b4eddb/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/claim/StandardContentClaimManager.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/claim/StandardContentClaimManager.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/claim/StandardContentClaimManager.java index f5494f9..68ec5d9 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/claim/StandardContentClaimManager.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/claim/StandardContentClaimManager.java @@ -123,17 +123,11 @@ public class StandardContentClaimManager implements ContentClaimManager { final BlockingQueue<ContentClaim> destructableQueue = getDestructableClaimQueue(claim.getContainer()); final boolean accepted = destructableQueue.offer(claim); if (!accepted) { - final long start = System.nanoTime(); - while (!destructableQueue.offer(claim, 30, TimeUnit.MINUTES)) { } - final long millis = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start); - if (millis > 10L) { - logger.warn("Total wait duration to add claim to Destructable Claim Queue was {} millis", millis); - eventReporter.reportEvent(Severity.WARNING, "Content Repository", "The Content Repository is unable to destroy content as fast " - + "as it is being created. The flow will be slowed in order to adjust for this."); - } + eventReporter.reportEvent(Severity.WARNING, "Content Repository", "The Content Repository is unable to destroy content as fast " + + "as it is being created. The flow will be slowed in order to adjust for this."); } } catch (final InterruptedException ie) { }
