During test startup, if dropping keyspace, don't check again for existence.

Author: mdunker

stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java

@@ -80,10 +80,11 @@ public void migrate(boolean dropKeyspace) throws MigrationException {
 
             if (dropKeyspace) {
                 dropKeyspace();
+                createKeyspace();
+            } else {
+                testAndCreateKeyspace();
             }
 
-            testAndCreateKeyspace();
-
             for ( Migration migration : migrations ) {
 
                 final Collection<MultiTenantColumnFamilyDefinition> columnFamilies = migration.getColumnFamilies();
@@ -172,13 +173,20 @@ private void testAndCreateKeyspace() throws ConnectionException {
             return;
         }
 
+        createKeyspace();
+
+    }
 
+    /**
+     * Create keyspace, it must not exist (either have checked for it or dropped it).
+     */
+    private void createKeyspace() throws ConnectionException {
         ImmutableMap.Builder<String, Object> strategyOptions = getKeySpaceProps();
 
 
         ImmutableMap<String, Object> options =
-                ImmutableMap.<String, Object>builder().put( "strategy_class", fig.getStrategyClass() )
-                            .put( "strategy_options", strategyOptions.build() ).build();
+            ImmutableMap.<String, Object>builder().put( "strategy_class", fig.getStrategyClass() )
+                .put( "strategy_options", strategyOptions.build() ).build();
 
 
         keyspace.createKeyspace( options );