You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/01/30 02:21:05 UTC
[25/50] [abbrv] git commit: USERGRID-3037: added code to clean up
connections and tweaked parameters to most taxing levels
USERGRID-3037: added code to clean up connections and tweaked parameters to most taxing levels
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/265d7dfe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/265d7dfe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/265d7dfe
Branch: refs/heads/USERGRID-2771-graph-edges
Commit: 265d7dfed88d8906dd2926b2119d6713cee6ced8
Parents: 7072b85
Author: Alex Karasulu <ak...@gmail.com>
Authored: Thu Jan 16 07:18:36 2014 +0200
Committer: Alex Karasulu <ak...@gmail.com>
Committed: Thu Jan 16 07:18:36 2014 +0200
----------------------------------------------------------------------
stack/corepersistence/collection/pom.xml | 2 +-
.../collection/astyanax/AstyanaxKeyspaceProvider.java | 3 +--
.../impl/MvccEntitySerializationStrategyImplTest.java | 8 +-------
.../collection/src/test/resources/usergrid-CHOP.properties | 2 +-
4 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/265d7dfe/stack/corepersistence/collection/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/pom.xml b/stack/corepersistence/collection/pom.xml
index f900cdb..6852486 100644
--- a/stack/corepersistence/collection/pom.xml
+++ b/stack/corepersistence/collection/pom.xml
@@ -78,7 +78,7 @@
<coldRestartTomcat>true</coldRestartTomcat>
<awsSecurityGroup>${security.group}</awsSecurityGroup>
<runnerKeyPairName>${runner.keypair.name}</runnerKeyPairName>
- <minimumRunners>6</minimumRunners>
+ <minimumRunners>9</minimumRunners>
<maximumRunners>9</maximumRunners>
<securityGroupExceptions>
<!--
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/265d7dfe/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/astyanax/AstyanaxKeyspaceProvider.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/astyanax/AstyanaxKeyspaceProvider.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/astyanax/AstyanaxKeyspaceProvider.java
index 923e7c3..0a71691 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/astyanax/AstyanaxKeyspaceProvider.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/astyanax/AstyanaxKeyspaceProvider.java
@@ -1,10 +1,8 @@
package org.apache.usergrid.persistence.collection.astyanax;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import java.util.concurrent.ConcurrentSkipListSet;
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -28,6 +26,7 @@ import com.netflix.astyanax.thrift.ThriftFamilyFactory;
public class AstyanaxKeyspaceProvider implements Provider<Keyspace> {
private final CassandraFig cassandraConfig;
+ // @todo aok - this being static is utterly horrible and needs to change
private final static Set<AstyanaxContext<Keyspace>> contexts =
new HashSet<AstyanaxContext<Keyspace>>();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/265d7dfe/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
index 7248bac..a52be37 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
@@ -1,7 +1,6 @@
package org.apache.usergrid.persistence.collection.serialization.impl;
-import java.io.IOException;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -10,7 +9,6 @@ import java.util.UUID;
import org.jukito.JukitoRunner;
import org.jukito.UseModules;
import org.junit.After;
-import org.junit.AfterClass;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -18,7 +16,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.safehaus.chop.api.IterationChop;
import org.safehaus.guicyfig.Env;
-import org.safehaus.guicyfig.GuicyFigModule;
import org.safehaus.guicyfig.Option;
import org.safehaus.guicyfig.Overrides;
@@ -49,11 +46,8 @@ import org.apache.usergrid.persistence.model.field.UUIDField;
import org.apache.usergrid.persistence.model.util.UUIDGenerator;
import com.google.common.base.Optional;
-import com.google.inject.Guice;
import com.google.inject.Inject;
-import com.google.inject.Injector;
import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
-import com.netflix.config.ConfigurationManager;
import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertNotNull;
@@ -65,7 +59,7 @@ import static org.mockito.Mockito.mock;
/** @author tnine */
-@IterationChop( iterations = 1, threads = 1 )
+@IterationChop( iterations = 1000, threads = 3 )
@RunWith( JukitoRunner.class )
@UseModules( CollectionModule.class )
public class MvccEntitySerializationStrategyImplTest {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/265d7dfe/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties b/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties
index d9c72be..a047fd7 100644
--- a/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties
+++ b/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties
@@ -1,6 +1,6 @@
# These are for CHOP environment settings
-cassandra.connections=20
+cassandra.connections=30
cassandra.port=9160
cassandra.version=1.2