usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [44/50] usergrid git commit: Tune some test properties.
Date Mon, 22 Aug 2016 15:00:48 GMT
Tune some test properties.


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/1238ce0d
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/1238ce0d
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/1238ce0d

Branch: refs/heads/asf-site
Commit: 1238ce0d243ca37a72977c4de39af91df023e371
Parents: fcbe803
Author: Michael Russo <mrusso@apigee.com>
Authored: Fri Aug 19 00:13:30 2016 -0700
Committer: Michael Russo <mrusso@apigee.com>
Committed: Fri Aug 19 00:13:30 2016 -0700

----------------------------------------------------------------------
 .../collection/src/test/resources/usergrid-CHOP.properties    | 2 +-
 .../collection/src/test/resources/usergrid-UNIT.properties    | 2 +-
 .../persistence/core/datastax/impl/DataStaxClusterImpl.java   | 1 -
 .../core/migration/schema/MigrationManagerImpl.java           | 7 ++++---
 .../common/src/test/resources/usergrid-UNIT.properties        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/1238ce0d/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 ebae735..e39b911 100644
--- a/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties
+++ b/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties
@@ -18,7 +18,7 @@
 
 # These are for CHOP environment settings
 
-cassandra.connections=50
+cassandra.connections=30
 cassandra.port=9160
 
 # a comma delimited private IP address list to your chop cassandra cluster

http://git-wip-us.apache.org/repos/asf/usergrid/blob/1238ce0d/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
b/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
index 0ee5a07..ebb7679 100644
--- a/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
+++ b/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
@@ -18,7 +18,7 @@
 #
 
 # Keep nothing but overriding test defaults in here
-cassandra.connections=15
+cassandra.connections=30
 cassandra.port=9160
 cassandra.hosts=localhost
 cassandra.cluster_name=Usergrid

http://git-wip-us.apache.org/repos/asf/usergrid/blob/1238ce0d/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java
b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java
index 93d3ea4..f926d1e 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java
@@ -112,7 +112,6 @@ public class DataStaxClusterImpl implements DataStaxCluster {
         );
 
         getClusterSession().execute(createApplicationKeyspace);
-        waitForSchemaAgreement();
 
         logger.info("Created keyspace: {}", cassandraFig.getApplicationKeyspace());
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/1238ce0d/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
index d6f66c5..c5d1312 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
@@ -94,9 +94,6 @@ public class MigrationManagerImpl implements MigrationManager {
                     for (MultiTenantColumnFamilyDefinition cf : columnFamilies) {
                         testAndCreateColumnFamilyDef(cf);
                     }
-                    // creation of tables happens with the datastax driver and it auto checks
schema on schema queries
-                    // the CF def creation uses Asytanax, so manually check the schema agreement
-                    dataStaxCluster.waitForSchemaAgreement();
                 }
 
 
@@ -135,6 +132,10 @@ public class MigrationManagerImpl implements MigrationManager {
 
         keyspace.createColumnFamily( columnFamily.getColumnFamily(), columnFamily.getOptions()
);
 
+        // creation of tables happens with the datastax driver and it auto checks schema
on schema queries
+        // the CF def creation uses Asytanax, so manually check the schema agreement
+        dataStaxCluster.waitForSchemaAgreement();
+
         logger.info( "Created column family {}", columnFamily.getColumnFamily().getName()
);
 
     }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/1238ce0d/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 9b77818..e31dad0 100644
--- a/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties
+++ b/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties
@@ -18,7 +18,7 @@
 #
 
 # Keep nothing but overriding test defaults in here
-cassandra.connections=15
+cassandra.connections=30
 cassandra.port=9160
 cassandra.hosts=localhost
 cassandra.cluster_name=Usergrid


Mime
View raw message