You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/06/11 14:57:02 UTC
svn commit: r1491771 -
/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
Author: olamy
Date: Tue Jun 11 12:57:01 2013
New Revision: 1491771
URL: http://svn.apache.org/r1491771
Log:
do not create keyspace if exists
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java?rev=1491771&r1=1491770&r2=1491771&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java Tue Jun 11 12:57:01 2013
@@ -23,10 +23,12 @@ import com.google.common.collect.Immutab
import com.netflix.astyanax.AstyanaxContext;
import com.netflix.astyanax.Keyspace;
import com.netflix.astyanax.connectionpool.NodeDiscoveryType;
+import com.netflix.astyanax.connectionpool.exceptions.BadRequestException;
import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
import com.netflix.astyanax.connectionpool.impl.ConnectionPoolConfigurationImpl;
import com.netflix.astyanax.connectionpool.impl.ConnectionPoolType;
import com.netflix.astyanax.connectionpool.impl.CountingConnectionPoolMonitor;
+import com.netflix.astyanax.ddl.KeyspaceDefinition;
import com.netflix.astyanax.impl.AstyanaxConfigurationImpl;
import com.netflix.astyanax.thrift.ThriftFamilyFactory;
import org.springframework.context.ApplicationContext;
@@ -40,7 +42,7 @@ import javax.inject.Inject;
*
* @author Olivier Lamy
*/
-@Service("archivaEntityManagerFactory#cassandra")
+@Service( "archivaEntityManagerFactory#cassandra" )
public class DefaultCassandraEntityManagerFactory
implements CassandraEntityManagerFactory
{
@@ -82,7 +84,26 @@ public class DefaultCassandraEntityManag
"1" ).build() ).put(
"strategy_class", "SimpleStrategy" ).build();
- keyspace.createKeyspace( options );
+ // test if the namespace already exists if exception or null create it
+ boolean keyspaceExists = false;
+ try
+ {
+ KeyspaceDefinition keyspaceDefinition = keyspace.describeKeyspace();
+ if ( keyspaceDefinition != null )
+ {
+ keyspaceExists = true;
+ }
+
+ }
+ catch ( ConnectionException e )
+ {
+ }
+
+ if ( !keyspaceExists )
+ {
+ keyspace.createKeyspace( options );
+ }
+
}