Add additional filter for index processing to ensure things do not get ack'd that should not get ack'd.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/4d828e1c Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/4d828e1c Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/4d828e1c Branch: refs/heads/release-2.1.1 Commit: 4d828e1cdba69430b06337988e91490eaf0cfd1b Parents: 4c41f1b Author: Michael Russo <[email protected]> Authored: Mon Mar 21 11:12:34 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Mon Mar 21 11:12:34 2016 -0700 ---------------------------------------------------------------------- .../corepersistence/asyncevents/AsyncEventServiceImpl.java | 1 + .../usergrid/persistence/index/impl/IndexOperationMessage.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/4d828e1c/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventServiceImpl.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventServiceImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventServiceImpl.java index 4f8b7ce..cc1246f 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventServiceImpl.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventServiceImpl.java @@ -756,6 +756,7 @@ public class AsyncEventServiceImpl implements AsyncEventService { // filter out messages that are not present, they were not processed and put into the results .filter( result -> result.getQueueMessage().isPresent() ) + .filter( result -> result.getIndexOperationMessage().isPresent() ) .map(indexEventResult -> { //record the cycle time http://git-wip-us.apache.org/repos/asf/usergrid/blob/4d828e1c/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexOperationMessage.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexOperationMessage.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexOperationMessage.java index 7d19ce3..f544967 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexOperationMessage.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexOperationMessage.java @@ -54,7 +54,7 @@ public class IndexOperationMessage implements Serializable { public void addIndexRequest( final IndexOperation indexRequest ) { - indexRequests.add( indexRequest ); + this.indexRequests.add( indexRequest ); }
