Repository: usergrid Updated Branches: refs/heads/master 66c1b0d38 -> 6bd4a2023
Add logging and wait for schema agreement in tests that drop the keyspace. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6bd4a202 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6bd4a202 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/6bd4a202 Branch: refs/heads/master Commit: 6bd4a20231077f673bcc12566746421c81c24adc Parents: 66c1b0d Author: Michael Russo <[email protected]> Authored: Sat Nov 19 08:03:49 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Sat Nov 19 08:03:49 2016 -0800 ---------------------------------------------------------------------- .../java/org/apache/usergrid/persistence/CoreSchemaManager.java | 2 +- .../persistence/core/datastax/impl/DataStaxClusterImpl.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/6bd4a202/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java b/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java index 6cc5249..087fa37 100644 --- a/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java +++ b/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java @@ -82,7 +82,7 @@ public class CoreSchemaManager implements SchemaManager { public void destroy() { logger.info( "dropping keyspaces" ); try { - cluster.dropKeyspace( CassandraService.getApplicationKeyspace() ); + cluster.dropKeyspace( CassandraService.getApplicationKeyspace(), true ); } catch ( RuntimeException ire ) { //swallow if it just doesn't exist http://git-wip-us.apache.org/repos/asf/usergrid/blob/6bd4a202/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 e3064a0..4460244 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 @@ -114,6 +114,7 @@ public class DataStaxClusterImpl implements DataStaxCluster { .getKeyspace(CQLUtils.quote( cassandraConfig.getApplicationKeyspace())) != null; if(exists){ + logger.info("Not creating keyspace {}, it already exists.", cassandraConfig.getApplicationKeyspace()); return; } @@ -143,6 +144,7 @@ public class DataStaxClusterImpl implements DataStaxCluster { .getKeyspace(CQLUtils.quote( cassandraConfig.getApplicationLocalKeyspace())) != null; if (exists) { + logger.info("Not creating keyspace {}, it already exists.", cassandraConfig.getApplicationLocalKeyspace()); return; }
