fix slow tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1f314c93 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1f314c93 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1f314c93 Branch: refs/heads/USERGRID-614 Commit: 1f314c93b6d7599d34652ebddfa4b82fbc4799cb Parents: 5b6eb98 Author: Shawn Feldman <[email protected]> Authored: Thu May 7 08:27:12 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Thu May 7 08:27:12 2015 -0600 ---------------------------------------------------------------------- stack/core/src/test/resources/usergrid-scheduler-test.properties | 2 ++ .../usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1f314c93/stack/core/src/test/resources/usergrid-scheduler-test.properties ---------------------------------------------------------------------- diff --git a/stack/core/src/test/resources/usergrid-scheduler-test.properties b/stack/core/src/test/resources/usergrid-scheduler-test.properties index ddd0193..d2aa1d1 100644 --- a/stack/core/src/test/resources/usergrid-scheduler-test.properties +++ b/stack/core/src/test/resources/usergrid-scheduler-test.properties @@ -20,3 +20,5 @@ usergrid.scheduler.job.timeout=2000 # The max number of times a job can fail before removing it permanently usergrid.scheduler.job.maxfail=2 +elasticsearch.buffer_timeout=1 + http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1f314c93/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java index 30f047b..469893e 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java @@ -128,7 +128,7 @@ public class EsIndexBufferConsumerImpl implements IndexBufferConsumer { final Observable<IndexOperationMessage> observable = Observable.create(bufferProducer); //buffer on our new thread with a timeout - observable.buffer( indexFig.getIndexBufferSize(), indexFig.getIndexBufferTimeout(), TimeUnit.MILLISECONDS, + observable.buffer( indexFig.getIndexBufferTimeout(), TimeUnit.MILLISECONDS, indexFig.getIndexBufferSize(), Schedulers.io() ).flatMap( indexOpBuffer -> { //hand off to processor in new observable thread so we can continue to buffer faster
