Changed test shards to be 1, and replicas to be 0. We don't need to overload ES with shards and replicas in our test env.
Changed drop CFs to either truncate, or explicitly set data. Remove doesn't work in a concurrent environment. Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/00eb3395 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/00eb3395 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/00eb3395 Branch: refs/heads/two-dot-o-events Commit: 00eb33954cd95b9f66ba173a10624800182d91e6 Parents: 4aea8e7 Author: Todd Nine <[email protected]> Authored: Tue Nov 18 15:42:25 2014 -0700 Committer: Todd Nine <[email protected]> Committed: Tue Nov 18 15:42:25 2014 -0700 ---------------------------------------------------------------------- .../config/src/test/resources/usergrid-test.properties | 5 +++++ .../migration/EntityTypeMappingMigrationIT.java | 9 ++------- .../migration/GraphShardVersionMigrationIT.java | 12 +++++------- .../index/impl/EntityConnectionIndexImplTest.java | 2 ++ .../persistence/index/impl/EntityIndexTest.java | 1 + .../src/test/resources/usergrid-UNIT.properties | 6 ++++++ .../apache/usergrid/cassandra/CassandraResource.java | 2 ++ 7 files changed, 23 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00eb3395/stack/config/src/test/resources/usergrid-test.properties ---------------------------------------------------------------------- diff --git a/stack/config/src/test/resources/usergrid-test.properties b/stack/config/src/test/resources/usergrid-test.properties index 5889625..3f680f4 100644 --- a/stack/config/src/test/resources/usergrid-test.properties +++ b/stack/config/src/test/resources/usergrid-test.properties @@ -61,6 +61,11 @@ cassandra.lock.keyspace=Locks elasticsearch.startup=external elasticsearch.cluster_name=usergrid +#Not a good number for real systems. Write shards should be 2x cluster size from our tests +#This is just way more efficient for a single node and the number of shards we're creating +elasticsearch.number_shards=1 +elasticsearch.number_replicas=0 + #Properties to control the number of buckets in the index. usergrid.index.defaultbucketsize=20 usergrid.counter.skipAggregate=false http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00eb3395/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/EntityTypeMappingMigrationIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/EntityTypeMappingMigrationIT.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/EntityTypeMappingMigrationIT.java index b218368..dafdb00 100644 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/EntityTypeMappingMigrationIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/EntityTypeMappingMigrationIT.java @@ -58,7 +58,6 @@ public class EntityTypeMappingMigrationIT extends AbstractCoreIT { private EntityTypeMappingMigration entityTypeMappingMigration; private Keyspace keyspace; - private MigrationManager migrationManager; private EntityManagerFactory emf; private ManagerCache managerCache; @@ -69,7 +68,6 @@ public class EntityTypeMappingMigrationIT extends AbstractCoreIT { emf = setup.getEmf(); entityTypeMappingMigration = injector.getInstance( EntityTypeMappingMigration.class ); keyspace = injector.getInstance( Keyspace.class ); - migrationManager = injector.getInstance( MigrationManager.class ); managerCache = injector.getInstance( ManagerCache.class ); } @@ -99,11 +97,8 @@ public class EntityTypeMappingMigrationIT extends AbstractCoreIT { * Drop our map keyspace to ensure we have no entries before migrating after doing our writes. * This will ensure we have the data */ - keyspace.dropColumnFamily( MapSerializationImpl.MAP_ENTRIES ); - keyspace.dropColumnFamily( MapSerializationImpl.MAP_KEYS ); - - //create the column families again - migrationManager.migrate(); + keyspace.truncateColumnFamily( MapSerializationImpl.MAP_ENTRIES ); + keyspace.truncateColumnFamily( MapSerializationImpl.MAP_KEYS ); final TestProgressObserver progressObserver = new TestProgressObserver(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00eb3395/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigrationIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigrationIT.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigrationIT.java index c3a7e65..aab47a0 100644 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigrationIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigrationIT.java @@ -59,7 +59,6 @@ public class GraphShardVersionMigrationIT extends AbstractCoreIT { private Injector injector; private GraphShardVersionMigration graphShardVersionMigration; private Keyspace keyspace; - private MigrationManager migrationManager; private ManagerCache managerCache; private DataMigrationManager dataMigrationManager; private MigrationInfoSerialization migrationInfoSerialization; @@ -70,7 +69,6 @@ public class GraphShardVersionMigrationIT extends AbstractCoreIT { injector = CpSetup.getInjector(); graphShardVersionMigration = injector.getInstance( GraphShardVersionMigration.class ); keyspace = injector.getInstance( Keyspace.class ); - migrationManager = injector.getInstance( MigrationManager.class ); managerCache = injector.getInstance( ManagerCache.class ); dataMigrationManager = injector.getInstance( DataMigrationManager.class ); migrationInfoSerialization = injector.getInstance( MigrationInfoSerialization.class ); @@ -83,13 +81,13 @@ public class GraphShardVersionMigrationIT extends AbstractCoreIT { assertEquals("version 2 expected", 2, graphShardVersionMigration.getVersion()); /** - * Drop our migration keyspaces to ensure we don't have a "new version in there" - * This will ensure we have an "old data" version of data written + * Reset to our version -1 and start the migration */ - keyspace.dropColumnFamily( MigrationInfoSerializationImpl.CF_MIGRATION_INFO ); + dataMigrationManager.resetToVersion( graphShardVersionMigration.getVersion()-1 ); + + + - //create the column families again - migrationManager.migrate(); final EntityManager newAppEm = app.getEntityManager(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00eb3395/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityConnectionIndexImplTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityConnectionIndexImplTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityConnectionIndexImplTest.java index 9d6baa5..b07bd21 100644 --- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityConnectionIndexImplTest.java +++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityConnectionIndexImplTest.java @@ -118,6 +118,7 @@ public class EntityConnectionIndexImplTest extends BaseIT { new IndexScopeImpl( new SimpleId( UUIDGenerator.newTimeUUID(), "animal" ), "likes" ); EntityIndex personLikesIndex = ecif.createEntityIndex( applicationScope ); + personLikesIndex.initializeIndex(); EntityIndexBatch batch = personLikesIndex.createBatch(); @@ -248,6 +249,7 @@ public class EntityConnectionIndexImplTest extends BaseIT { new IndexScopeImpl( new SimpleId( UUIDGenerator.newTimeUUID(), "animal" ), "likes" ); EntityIndex personLikesIndex = ecif.createEntityIndex( applicationScope ); + personLikesIndex.initializeIndex(); EntityIndexBatch batch = personLikesIndex.createBatch(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00eb3395/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java index 2b9ea62..a30e222 100644 --- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java +++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java @@ -373,6 +373,7 @@ public class EntityIndexTest extends BaseIT { IndexScope appScope = new IndexScopeImpl( ownerId, "user" ); EntityIndex ei = eif.createEntityIndex( applicationScope ); + ei.initializeIndex(); ei.createBatch(); // Bill has favorites as string, age as string and retirement goal as number http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00eb3395/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties b/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties index d7d3909..959bb27 100644 --- a/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties +++ b/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties @@ -20,3 +20,9 @@ elasticsearch.hosts=127.0.0.1 elasticsearch.port=9300 index.query.limit.default=1000 + + +#Not a good number for real systems. Write shards should be 2x cluster size from our tests +#This is just way more efficient for a single node and the number of shards we're creating +elasticsearch.number_shards=1 +elasticsearch.number_replicas=0 http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00eb3395/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java ---------------------------------------------------------------------- diff --git a/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java b/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java index 91acf79..3f99e91 100644 --- a/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java +++ b/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java @@ -340,6 +340,8 @@ public class CassandraResource extends ExternalResource { LOG.info( "Created a new instance of CassandraResource: {}", instance ); LOG.info( "Cassandra using ports {} and {}", storagePort, sslStoragePort ); + + return instance; } }
