Author: [email protected]
Date: Fri Dec 16 15:29:44 2011
New Revision: 1853
Log:
[AMDATUCASSANDRA-139] Upgraded Cassandra from 0.8.7 to 0.8.9 and updated
versions in pom.xmls to released versions
Modified:
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonActivatorImpl.java
trunk/amdatu-cassandra/cassandra-stores/cassandra-store-gadget/pom.xml
trunk/amdatu-cassandra/pom.xml
Modified:
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonActivatorImpl.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonActivatorImpl.java
(original)
+++
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonActivatorImpl.java
Fri Dec 16 15:29:44 2011
@@ -128,15 +128,14 @@
// stage has already been terminated before terminating it.
ThreadPoolExecutor mutationStage =
StageManager.getStage(Stage.MUTATION);
if (!mutationStage.isShutdown()) {
- mutationStage.shutdown();
- mutationStage.awaitTermination(30, TimeUnit.SECONDS);
- CommitLog.instance.shutdownBlocking();
-
+ mutationStage.shutdown();
+ mutationStage.awaitTermination(30, TimeUnit.SECONDS);
+
List<Future<?>> flushes = new ArrayList<Future<?>>();
for (Table table : Table.all())
{
KSMetaData ksm =
DatabaseDescriptor.getKSMetaData(table.name);
- if (!ksm.isDurableWrites())
+ if (!ksm.durableWrites)
{
for (ColumnFamilyStore cfs :
table.getColumnFamilyStores())
{
@@ -147,6 +146,8 @@
}
}
FBUtilities.waitOnFutures(flushes);
+
+ CommitLog.instance.shutdownBlocking();
m_logService.log(LogService.LOG_INFO, "Cassandra Daemon
shutdown completed.");
}
}
Modified: trunk/amdatu-cassandra/cassandra-stores/cassandra-store-gadget/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-stores/cassandra-store-gadget/pom.xml
(original)
+++ trunk/amdatu-cassandra/cassandra-stores/cassandra-store-gadget/pom.xml
Fri Dec 16 15:29:44 2011
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>org.amdatu.opensocial.gadgetmanagement</artifactId>
- <version>0.2.0-RC1</version>
+ <version>0.2.0</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-cassandra/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/pom.xml (original)
+++ trunk/amdatu-cassandra/pom.xml Fri Dec 16 15:29:44 2011
@@ -32,11 +32,11 @@
<properties>
<!-- Version of dependend projects -->
- <amdatu.core.version>0.2.1-RC1</amdatu.core.version>
- <amdatu.web.version>0.2.1-RC1</amdatu.web.version>
+ <amdatu.core.version>0.2.1</amdatu.core.version>
+ <amdatu.web.version>0.2.1</amdatu.web.version>
<!-- Version of cassandra itself -->
- <cassandra.version>0.8.7</cassandra.version>
+ <cassandra.version>0.8.9</cassandra.version>
<!-- Version of SLF4J -->
<slf4j.version>1.6.1</slf4j.version>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
