Author: [email protected]
Date: Tue Feb 22 10:25:25 2011
New Revision: 810

Log:
[AMDATU-254] Upgraded cassandra from 0.7.0 to 0.7.2

Added:
   
branches/0.2/amdatu-buildsupport/src/main/resources/lib/apache-cassandra-0.7.2.jar
   (contents, props changed)
   
branches/0.2/amdatu-buildsupport/src/main/resources/lib/apache-cassandra-0.7.2.pom
Modified:
   branches/0.2/amdatu-buildsupport/pom.xml
   
branches/0.2/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraConfigurationServiceImpl.java
   
branches/0.2/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml
   branches/0.2/pom.xml

Modified: branches/0.2/amdatu-buildsupport/pom.xml
==============================================================================
--- branches/0.2/amdatu-buildsupport/pom.xml    (original)
+++ branches/0.2/amdatu-buildsupport/pom.xml    Tue Feb 22 10:25:25 2011
@@ -76,6 +76,21 @@
               <packaging>jar</packaging>
             </configuration>
           </execution>
+          <execution>
+            <id>install-apache-cassandra</id>
+            <phase>initialize</phase>
+            <goals>
+              <goal>install-file</goal>
+            </goals>
+            <configuration>
+              
<file>src/main/resources/lib/apache-cassandra-${cassandra.version}.jar</file>
+              
<pomFile>src/main/resources/lib/apache-cassandra-${cassandra.version}.pom</pomFile>
+              <groupId>org.apache.cassandra</groupId>
+              <artifactId>apache-cassandra</artifactId>
+              <version>${cassandra.version}</version>
+              <packaging>jar</packaging>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>

Added: 
branches/0.2/amdatu-buildsupport/src/main/resources/lib/apache-cassandra-0.7.2.jar
==============================================================================
Binary file. No diff available.

Added: 
branches/0.2/amdatu-buildsupport/src/main/resources/lib/apache-cassandra-0.7.2.pom
==============================================================================
--- (empty file)
+++ 
branches/0.2/amdatu-buildsupport/src/main/resources/lib/apache-cassandra-0.7.2.pom
  Tue Feb 22 10:25:25 2011
@@ -0,0 +1,114 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.cassandra</groupId>
+    <artifactId>apache-cassandra</artifactId>
+    <packaging>jar</packaging>
+    <version>0.7.2</version>
+    <name>Apache Cassandra Database</name>
+    <url>http://cassandra.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>
+            UTF-8
+        </project.build.sourceEncoding>
+        <project.reporting.outputEncoding>
+            UTF-8
+        </project.reporting.outputEncoding>
+    </properties>
+
+    <repositories>
+        <repository>
+            <id>riptano</id>
+            <name>riptano</name>
+            <url>http://mvn.riptano.com/content/repositories/public/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>libthrift</groupId>
+            <artifactId>libthrift</artifactId>
+            <version>0.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.cliffc.high_scale_lib</groupId>
+            <artifactId>high-scale-lib</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
+            <artifactId>concurrentlinkedhashmap-lru</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+        <dependency>
+        <groupId>org.safehaus.jug</groupId>
+        <artifactId>jug</artifactId>
+            <version>2.0.0</version>
+            <classifier>asl</classifier>
+        </dependency>
+      <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+          <version>r06</version>
+      </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>avro</artifactId>
+          <version>1.4.0-fixes</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-core</artifactId>
+          <version>0.20.2-320</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-streaming</artifactId>
+          <version>0.20.2-320</version>
+        </dependency>
+        <dependency>
+          <groupId>org.codehaus.jackson</groupId>
+          <artifactId>jackson-core-asl</artifactId>
+          <version>1.4.0</version>
+          <type>jar</type>
+          <scope>compile</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.codehaus.jackson</groupId>
+          <artifactId>jackson-mapper-asl</artifactId>
+          <version>1.4.0</version>
+          <type>jar</type>
+          <scope>compile</scope>
+        </dependency>
+        <dependency>
+          <groupId>commons-lang</groupId>
+          <artifactId>commons-lang</artifactId>
+          <version>2.4</version>
+          <type>jar</type>
+          <scope>compile</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>jetty-util</artifactId>
+          <version>6.1.21</version>
+          <type>jar</type>
+          <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

Modified: 
branches/0.2/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraConfigurationServiceImpl.java
==============================================================================
--- 
branches/0.2/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraConfigurationServiceImpl.java
   (original)
+++ 
branches/0.2/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraConfigurationServiceImpl.java
   Tue Feb 22 10:25:25 2011
@@ -88,6 +88,7 @@
         try {
             m_configTemplateManager.writeConfiguration(url, 
log4jPropertiesFile);
             
PropertyConfigurator.configure(log4jPropertiesFile.getAbsolutePath());
+            System.setProperty("log4j.configuration", 
log4jPropertiesFile.toURI().toString());
             log4jPropertiesFile.deleteOnExit();
         }
         catch (IOException e) {

Modified: 
branches/0.2/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml
==============================================================================
--- 
branches/0.2/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml
  (original)
+++ 
branches/0.2/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml
  Tue Feb 22 10:25:25 2011
@@ -31,6 +31,9 @@
 
 # See http://wiki.apache.org/cassandra/HintedHandoff
 hinted_handoff_enabled: true
+# this defines the maximum amount of time a dead host will have hints
+# generated.  After it has been dead this long, hints will be dropped.
+max_hint_window_in_ms: 3600000 # one hour
 
 # authentication backend, implementing IAuthenticator; used to identify users
 authenticator: org.apache.cassandra.auth.AllowAllAuthenticator
@@ -87,6 +90,31 @@
 # milliseconds.
 commitlog_sync_period_in_ms: 10000
 
+# emergency pressure valve: each time heap usage after a full (CMS)
+# garbage collection is above this fraction of the max, Cassandra will
+# flush the largest memtables.
+#
+# Set to 1.0 to disable.  Setting this lower than
+# CMSInitiatingOccupancyFraction is not likely to be useful.
+#
+# RELYING ON THIS AS YOUR PRIMARY TUNING MECHANISM WILL WORK POORLY:
+# it is most effective under light to moderate load, or read-heavy
+# workloads; under truly massive write load, it will often be too
+# little, too late.
+flush_largest_memtables_at: 0.75
+
+# emergency pressure valve #2: the first time heap usage after a full
+# (CMS) garbage collection is above this fraction of the max,
+# Cassandra will reduce cache maximum _capacity_ to the given fraction
+# of the current _size_.  Should usually be set substantially above
+# flush_largest_memtables_at, since that will have less long-term
+# impact on the system.
+#
+# Set to 1.0 to disable.  Setting this lower than
+# CMSInitiatingOccupancyFraction is not likely to be useful.
+reduce_cache_sizes_at: 0.85
+reduce_cache_capacity_to: 0.6
+
 # Addresses of hosts that are deemed contact points.
 # Cassandra nodes use this list of hosts to find each other and learn
 # the topology of the ring.  You must change this if you are running
@@ -103,12 +131,16 @@
 # non-mmapped i/o.)
 disk_access_mode: auto
 
-# Unlike most systems, in Cassandra writes are faster than reads, so
-# you can afford more of those in parallel.  A good rule of thumb is 2
-# concurrent reads per processor core.  Increase ConcurrentWrites to
-# the number of clients writing at once if you enable CommitLogSync +
-# CommitLogSyncDelay. -->
-concurrent_reads: 8
+# For workloads with more data than can fit in memory, Cassandra's
+# bottleneck will be reads that need to fetch data from
+# disk. "concurrent_reads" should be set to (16 * number_of_drives) in
+# order to allow the operations to enqueue low enough in the stack
+# that the OS and drives can reorder them.
+#
+# On the other hand, since writes are almost never IO bound, the ideal
+# number of "concurrent_writes" is dependent on the number of cores in
+# your system; (8 * number_of_cores) is a good rule of thumb.
+concurrent_reads: 16
 concurrent_writes: 32
 
 # This sets the amount of memtable flush writer threads.  These will
@@ -212,7 +244,7 @@
 #    IP address, respectively
 # org.apache.cassandra.locator.PropertyFileSnitch:
 #  - Proximity is determined by rack and data center, which are
-#    explicitly configured in cassandra-rack.properties.
+#    explicitly configured in cassandra-topology.properties.
 endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch
 
 # dynamic_snitch -- This boolean controls whether the above snitch is

Modified: branches/0.2/pom.xml
==============================================================================
--- branches/0.2/pom.xml        (original)
+++ branches/0.2/pom.xml        Tue Feb 22 10:25:25 2011
@@ -121,7 +121,7 @@
       Version numbers of platform bundles
     -->
     <shindig.version>2.0.0</shindig.version>
-    <cassandra.version>0.7.0</cassandra.version>
+    <cassandra.version>0.7.2</cassandra.version>
   </properties>
 
   <prerequisites>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits

Reply via email to