You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/05/07 16:27:56 UTC
[1/3] incubator-usergrid git commit: undo fork changes
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev 56534b1af -> 9954b211a
undo fork changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5b6eb98d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5b6eb98d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5b6eb98d
Branch: refs/heads/two-dot-o-dev
Commit: 5b6eb98d392fd08b7af0a800f63b95bad4b68d94
Parents: 362e758
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed May 6 15:35:07 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed May 6 15:35:07 2015 -0600
----------------------------------------------------------------------
stack/core/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5b6eb98d/stack/core/pom.xml
----------------------------------------------------------------------
diff --git a/stack/core/pom.xml b/stack/core/pom.xml
index db403b3..99a7157 100644
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@ -86,8 +86,8 @@
<target.directory>${project.build.directory}</target.directory>
</systemPropertyVariables>
<parallel>methods</parallel>
- <forkCount>1</forkCount>
- <threadCount>1</threadCount>
+ <forkCount>${usergrid.it.forkCount}</forkCount>
+ <threadCount>${usergrid.it.threads}</threadCount>
<reuseForks>true</reuseForks>
<argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline} </argLine>
<!-- see this page for documentation on classloading issues http://maven.apache.org/surefire/maven-surefire-plugin/examples/class-loading.html -->
[3/3] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Posted by sf...@apache.org.
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9954b211
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9954b211
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9954b211
Branch: refs/heads/two-dot-o-dev
Commit: 9954b211a085902e7ca6bb5dac4c242b41f2b4c7
Parents: 1f314c9 56534b1
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu May 7 08:27:46 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu May 7 08:27:46 2015 -0600
----------------------------------------------------------------------
.../pipeline/PipelineDiagram.jpg | Bin 0 -> 183035 bytes
.../usergrid/corepersistence/pipeline/README.md | 187 +++++++++++++++++++
.../pipeline/cursor/CursorDiagram.jpg | Bin 0 -> 167390 bytes
.../pipeline/read/ReadDiagram.jpg | Bin 0 -> 818565 bytes
.../pipeline/read/collect/CollectDiagram.jpg | Bin 0 -> 98007 bytes
.../read/elasticsearch/Elasticsearchdiagram.jpg | Bin 0 -> 316655 bytes
.../pipeline/read/graph/GraphDiagram.jpg | Bin 0 -> 347711 bytes
7 files changed, 187 insertions(+)
----------------------------------------------------------------------
[2/3] incubator-usergrid git commit: fix slow tests
Posted by sf...@apache.org.
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/two-dot-o-dev
Commit: 1f314c93b6d7599d34652ebddfa4b82fbc4799cb
Parents: 5b6eb98
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu May 7 08:27:12 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
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