Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E0AED200CDF for ; Thu, 17 Aug 2017 18:01:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DF21216B330; Thu, 17 Aug 2017 16:01:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D7C8516B32B for ; Thu, 17 Aug 2017 18:01:51 +0200 (CEST) Received: (qmail 10126 invoked by uid 500); 17 Aug 2017 16:01:50 -0000 Mailing-List: contact commits-help@usergrid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.apache.org Delivered-To: mailing list commits@usergrid.apache.org Received: (qmail 10116 invoked by uid 99); 17 Aug 2017 16:01:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Aug 2017 16:01:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5830CE0610; Thu, 17 Aug 2017 16:01:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mdunker@apache.org To: commits@usergrid.apache.org Date: Thu, 17 Aug 2017 16:01:50 -0000 Message-Id: <214b8ae63b004a969228ece3ebf2aec1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] usergrid git commit: Basic code improvements 1. Increase some testing timeouts. 2. improve some logging statements. 3. Fix duplicate dependency in cored-persistence pom.xml 4. Accept SNS or DISTRIBUTED_SNS as SNS queue types. 5. Drop missed test ke archived-at: Thu, 17 Aug 2017 16:01:53 -0000 Repository: usergrid Updated Branches: refs/heads/collectionDelete b6d14069a -> 24e443b2f Basic code improvements 1. Increase some testing timeouts. 2. improve some logging statements. 3. Fix duplicate dependency in cored-persistence pom.xml 4. Accept SNS or DISTRIBUTED_SNS as SNS queue types. 5. Drop missed test keyspaces for qakka tests. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/e4ccd5ec Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e4ccd5ec Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e4ccd5ec Branch: refs/heads/collectionDelete Commit: e4ccd5ec8b6a4330a259178b72445f2a98726aa4 Parents: b6d1406 Author: Mike Dunker Authored: Thu Aug 17 08:59:18 2017 -0700 Committer: Mike Dunker Committed: Thu Aug 17 08:59:18 2017 -0700 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 2 +- .../resources/usergrid-custom-test.properties | 1 + .../actorsystem/ActorSystemManagerImpl.java | 3 ++- .../src/test/resources/usergrid-UNIT.properties | 2 +- .../persistence/index/impl/EsEntityIndexImpl.java | 2 +- stack/corepersistence/queue/pom.xml | 18 ++++++------------ .../persistence/queue/guice/QueueModule.java | 2 +- .../persistence/qakka/KeyspaceDropper.java | 6 +++++- .../qakka/core/QueueMessageManagerTest.java | 2 +- .../resources/usergrid-custom-test.properties | 1 + 10 files changed, 20 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/e4ccd5ec/stack/config/src/main/resources/usergrid-default.properties ---------------------------------------------------------------------- diff --git a/stack/config/src/main/resources/usergrid-default.properties b/stack/config/src/main/resources/usergrid-default.properties index d505a96..510c07a 100644 --- a/stack/config/src/main/resources/usergrid-default.properties +++ b/stack/config/src/main/resources/usergrid-default.properties @@ -112,7 +112,7 @@ cassandra.embedded=false # Read timeout for an individual request (in millseconds) # -#cassandra.timeout=5000 +#cassandra.timeout=20000 # Set the credentials used for Cassandra, if any. http://git-wip-us.apache.org/repos/asf/usergrid/blob/e4ccd5ec/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 8f9058d..df253f0 100644 --- a/stack/core/src/test/resources/usergrid-custom-test.properties +++ b/stack/core/src/test/resources/usergrid-custom-test.properties @@ -16,6 +16,7 @@ # with ug.heapmax=5000m and ug.heapmin=3000m (set in Maven settings.xml) #cassandra.connections=30 cassandra.timeout.pool=20000 +cassandra.timeout=25000 #Not a good number for real systems. Write shards should be 2x cluster size from our tests http://git-wip-us.apache.org/repos/asf/usergrid/blob/e4ccd5ec/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java b/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java index bfa3abe..ea9ada8 100644 --- a/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java +++ b/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java @@ -377,6 +377,7 @@ public class ActorSystemManagerImpl implements ActorSystemManager { Iterator messageTypes = routerProducer.getMessageTypes().iterator(); while ( messageTypes.hasNext() ) { Class messageType = messageTypes.next(); + logger.info("createClusterSystem: routerProducer {}: message type={}", routerProducer.getRouterPath(), messageType.getName()); routersByMessageType.put( messageType, routerProducer.getRouterPath() ); } } @@ -467,7 +468,7 @@ public class ActorSystemManagerImpl implements ActorSystemManager { if (started) { logger.info( "ClientActor [{}] has started", ra.path() ); } else { - throw new RuntimeException( "ClientActor ["+ra.path()+"] did not start in time" ); + throw new RuntimeException( "ClientActor ["+ra.path()+"] did not start in time, validate that akka seeds are configured properly" ); } } http://git-wip-us.apache.org/repos/asf/usergrid/blob/e4ccd5ec/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties b/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties index 0a43209..13b2937 100644 --- a/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties +++ b/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties @@ -24,7 +24,7 @@ cassandra.port=9160 cassandra.hosts=localhost cassandra.cluster_name=Usergrid collections.keyspace=Usergrid_Collections -cassandra.timeout=10000 +cassandra.timeout=20000 cassandra.embedded=true collections.keyspace.strategy.options=replication_factor:1 http://git-wip-us.apache.org/repos/asf/usergrid/blob/e4ccd5ec/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java index 68c139a..f4fae2b 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java @@ -501,7 +501,7 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData { searchResponse = srb.execute().actionGet(); } catch ( Throwable t ) { - logger.error( "Unable to communicate with Elasticsearch", t.getMessage() ); + logger.error( "Unable to communicate with Elasticsearch: {}", t.getMessage() ); failureMonitor.fail( "Unable to execute batch", t ); throw t; } http://git-wip-us.apache.org/repos/asf/usergrid/blob/e4ccd5ec/stack/corepersistence/queue/pom.xml ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/pom.xml b/stack/corepersistence/queue/pom.xml index 153ed4b..005ce0c 100644 --- a/stack/corepersistence/queue/pom.xml +++ b/stack/corepersistence/queue/pom.xml @@ -93,6 +93,12 @@ org.apache.usergrid common ${project.version} + + + cassandra-all + org.apache.cassandra + + @@ -152,18 +158,6 @@ ${project.version} - - org.apache.usergrid - common - ${project.version} - - - cassandra-all - org.apache.cassandra - - - -