Fixed keyspace options to match new setup. Previous did not work in real cluster since optiosn are different for replication strategy.
Cleaned up usage in CassandraResource to have single code path Removed after logic. In parallel execution this removes keyspaces as other tests are running Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/500a3276 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/500a3276 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/500a3276 Branch: refs/heads/two-dot-o Commit: 500a3276544e780226f26c4b887b49eadc6da7be Parents: a103e7d Author: Todd Nine <[email protected]> Authored: Mon Nov 10 17:47:37 2014 -0700 Committer: Todd Nine <[email protected]> Committed: Mon Nov 10 17:47:37 2014 -0700 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 2 +- .../src/test/resources/usergrid-test.properties | 2 +- .../apache/usergrid/ConcurrentCoreITSuite.java | 2 +- .../usergrid/ConcurrentCoreIteratorITSuite.java | 2 +- .../org/apache/usergrid/CoreApplication.java | 3 +- .../java/org/apache/usergrid/CoreITSuite.java | 2 +- .../usergrid/cassandra/CassandraResource.java | 272 ++++--------------- .../cassandra/CassandraResourceTest.java | 7 +- 8 files changed, 66 insertions(+), 226 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/500a3276/stack/config/src/main/resources/usergrid-default.properties ---------------------------------------------------------------------- diff --git a/stack/config/src/main/resources/usergrid-default.properties b/stack/config/src/main/resources/usergrid-default.properties index a2d73be..c840d21 100644 --- a/stack/config/src/main/resources/usergrid-default.properties +++ b/stack/config/src/main/resources/usergrid-default.properties @@ -84,7 +84,7 @@ cassandra.keyspace.strategy=org.apache.cassandra.locator.SimpleStrategy #cassandra.keyspace.strategy.options.replication_factor=1 #cassandra.keyspace.strategy.options.us-east=1 -cassandra.keyspace.replication=1 +cassandra.keyspace.replication=replication_factor:1 cassandra.username= cassandra.password= http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/500a3276/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 7d1da1e..cfa1f2f 100644 --- a/stack/config/src/test/resources/usergrid-test.properties +++ b/stack/config/src/test/resources/usergrid-test.properties @@ -42,7 +42,7 @@ cassandra.keyspace.strategy=org.apache.cassandra.locator.SimpleStrategy #cassandra.keyspace.strategy.options.replication_factor=1 #cassandra.keyspace.strategy.options.us-east=1 -cassandra.keyspace.replication=1 +cassandra.keyspace.replication=replication_factor:1 cassandra.username= cassandra.password= http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/500a3276/stack/core/src/test/java/org/apache/usergrid/ConcurrentCoreITSuite.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/ConcurrentCoreITSuite.java b/stack/core/src/test/java/org/apache/usergrid/ConcurrentCoreITSuite.java index e598a71..d981ee9 100644 --- a/stack/core/src/test/java/org/apache/usergrid/ConcurrentCoreITSuite.java +++ b/stack/core/src/test/java/org/apache/usergrid/ConcurrentCoreITSuite.java @@ -47,5 +47,5 @@ import org.apache.usergrid.system.UsergridSystemMonitorIT; @Concurrent() public class ConcurrentCoreITSuite { @ClassRule - public static CassandraResource cassandraResource = CassandraResource.newWithAvailablePorts( "coreManager" ); + public static CassandraResource cassandraResource = CassandraResource.newWithAvailablePorts( ); } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/500a3276/stack/core/src/test/java/org/apache/usergrid/ConcurrentCoreIteratorITSuite.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/ConcurrentCoreIteratorITSuite.java b/stack/core/src/test/java/org/apache/usergrid/ConcurrentCoreIteratorITSuite.java index fec436e..273c6df 100644 --- a/stack/core/src/test/java/org/apache/usergrid/ConcurrentCoreIteratorITSuite.java +++ b/stack/core/src/test/java/org/apache/usergrid/ConcurrentCoreIteratorITSuite.java @@ -76,7 +76,7 @@ import org.apache.usergrid.persistence.query.SingleOrderBySameRangeScanLessThanE public class ConcurrentCoreIteratorITSuite { @ClassRule - public static CassandraResource cassandraResource = CassandraResource.newWithAvailablePorts( "coreManager" ); + public static CassandraResource cassandraResource = CassandraResource.newWithAvailablePorts( ); @ClassRule public static ElasticSearchResource elasticSearchResource = new ElasticSearchResource().startEs(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/500a3276/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java b/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java index fd8ca9b..f6d9132 100644 --- a/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java +++ b/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java @@ -35,6 +35,7 @@ import org.apache.usergrid.persistence.Results; import static junit.framework.Assert.assertNotNull; import org.apache.usergrid.persistence.EntityRef; import org.apache.usergrid.persistence.SimpleEntityRef; +import org.apache.usergrid.persistence.model.util.UUIDGenerator; public class CoreApplication implements Application, TestRule { @@ -145,7 +146,7 @@ public class CoreApplication implements Application, TestRule { protected void before( Description description ) throws Exception { - orgName = description.getClassName(); + orgName = description.getClassName()+ UUIDGenerator.newTimeUUID(); appName = description.getMethodName(); id = setup.createApplication( orgName, appName ); assertNotNull( id ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/500a3276/stack/core/src/test/java/org/apache/usergrid/CoreITSuite.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/CoreITSuite.java b/stack/core/src/test/java/org/apache/usergrid/CoreITSuite.java index 41997ae..ccdcd98 100644 --- a/stack/core/src/test/java/org/apache/usergrid/CoreITSuite.java +++ b/stack/core/src/test/java/org/apache/usergrid/CoreITSuite.java @@ -48,7 +48,7 @@ import org.apache.usergrid.system.UsergridSystemMonitorIT; public class CoreITSuite { @ClassRule - public static CassandraResource cassandraResource = CassandraResource.newWithAvailablePorts( "coreManager" ); + public static CassandraResource cassandraResource = CassandraResource.newWithAvailablePorts( ); @ClassRule public static ElasticSearchResource elasticSearchResource = new ElasticSearchResource().startEs(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/500a3276/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 3de0144..91acf79 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 @@ -17,7 +17,6 @@ package org.apache.usergrid.cassandra; -import java.io.File; import java.io.IOException; import java.util.Properties; @@ -27,10 +26,7 @@ import org.slf4j.LoggerFactory; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.apache.commons.io.FileUtils; import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.RandomStringUtils; -import org.apache.commons.lang.math.RandomUtils; /** @@ -55,22 +51,14 @@ public class CassandraResource extends ExternalResource { public static final String DEFAULT_HOST = "127.0.0.1"; public static final String PROPERTIES_FILE = "project.properties"; - public static final String TARGET_DIRECTORY_KEY = "target.directory"; - public static final String DATA_FILE_DIR_KEY = "data_file_directories"; - public static final String COMMIT_FILE_DIR_KEY = "commitlog_directory"; - public static final String SAVED_CACHES_DIR_KEY = "saved_caches_directory"; public static final String NATIVE_TRANSPORT_PORT_KEY = "native_transport_port"; public static final String RPC_PORT_KEY = "rpc_port"; public static final String STORAGE_PORT_KEY = "storage_port"; public static final String SSL_STORAGE_PORT_KEY = "ssl_storage_port"; - public static final String JAMM_PATH = "jamm.path"; private static final Object lock = new Object(); - private final File tempDir; - private final String schemaManagerName; - private boolean initialized = false; private int rpcPort = DEFAULT_RPC_PORT; private int storagePort = DEFAULT_STORAGE_PORT; @@ -81,43 +69,23 @@ public class CassandraResource extends ExternalResource { private SchemaManager schemaManager; private static CassandraResource instance; - private Thread shutdown; private static Properties properties = null; /** - * Creates a Cassandra starting ExternalResource for JUnit test cases which uses the default SchemaManager for - * Cassandra. - */ - @SuppressWarnings( "UnusedDeclaration" ) - CassandraResource() throws IOException { - this( null, DEFAULT_RPC_PORT, DEFAULT_STORAGE_PORT, DEFAULT_SSL_STORAGE_PORT, DEFAULT_NATIVE_TRANSPORT_PORT ); - } - - - /** * Creates a Cassandra starting ExternalResource for JUnit test cases which uses the specified SchemaManager for * Cassandra. */ - CassandraResource( String schemaManagerName, int rpcPort, int storagePort, int sslStoragePort, - int nativeTransportPort ) { + CassandraResource( int rpcPort, int storagePort, int sslStoragePort, int nativeTransportPort ) { LOG.info( "Creating CassandraResource using {} for the ClassLoader.", Thread.currentThread().getContextClassLoader() ); - this.schemaManagerName = schemaManagerName; this.rpcPort = rpcPort; this.storagePort = storagePort; this.sslStoragePort = sslStoragePort; this.nativeTransportPort = nativeTransportPort; - try { - this.tempDir = getTempDirectory(); - } - catch ( IOException e ) { - LOG.error( "Failed to create temporary directory for Cassandra instance.", e ); - throw new RuntimeException( e ); - } try { String[] locations = { "usergrid-properties-context.xml" }; @@ -125,7 +93,6 @@ public class CassandraResource extends ExternalResource { Properties properties = ( Properties ) appContext.getBean( "properties" ); properties.putAll( ArrayUtils.toMap( this.getProjectProperties().entrySet().toArray( new Object[] { } ) ) ); - String forkString = properties.getProperty( "cassandra.startup" ); } catch ( Exception ex ) { throw new RuntimeException( "Error getting properties", ex ); @@ -134,16 +101,6 @@ public class CassandraResource extends ExternalResource { /** - * Creates a Cassandra starting ExternalResource for JUnit test cases which uses the specified SchemaManager for - * Cassandra. - */ - public CassandraResource( int rpcPort, int storagePort, int sslStoragePort, int nativeTransportPort ) - throws IOException { - this( null, rpcPort, storagePort, sslStoragePort, nativeTransportPort ); - } - - - /** * Gets the rpcPort for Cassandra. * * @return the rpc_port (in yaml file) used by Cassandra @@ -179,17 +136,6 @@ public class CassandraResource extends ExternalResource { /** - * Gets the temporary directory created for this CassandraResource. - * - * @return the temporary directory - */ - @SuppressWarnings( "UnusedDeclaration" ) - public File getTemporaryDirectory() { - return tempDir; - } - - - /** * Gets a bean from the application context. * * @param requiredType the type of the bean @@ -227,15 +173,6 @@ public class CassandraResource extends ExternalResource { } - @Override - public String toString() { - return "\n" + "cassandra.yaml = " + new File( tempDir, "cassandra.yaml" ) + "\n" + RPC_PORT_KEY + " = " - + rpcPort + "\n" + STORAGE_PORT_KEY + " = " + storagePort + "\n" + SSL_STORAGE_PORT_KEY + " = " - + sslStoragePort + "\n" + NATIVE_TRANSPORT_PORT_KEY + " = " + nativeTransportPort + "\n" - + DATA_FILE_DIR_KEY + " = " + new File( tempDir, "data" ).toString() + "\n" + COMMIT_FILE_DIR_KEY - + " = " + new File( tempDir, "commitlog" ).toString() + "\n" + SAVED_CACHES_DIR_KEY + " = " + new File( - tempDir, "saved_caches" ).toString() + "\n"; - } /** @@ -276,29 +213,10 @@ public class CassandraResource extends ExternalResource { } startCassandraExternal(); - - // if ( forkCassandra ) { - // startCassandraForked(); - // } else if (externalCassandra) { - // - // }else { - // - // startCassandraEmbedded(); - // } } } - private void addShutdownHook() { - Runtime.getRuntime().addShutdownHook( new Thread() { - @Override - public void run() { - after(); - } - } ); - } - - private void startCassandraExternal() throws Throwable { LOG.info( "-------------------------------------------------------------------" ); LOG.info( "Initializing External Cassandra" ); @@ -310,10 +228,8 @@ public class CassandraResource extends ExternalResource { String[] locations = { "usergrid-test-context.xml" }; applicationContext = new ClassPathXmlApplicationContext( locations ); applicationContext.refresh(); - loadSchemaManager( schemaManagerName ); + loadSchemaManager(); initialized = true; - - LOG.info( "External Cassandra resource at {} is ready!", tempDir.toString() ); lock.notifyAll(); } @@ -322,112 +238,69 @@ public class CassandraResource extends ExternalResource { @Override protected synchronized void after() { super.after(); - - shutdown = new Thread() { - @Override - public void run() { - try { - Thread.currentThread(); - Thread.sleep( 100L ); - } - catch ( InterruptedException ignored ) { - } - - - if ( schemaManager != null ) { - LOG.info( "Destroying schemaManager..." ); - try { - schemaManager.destroy(); - } - catch ( Exception e ) { - LOG.error( "Ignoring failures while dropping keyspaces: {}", e.getMessage() ); - } - - LOG.info( "SchemaManager destroyed..." ); - } - - applicationContext.stop(); - LOG.info( "ApplicationContext stopped..." ); - } - }; - - shutdown.start(); + //We don't want to actually remove our schema. Since our tests are multi threaded, the resource may still be + // in use + // + // shutdown = new Thread() { + // @Override + // public void run() { + // try { + // Thread.currentThread(); + // Thread.sleep( 100L ); + // } + // catch ( InterruptedException ignored ) { + // } + // + // + // if ( schemaManager != null ) { + // LOG.info( "Destroying schemaManager..." ); + // try { + // schemaManager.destroy(); + // } + // catch ( Exception e ) { + // LOG.error( "Ignoring failures while dropping keyspaces: {}", e.getMessage() ); + // } + // + // LOG.info( "SchemaManager destroyed..." ); + // } + // + // applicationContext.stop(); + // LOG.info( "ApplicationContext stopped..." ); + // } + // }; + // + // shutdown.start(); } /** * Loads the specified {@link SchemaManager} or the default manager if the manager name that is provided is null. * - * @param schemaManagerName the name of the SchemaManager to load, or null + * */ - private void loadSchemaManager( String schemaManagerName ) { + private void loadSchemaManager() { if ( !applicationContext.isActive() ) { LOG.info( "Restarting context..." ); applicationContext.refresh(); } - if ( schemaManagerName != null ) { - LOG.info( "Looking up SchemaManager impl: {}", schemaManagerName ); - this.schemaManager = applicationContext.getBean( schemaManagerName, SchemaManager.class ); - } - else { - LOG.info( "The SchemaManager is not specified - using the default SchemaManager impl" ); - this.schemaManager = applicationContext.getBean( SchemaManager.class ); - } + + LOG.info( "The SchemaManager is not specified - using the default SchemaManager impl" ); + this.schemaManager = applicationContext.getBean( SchemaManager.class ); schemaManager.create(); schemaManager.populateBaseData(); } - /** - * Creates a new instance of the CassandraResource with rpc and storage ports that may or may not be the default - * ports. If either port is taken, an alternative free port is found. - * - * @param schemaManagerName the name of the schemaManager to use - * - * @return a new CassandraResource with possibly non-default ports - */ - public static CassandraResource newWithAvailablePorts( String schemaManagerName ) { - // Uncomment to test for Surefire Failures - // System.setSecurityManager( new NoExitSecurityManager( System.getSecurityManager() ) ); - + public static CassandraResource newWithMavenAllocatedPorts() { synchronized ( lock ) { - if ( instance != null ) { - return instance; - } - int rpcPort = AvailablePortFinder - .getNextAvailable( CassandraResource.DEFAULT_RPC_PORT + RandomUtils.nextInt( 1000 ) ); - int storagePort = AvailablePortFinder - .getNextAvailable( CassandraResource.DEFAULT_STORAGE_PORT + RandomUtils.nextInt( 1000 ) ); - int sslStoragePort = AvailablePortFinder - .getNextAvailable( CassandraResource.DEFAULT_SSL_STORAGE_PORT + RandomUtils.nextInt( 1000 ) ); - int nativeTransportPort = AvailablePortFinder - .getNextAvailable( CassandraResource.DEFAULT_NATIVE_TRANSPORT_PORT + RandomUtils.nextInt( 1000 ) ); - - if ( rpcPort == storagePort ) { - storagePort++; - storagePort = AvailablePortFinder.getNextAvailable( storagePort ); - } - - if ( sslStoragePort == storagePort ) { - sslStoragePort++; - sslStoragePort = AvailablePortFinder.getNextAvailable( sslStoragePort ); + //don't keep re-initializing if it's already done + if(instance != null){ + return instance; } - instance = new CassandraResource( schemaManagerName, rpcPort, storagePort, sslStoragePort, - nativeTransportPort ); - - LOG.info( "Created a new instance of CassandraResource: {}", instance ); - LOG.info( "Cassandra using ports {} and {}", storagePort, sslStoragePort ); - return instance; - } - } - - - public static CassandraResource newWithMavenAllocatedPorts() { - synchronized ( lock ) { Properties props = new Properties(); try { props.load( ClassLoader.getSystemResourceAsStream( "project.properties" ) ); @@ -444,10 +317,6 @@ public class CassandraResource extends ExternalResource { int nativeTransportPort = Integer.parseInt( props.getProperty( "cassandra.nativeTransportPort", Integer.toString( CassandraResource.DEFAULT_NATIVE_TRANSPORT_PORT ) ) ); String host = props.getProperty( "cassandra.host", DEFAULT_HOST ); - // int rpcPort = CassandraResource.DEFAULT_RPC_PORT; - // int storagePort = CassandraResource.DEFAULT_STORAGE_PORT ; - // int sslStoragePort = CassandraResource.DEFAULT_SSL_STORAGE_PORT; - // int nativeTransportPort = CassandraResource.DEFAULT_NATIVE_TRANSPORT_PORT; System.setProperty( "cassandra.url", host + ":" + Integer.toString( rpcPort ) ); System.setProperty( "cassandra.cluster", props.getProperty( "cassandra.cluster", "Usergrid" ) ); @@ -466,7 +335,7 @@ public class CassandraResource extends ExternalResource { new Object[] { rpcPort, storagePort, sslStoragePort, nativeTransportPort } ); - instance = new CassandraResource( null, rpcPort, storagePort, sslStoragePort, nativeTransportPort ); + instance = new CassandraResource( rpcPort, storagePort, sslStoragePort, nativeTransportPort ); LOG.info( "Created a new instance of CassandraResource: {}", instance ); LOG.info( "Cassandra using ports {} and {}", storagePort, sslStoragePort ); @@ -487,45 +356,6 @@ public class CassandraResource extends ExternalResource { } - /** - * Uses a project.properties file that Maven does substitution on to to replace the value of a property with the - * path to the Maven build directory (a.k.a. target). It then uses this path to generate a random String which it - * uses to append a path component to so a unique directory is selected. If already present it's deleted, then the - * directory is created. - * - * @return a unique temporary directory - * - * @throws IOException if we cannot access the properties file - */ - public static File getTempDirectory() throws IOException { - File tmpdir; - File basedir = new File( ( String ) getProjectProperties().get( TARGET_DIRECTORY_KEY ) ); - String comp = RandomStringUtils.randomAlphanumeric( 7 ); - tmpdir = new File( basedir, comp ); - - if ( tmpdir.exists() ) { - LOG.info( "Deleting directory: {}", tmpdir ); - FileUtils.forceDelete( tmpdir ); - } - else { - LOG.info( "Creating temporary directory: {}", tmpdir ); - FileUtils.forceMkdir( tmpdir ); - } - - return tmpdir; - } - - - public static String getTargetDir() throws IOException { - File basedir = new File( ( String ) getProjectProperties().get( TARGET_DIRECTORY_KEY ) ); - return basedir.getAbsolutePath(); - } - - - public static String getJammArgument() throws IOException { - return ( String ) getProjectProperties().get( JAMM_PATH ); - } - public static Properties getProjectProperties() throws IOException { if ( properties == null ) { @@ -534,4 +364,18 @@ public class CassandraResource extends ExternalResource { } return properties; } + + + @Override + public String toString() { + return "CassandraResource{" + + "initialized=" + initialized + + ", rpcPort=" + rpcPort + + ", storagePort=" + storagePort + + ", sslStoragePort=" + sslStoragePort + + ", nativeTransportPort=" + nativeTransportPort + + ", applicationContext=" + applicationContext + + ", schemaManager=" + schemaManager + + "} " + super.toString(); + } } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/500a3276/stack/test-utils/src/test/java/org/apache/usergrid/cassandra/CassandraResourceTest.java ---------------------------------------------------------------------- diff --git a/stack/test-utils/src/test/java/org/apache/usergrid/cassandra/CassandraResourceTest.java b/stack/test-utils/src/test/java/org/apache/usergrid/cassandra/CassandraResourceTest.java index 50f4d35..bbecfbc 100644 --- a/stack/test-utils/src/test/java/org/apache/usergrid/cassandra/CassandraResourceTest.java +++ b/stack/test-utils/src/test/java/org/apache/usergrid/cassandra/CassandraResourceTest.java @@ -80,12 +80,7 @@ public class CassandraResourceTest { } - @Test - public void testTmpDirectory() throws Exception { - File tmpdir = CassandraResource.getTempDirectory(); - assertTrue( tmpdir.toString().contains( "target" ) ); - assertTrue( tmpdir.exists() ); - } + /**
