You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/11/19 03:31:15 UTC
usergrid git commit: Fix log binding and reduce long poll timeout for
tests to reduce time spent validating index data.
Repository: usergrid
Updated Branches:
refs/heads/master fdd4e0be3 -> 61878c008
Fix log binding and reduce long poll timeout for tests to reduce time spent validating index data.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/61878c00
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/61878c00
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/61878c00
Branch: refs/heads/master
Commit: 61878c008d6311d6529aca7e385d451690da9002
Parents: fdd4e0b
Author: Michael Russo <mr...@apigee.com>
Authored: Fri Nov 18 19:30:29 2016 -0800
Committer: Michael Russo <mr...@apigee.com>
Committed: Fri Nov 18 19:30:29 2016 -0800
----------------------------------------------------------------------
.../apache/usergrid/corepersistence/CpEntityManager.java | 4 +++-
.../apache/usergrid/corepersistence/CpRelationManager.java | 1 +
.../org/apache/usergrid/persistence/RebuildIndexTest.java | 4 ----
.../core/src/test/resources/usergrid-custom-test.properties | 4 ++++
stack/corepersistence/common/pom.xml | 4 ++++
stack/corepersistence/pom.xml | 2 +-
stack/pom.xml | 9 +++++++++
7 files changed, 22 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/61878c00/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index 67f52cf..efe2eef 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@ -3119,7 +3119,9 @@ public class CpEntityManager implements EntityManager {
hasFinished = true;
break;
}
- Thread.sleep(500);
+ int sleepTime = 500;
+ logger.info("Sleeping {} ms during refreshIndex", sleepTime);
+ Thread.sleep(sleepTime);
indexRefreshCommandInfo
= managerCache.getEntityIndex(applicationScope).refreshAsync().toBlocking().first();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/61878c00/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
index 57b1526..65806af 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
@@ -679,6 +679,7 @@ public class CpRelationManager implements RelationManager {
if ( found ) {
break;
}
+ logger.info("Sleeping {} ms during searchCollectionConsistent", sleepTime);
Thread.sleep( sleepTime );
}
while ( !found && length <= maxLength );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/61878c00/stack/core/src/test/java/org/apache/usergrid/persistence/RebuildIndexTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/RebuildIndexTest.java b/stack/core/src/test/java/org/apache/usergrid/persistence/RebuildIndexTest.java
index 36ae98a..383d620 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/RebuildIndexTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/RebuildIndexTest.java
@@ -49,10 +49,6 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-//@RunWith(JukitoRunner.class)
-//@UseModules({ GuiceModule.class })
-
-
@NotThreadSafe
public class RebuildIndexTest extends AbstractCoreIT {
private static final Logger logger = LoggerFactory.getLogger( RebuildIndexTest.class );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/61878c00/stack/core/src/test/resources/usergrid-custom-test.properties
----------------------------------------------------------------------
diff --git a/stack/core/src/test/resources/usergrid-custom-test.properties b/stack/core/src/test/resources/usergrid-custom-test.properties
index a3dfc94..13ef8cf 100644
--- a/stack/core/src/test/resources/usergrid-custom-test.properties
+++ b/stack/core/src/test/resources/usergrid-custom-test.properties
@@ -46,5 +46,9 @@ usergrid.cluster.seeds=us-east\:localhost
collection.uniquevalues.actors=300
collection.uniquevalues.authoritative.region=us-east
+# Queueing Test Settings
+# Reduce the long polling time for the tests
+queue.long.polling.time.millis=250
+
# --- End: Usergrid cluster/actor system settings
http://git-wip-us.apache.org/repos/asf/usergrid/blob/61878c00/stack/corepersistence/common/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/pom.xml b/stack/corepersistence/common/pom.xml
index aacec73..8fe86b0 100644
--- a/stack/corepersistence/common/pom.xml
+++ b/stack/corepersistence/common/pom.xml
@@ -84,6 +84,10 @@
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>logback-core</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/61878c00/stack/corepersistence/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/pom.xml b/stack/corepersistence/pom.xml
index 4016732..9fd3606 100644
--- a/stack/corepersistence/pom.xml
+++ b/stack/corepersistence/pom.xml
@@ -74,7 +74,7 @@ limitations under the License.
<antlr.version>3.5.2</antlr.version>
<archaius.version>0.5.12</archaius.version>
<astyanax.version>3.9.0</astyanax.version>
- <cassandra.version>2.1.9</cassandra.version>
+ <cassandra.version>2.1.14</cassandra.version>
<!-- <chop.version>1.0</chop.version>-->
<commons.codec.version>1.6</commons.codec.version>
<commons.collections.version>3.2.1</commons.collections.version>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/61878c00/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index e86580a..d6f0bae 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -469,7 +469,16 @@
<exclusion>
<groupId>net.jpountz.lz4</groupId>
<artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>logback-classic</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+
+ <exclusion>
+ <artifactId>logback-core</artifactId>
+ <groupId>ch.qos.logback</groupId>
</exclusion>
</exclusions>
</dependency>