during tests, drop keyspaces using astyanax driver

Author: mdunker

stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java

@@ -57,7 +57,7 @@ public void create() {
     @Override
     public void create(boolean dropKeyspace) {
         try {
-            setup.initSchema();
+            setup.initSchema(dropKeyspace);
             lockManager.setup();
         }
         catch ( Exception ex ) {
@@ -87,24 +87,7 @@ public void populateBaseData() {
 
     @Override
     public void destroy() {
-        logger.info( "dropping keyspaces" );
-        try {
-            cluster.dropKeyspace( CassandraService.getApplicationKeyspace() );
-        }
-        catch ( RuntimeException ire ) {
-            //swallow if it just doesn't exist
-        }
-
-
-        try {
-            cluster.dropKeyspace( CassandraService.getApplicationKeyspace() );
-        }
-        catch ( RuntimeException ire ) {
-            //swallow if it just doesn't exist
-        }
-
-        logger.info( "keyspaces dropped" );
-
+        logger.info( "keyspace dropping deferred" );
 
         final EsProvider provider =
             SpringResource.getInstance().getBean( Injector.class ).getInstance( EsProvider.class );

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

@@ -134,7 +134,15 @@ private void testAndCreateColumnFamilyDef( MultiTenantColumnFamilyDefinition col
      * Drop keyspace.
      */
     private void dropKeyspace() throws ConnectionException {
-        keyspace.dropKeyspace();
+        try {
+            keyspace.dropKeyspace();
+        }
+        catch (NotFoundException nfe) {
+            logger.info( "Received a NotFoundException when attempting to drop keyspace.  It does not exist" );
+        }
+        catch (ConnectionException e) {
+            logger.info( "Received a ConnectionException when attempting to drop keyspace: {}", e.getMessage());
+        }
     }
 
 

stack/test-utils/src/main/java/org/apache/usergrid/setup/ConcurrentProcessSingleton.java

@@ -98,7 +98,7 @@ private void startSystem() {
 
                 // create our schema
                 logger.info("Creating database");
-                schemaManager.create();
+                schemaManager.create(CLEAN_STORAGE);
 
                 logger.info( "Populating database" );
                 schemaManager.populateBaseData();