cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r1214927 - in /cassandra/trunk: ./ contrib/ debian/ interface/thrift/gen-java/org/apache/cassandra/thrift/ pylib/cqlshlib/ src/java/org/apache/cassandra/db/ src/java/org/apache/cassandra/db/migration/ src/java/org/apache/cassandra/gms/ src/...
Date Thu, 15 Dec 2011 19:34:41 GMT
Author: jbellis
Date: Thu Dec 15 19:34:40 2011
New Revision: 1214927

URL: http://svn.apache.org/viewvc?rev=1214927&view=rev
Log:
merge from 1.0

Added:
    cassandra/trunk/debian/cassandra-sysctl.conf
Removed:
    cassandra/trunk/test/distributed/README.txt
    cassandra/trunk/test/distributed/org/apache/cassandra/CassandraServiceController.java
    cassandra/trunk/test/distributed/org/apache/cassandra/CountersTest.java
    cassandra/trunk/test/distributed/org/apache/cassandra/MovementTest.java
    cassandra/trunk/test/distributed/org/apache/cassandra/MutationTest.java
    cassandra/trunk/test/distributed/org/apache/cassandra/TestBase.java
    cassandra/trunk/test/distributed/org/apache/cassandra/utils/BlobUtils.java
    cassandra/trunk/test/distributed/org/apache/cassandra/utils/KeyPair.java
Modified:
    cassandra/trunk/   (props changed)
    cassandra/trunk/.rat-excludes
    cassandra/trunk/CHANGES.txt
    cassandra/trunk/NEWS.txt
    cassandra/trunk/build.xml
    cassandra/trunk/contrib/   (props changed)
    cassandra/trunk/debian/changelog
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java 
 (props changed)
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java   (props
changed)
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
  (props changed)
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
  (props changed)
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
  (props changed)
    cassandra/trunk/pylib/cqlshlib/cqlhandling.py
    cassandra/trunk/src/java/org/apache/cassandra/db/DataTracker.java
    cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java
    cassandra/trunk/src/java/org/apache/cassandra/db/migration/DropKeyspace.java
    cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java
    cassandra/trunk/src/java/org/apache/cassandra/gms/GossiperMBean.java
    cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
    cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
    cassandra/trunk/test/cassandra.in.sh
    cassandra/trunk/test/unit/org/apache/cassandra/service/RemoveTest.java

Propchange: cassandra/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 15 19:34:40 2011
@@ -1,11 +1,12 @@
 /cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1131291
 /cassandra/branches/cassandra-0.7:1026516-1211709
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1198724,1198726-1206097,1206099-1211976
+/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1198724,1198726-1206097,1206099-1212854,1212938
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
-/cassandra/branches/cassandra-1.0:1167085-1211978,1212284,1213775
+/cassandra/branches/cassandra-1.0:1167085-1213775
 /cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1181093,1181741,1181816,1181820,1182951,1183243
+/cassandra/branches/cassandra-1.0.5:1208016
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3:774578-796573

Modified: cassandra/trunk/.rat-excludes
URL: http://svn.apache.org/viewvc/cassandra/trunk/.rat-excludes?rev=1214927&r1=1214926&r2=1214927&view=diff
==============================================================================
--- cassandra/trunk/.rat-excludes (original)
+++ cassandra/trunk/.rat-excludes Thu Dec 15 19:34:40 2011
@@ -29,3 +29,4 @@ drivers/txpy/txcql/cassandra/*
 drivers/py/cql/cassandra/*
 doc/cql/CQL*
 build.properties.default
+test/data/legacy-sstables/**

Modified: cassandra/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1214927&r1=1214926&r2=1214927&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Thu Dec 15 19:34:40 2011
@@ -27,7 +27,12 @@
  * more efficient allocation of small bloom filters (CASSANDRA-3618)
 
 
+1.0.7
+ * fix assertion when dropping a columnfamily with no sstables (CASSANDRA-3614)
+
+
 1.0.6
+ * (CQL) fix cqlsh support for replicate_on_write (CASSANDRA-3596)
  * fix adding to leveled manifest after streaming (CASSANDRA-3536)
  * filter out unavailable cipher suites when using encryption (CASSANDRA-3178)
  * (HADOOP) add old-style api support for CFIF and CFRR (CASSANDRA-2799)
@@ -49,13 +54,20 @@
  * add back partitioner to sstable metadata (CASSANDRA-3540)
  * fix NPE in get_count for counters (CASSANDRA-3601)
 Merged from 0.8:
+ * remove invalid assertion that table was opened before dropping it
+   (CASSANDRA-3580)
+ * range and index scans now only send requests to enough replicas to
+   satisfy requested CL + RR (CASSANDRA-3598)
  * use cannonical host for local node in nodetool info (CASSANDRA-3556)
+ * remove nonlocal DC write optimization since it only worked with
+   CL.ONE or CL.LOCAL_QUORUM (CASSANDRA-3577, 3585)
  * detect misuses of CounterColumnType (CASSANDRA-3422)
  * turn off string interning in json2sstable, take 2 (CASSANDRA-2189)
  * validate compression parameters on add/update of the ColumnFamily 
    (CASSANDRA-3573)
  * Check for 0.0.0.0 is incorrect in CFIF (CASSANDRA-3584)
  * Increase vm.max_map_count in debian packaging (CASSANDRA-3563)
+ * gossiper will never add itself to saved endpoints (CASSANDRA-3485)
 
 
 1.0.5

Modified: cassandra/trunk/NEWS.txt
URL: http://svn.apache.org/viewvc/cassandra/trunk/NEWS.txt?rev=1214927&r1=1214926&r2=1214927&view=diff
==============================================================================
--- cassandra/trunk/NEWS.txt (original)
+++ cassandra/trunk/NEWS.txt Thu Dec 15 19:34:40 2011
@@ -33,15 +33,28 @@ Upgrading
       want to use such large batches.
 
 
+1.0.6
+=====
+
+Upgrading
+---------
+    - This release fixes an issue related to the chunk_length_kb option for
+      compressed sstables. If you use compression on some column families, it
+      is recommended after the upgrade to check the value for this option on
+      these column families (the default value is 64). In case the option would
+      not be set correctly, you should update the column family definition,
+      setting the right value and then run scrub on the column family.
+    - Please report to instruction for 1.0.5 if coming from an older version.
+
+
 1.0.5
 =====
 
-JMX
----
-    - A command has been added to stop running compaction. It is available
-      through JMX and through nodetool stop <type> (see the nodetool help for
-      details). Please note that stopped compaction are terminated and cannot
-      be restarted afterwards.
+Upgrading
+---------
+    - 1.0.5 comes to fix two important regression of 1.0.4. So all information
+      concerning 1.0.4 are valid for this release, but please avoids upgrading
+      to 1.0.4.
 
 
 1.0.4

Modified: cassandra/trunk/build.xml
URL: http://svn.apache.org/viewvc/cassandra/trunk/build.xml?rev=1214927&r1=1214926&r2=1214927&view=diff
==============================================================================
--- cassandra/trunk/build.xml (original)
+++ cassandra/trunk/build.xml Thu Dec 15 19:34:40 2011
@@ -59,7 +59,6 @@
     <property name="test.name" value="*Test"/>
     <property name="test.unit.src" value="${test.dir}/unit"/>
     <property name="test.long.src" value="${test.dir}/long"/>
-    <property name="test.distributed.src" value="${test.dir}/distributed"/>
     <property name="dist.dir" value="${build.dir}/dist"/>
     <condition property="version" value="${base.version}">
       <isset property="release"/>
@@ -285,9 +284,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
       <artifact:remoteRepository id="central"   url="${artifact.remoteRepository.central}"/>
       <artifact:remoteRepository id="java.net2" url="${artifact.remoteRepository.java.net2}"/>
       <artifact:remoteRepository id="apache"    url="${artifact.remoteRepository.apache}"/>
-      <!-- for distributed tests -->
-      <artifact:remoteRepository id="jclouds"   url="${artifact.remoteRepository.jclouds}"/>
-      <artifact:remoteRepository id="oauth"     url="${artifact.remoteRepository.oauth}"/>
 
       <macrodef name="install">
         <attribute name="pomFile"/>
@@ -969,22 +965,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
     </copy>
   </target>
 
-  <target name="build-distributed-test" depends="build-test,maven-ant-tasks-retrieve-test"
description="Compile distributed test classes (which have additional deps)">
-    <javac
-     debug="true"
-     debuglevel="${debuglevel}"
-     destdir="${test.classes}">
-      <classpath>
-          <path refid="cassandra.classpath"/>
-          <pathelement location="${test.classes}"/>
-          <fileset dir="${test.lib}">
-            <include name="**/*.jar" />
-          </fileset>
-      </classpath>
-      <src path="${test.distributed.src}"/>
-    </javac>
-  </target>
-
   <macrodef name="testmacro">
     <attribute name="suitename" />
     <attribute name="inputdir" />
@@ -1036,6 +1016,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
     <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="60000">
       <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
       <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
+      <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
     </testmacro>
   </target>
     
@@ -1044,6 +1025,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
       <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
       <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
       <jvmarg value="-Dcassandra.test.compression=true"/>
+      <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
     </testmacro>
   </target>
 
@@ -1070,14 +1052,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
   <target name="long-test" depends="build-test" description="Execute functional tests">
     <testmacro suitename="long" inputdir="${test.long.src}"
                timeout="${test.long.timeout}" />
-  </target>
-
-  <!-- Depends on artifacts so that we can push a tarball to remote nodes, and has its
own build target for cloudy deps. -->
-  <target name="distributed-test" depends="build-distributed-test,artifacts" description="Execute
distributed tests: see ${test.distributed.src}/README.txt">
-    <testmacro suitename="distributed" inputdir="${test.distributed.src}" timeout="1200000"
forkmode="once">
-      <jvmarg value="-Dwhirr.config=${whirr.config}"/>
-      <jvmarg value="-Dwhirr.cassandra_tarball=${build.dir}/${final.name}-bin.tar.gz"/>
-    </testmacro>
+      <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
   </target>
 
   <!-- instruments the classes to later create code coverage reports -->

Propchange: cassandra/trunk/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 15 19:34:40 2011
@@ -1,11 +1,12 @@
 /cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
 /cassandra/branches/cassandra-0.7/contrib:1026516-1211709
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1198724,1198726-1206097,1206099-1211976
+/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1198724,1198726-1206097,1206099-1212854,1212938
 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369
 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018
-/cassandra/branches/cassandra-1.0/contrib:1167085-1211978,1212284,1213775
+/cassandra/branches/cassandra-1.0/contrib:1167085-1213775
 /cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1181093,1181741,1181816,1181820,1182951,1183243
+/cassandra/branches/cassandra-1.0.5/contrib:1208016
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/contrib:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3/contrib:774578-796573

Added: cassandra/trunk/debian/cassandra-sysctl.conf
URL: http://svn.apache.org/viewvc/cassandra/trunk/debian/cassandra-sysctl.conf?rev=1214927&view=auto
==============================================================================
--- cassandra/trunk/debian/cassandra-sysctl.conf (added)
+++ cassandra/trunk/debian/cassandra-sysctl.conf Thu Dec 15 19:34:40 2011
@@ -0,0 +1 @@
+vm.max_map_count = 1048575

Modified: cassandra/trunk/debian/changelog
URL: http://svn.apache.org/viewvc/cassandra/trunk/debian/changelog?rev=1214927&r1=1214926&r2=1214927&view=diff
==============================================================================
--- cassandra/trunk/debian/changelog (original)
+++ cassandra/trunk/debian/changelog Thu Dec 15 19:34:40 2011
@@ -1,3 +1,15 @@
+cassandra (1.0.6) unstable; urgency=low
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Sat, 10 Dec 2011 18:21:50 -0600
+
+cassandra (1.0.5) unstable; urgency=low
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Tue, 29 Nov 2011 19:36:09 +0100
+
 cassandra (1.0.4) unstable; urgency=low
 
   * New release

Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 15 19:34:40 2011
@@ -1,11 +1,12 @@
 /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1211709
 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1198724,1198726-1206097,1206099-1211976
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1198724,1198726-1206097,1206099-1212854,1212938
 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1130369
 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1125018
-/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167085-1211978,1212284,1213775
+/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167085-1213775
 /cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1167229,1167232-1181093,1181741,1181816,1181820,1182951,1183243
+/cassandra/branches/cassandra-1.0.5/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1208016
 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573

Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 15 19:34:40 2011
@@ -1,11 +1,12 @@
 /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1211709
 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090934-1125013,1125019-1198724,1198726-1206097,1206099-1211976
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090934-1125013,1125019-1198724,1198726-1206097,1206099-1212854,1212938
 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1125021-1130369
 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1101014-1125018
-/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1167085-1211978,1212284,1213775
+/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1167085-1213775
 /cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1167104-1167229,1167232-1181093,1181741,1181816,1181820,1182951,1183243
+/cassandra/branches/cassandra-1.0.5/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1208016
 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/column_t.java:774578-792198

Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 15 19:34:40 2011
@@ -1,11 +1,12 @@
 /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026516-1211709
 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1090934-1125013,1125019-1198724,1198726-1206097,1206099-1211976
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1090934-1125013,1125019-1198724,1198726-1206097,1206099-1212854,1212938
 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1125021-1130369
 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1101014-1125018
-/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1167085-1211978,1212284,1213775
+/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1167085-1213775
 /cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1167104-1167229,1167232-1181093,1181741,1181816,1181820,1182951,1183243
+/cassandra/branches/cassandra-1.0.5/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1208016
 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:774578-796573

Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 15 19:34:40 2011
@@ -1,11 +1,12 @@
 /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026516-1211709
 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1090934-1125013,1125019-1198724,1198726-1206097,1206099-1211976
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1090934-1125013,1125019-1198724,1198726-1206097,1206099-1212854,1212938
 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1125021-1130369
 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1101014-1125018
-/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1167085-1211978,1212284,1213775
+/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1167085-1213775
 /cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1167104-1167229,1167232-1181093,1181741,1181816,1181820,1182951,1183243
+/cassandra/branches/cassandra-1.0.5/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1208016
 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:774578-796573

Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 15 19:34:40 2011
@@ -1,11 +1,12 @@
 /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026516-1211709
 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1090934-1125013,1125019-1198724,1198726-1206097,1206099-1211976
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1090934-1125013,1125019-1198724,1198726-1206097,1206099-1212854,1212938
 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1125021-1130369
 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1101014-1125018
-/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1167085-1211978,1212284,1213775
+/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1167085-1213775
 /cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1167104-1167229,1167232-1181093,1181741,1181816,1181820,1182951,1183243
+/cassandra/branches/cassandra-1.0.5/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1208016
 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:774578-792198

Modified: cassandra/trunk/pylib/cqlshlib/cqlhandling.py
URL: http://svn.apache.org/viewvc/cassandra/trunk/pylib/cqlshlib/cqlhandling.py?rev=1214927&r1=1214926&r2=1214927&view=diff
==============================================================================
--- cassandra/trunk/pylib/cqlshlib/cqlhandling.py (original)
+++ cassandra/trunk/pylib/cqlshlib/cqlhandling.py Thu Dec 15 19:34:40 2011
@@ -37,7 +37,7 @@ columnfamily_options = (
     ('max_compaction_threshold', None),
     ('row_cache_save_period_in_seconds', None),
     ('key_cache_save_period_in_seconds', None),
-    ('replication_on_write', 'replicate_on_write')
+    ('replicate_on_write', None)
 )
 
 cql_type_to_apache_class = {

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/DataTracker.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/DataTracker.java?rev=1214927&r1=1214926&r2=1214927&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/DataTracker.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/DataTracker.java Thu Dec 15 19:34:40
2011
@@ -292,6 +292,11 @@ public class DataTracker
         }
         while (!view.compareAndSet(currentView, newView));
 
+        if (notCompacting.isEmpty())
+        {
+            // notifySSTablesChanged -> LeveledManifest.promote doesn't like a no-op "promotion"
+            return;
+        }
         notifySSTablesChanged(notCompacting, Collections.<SSTableReader>emptySet());
         postReplace(notCompacting, Collections.<SSTableReader>emptySet());
     }

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java?rev=1214927&r1=1214926&r2=1214927&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java Thu Dec 15 19:34:40
2011
@@ -138,6 +138,8 @@ public class SystemTable
      */
     public static synchronized void updateToken(InetAddress ep, Token token)
     {
+        if (ep == FBUtilities.getLocalAddress())
+            return;
         IPartitioner p = StorageService.getPartitioner();
         ColumnFamily cf = ColumnFamily.create(Table.SYSTEM_TABLE, STATUS_CF);
         cf.addColumn(new Column(p.getTokenFactory().toByteArray(token), ByteBuffer.wrap(ep.getAddress()),
System.currentTimeMillis()));

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/migration/DropKeyspace.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/migration/DropKeyspace.java?rev=1214927&r1=1214926&r2=1214927&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/migration/DropKeyspace.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/migration/DropKeyspace.java Thu Dec 15
19:34:40 2011
@@ -63,8 +63,7 @@ public class DropKeyspace extends Migrat
         }
 
         // remove the table from the static instances.
-        Table table = Table.clear(ksm.name, schema);
-        assert table != null;
+        Table.clear(ksm.name, schema);
         // reset defs.
         schema.clearTableDefinition(ksm, newVersion);
     }

Modified: cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java?rev=1214927&r1=1214926&r2=1214927&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java Thu Dec 15 19:34:40 2011
@@ -377,9 +377,8 @@ public class Gossiper implements IFailur
      * @param endpoint - the endpoint being removed
      * @param token - the token being removed
      * @param mytoken - my own token for replication coordination
-     * @param delay
      */
-    public void advertiseRemoving(InetAddress endpoint, Token token, Token mytoken, int delay)
+    public void advertiseRemoving(InetAddress endpoint, Token token, Token mytoken)
     {
         EndpointState epState = endpointStateMap.get(endpoint);
         // remember this node's generation
@@ -388,7 +387,7 @@ public class Gossiper implements IFailur
         logger.info("Sleeping for " + StorageService.RING_DELAY + "ms to ensure " + endpoint
+ " does not change");
         try
         {
-            Thread.sleep(delay);
+            Thread.sleep(StorageService.RING_DELAY);
         }
         catch (InterruptedException e)
         {
@@ -432,6 +431,66 @@ public class Gossiper implements IFailur
         }
     }
 
+    /**
+     * Do not call this method unless you know what you are doing.
+     * It will try extremely hard to obliterate any endpoint from the ring,
+     * even if it does not know about it.
+     * This should only ever be called by human via JMX.
+     * @param  address
+     * @throws UnknownHostException
+     */
+    public void unsafeAssassinateEndpoint(String address) throws UnknownHostException
+    {
+        InetAddress endpoint = InetAddress.getByName(address);
+        EndpointState epState = endpointStateMap.get(endpoint);
+        Token token = null;
+        logger.warn("Assassinating {} via gossip", endpoint);
+        if (epState == null)
+        {
+            epState = new EndpointState(new HeartBeatState((int)((System.currentTimeMillis()
+ 60000) / 1000), 9999));
+        }
+        else
+        {
+            try
+            {
+                token = StorageService.instance.getTokenMetadata().getToken(endpoint);
+            }
+            catch (AssertionError e)
+            {
+            }
+            int generation = epState.getHeartBeatState().getGeneration();
+            logger.info("Sleeping for " + StorageService.RING_DELAY + "ms to ensure " + endpoint
+ " does not change");
+            try
+            {
+                Thread.sleep(StorageService.RING_DELAY);
+            }
+            catch (InterruptedException e)
+            {
+                throw new AssertionError(e);
+            }
+            // make sure it did not change
+            epState = endpointStateMap.get(endpoint);
+            if (epState.getHeartBeatState().getGeneration() != generation)
+                throw new RuntimeException("Endpoint " + endpoint + " generation changed
while trying to remove it");
+            epState.updateTimestamp(); // make sure we don't evict it too soon
+            epState.getHeartBeatState().forceNewerGenerationUnsafe();
+        }
+        if (token == null)
+            token = StorageService.instance.getBootstrapToken();
+        // do not pass go, do not collect 200 dollars, just gtfo
+        epState.addApplicationState(ApplicationState.STATUS, StorageService.instance.valueFactory.left(token,
computeExpireTime()));
+        handleMajorStateChange(endpoint, epState);
+        try
+        {
+            Thread.sleep(intervalInMillis * 4);
+        }
+        catch (InterruptedException e)
+        {
+            throw new AssertionError(e);
+        }
+        logger.warn("Finished killing {}", endpoint);
+    }
+
     public boolean isKnownEndpoint(InetAddress endpoint)
     {
         return endpointStateMap.containsKey(endpoint);
@@ -1035,6 +1094,11 @@ public class Gossiper implements IFailur
      */
     public void addSavedEndpoint(InetAddress ep)
     {
+        if (ep == FBUtilities.getLocalAddress())
+        {
+            logger.debug("Attempt to add self as saved endpoint");
+            return;
+        }
         EndpointState epState = new EndpointState(new HeartBeatState(0));
         epState.markDead();
         epState.setHasToken(true);

Modified: cassandra/trunk/src/java/org/apache/cassandra/gms/GossiperMBean.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/GossiperMBean.java?rev=1214927&r1=1214926&r2=1214927&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/gms/GossiperMBean.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/GossiperMBean.java Thu Dec 15 19:34:40
2011
@@ -28,4 +28,6 @@ public interface GossiperMBean
 
     public int getCurrentGenerationNumber(String address) throws UnknownHostException;
 
+    public void unsafeAssassinateEndpoint(String address) throws UnknownHostException;
+
 }
\ No newline at end of file

Modified: cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1214927&r1=1214926&r2=1214927&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java Thu Dec 15 19:34:40
2011
@@ -862,7 +862,7 @@ public class StorageProxy implements Sto
                     RangeSliceResponseResolver resolver = new RangeSliceResponseResolver(command.keyspace,
liveEndpoints);
                     ReadCallback<Iterable<Row>> handler = getReadCallback(resolver,
command, consistency_level, liveEndpoints);
                     handler.assureSufficientLiveNodes();
-                    for (InetAddress endpoint : liveEndpoints)
+                    for (InetAddress endpoint : handler.endpoints)
                     {
                         MessagingService.instance().sendRR(c2, endpoint, handler);
                         if (logger.isDebugEnabled())
@@ -1140,7 +1140,7 @@ public class StorageProxy implements Sto
 
             IndexScanCommand command = new IndexScanCommand(keyspace, column_family, index_clause,
column_predicate, range);
             MessageProducer producer = new CachingMessageProducer(command);
-            for (InetAddress endpoint : liveEndpoints)
+            for (InetAddress endpoint : handler.endpoints)
             {
                 MessagingService.instance().sendRR(producer, endpoint, handler);
                 if (logger.isDebugEnabled())

Modified: cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=1214927&r1=1214926&r2=1214927&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Thu Dec 15 19:34:40
2011
@@ -79,7 +79,7 @@ public class StorageService implements I
 {
     private static Logger logger_ = LoggerFactory.getLogger(StorageService.class);
 
-    public static final int RING_DELAY = 30 * 1000; // delay after which we assume ring has
stablized
+    public static final int RING_DELAY = getRingDelay(); // delay after which we assume ring
has stablized
 
     /* All verb handler identifiers */
     public enum Verb
@@ -150,6 +150,17 @@ public class StorageService implements I
         put(Verb.UNUSED_3, Stage.INTERNAL_RESPONSE);
     }};
 
+    private static int getRingDelay()
+    {
+        String newdelay = System.getProperty("cassandra.ring_delay_ms");
+        if (newdelay != null)
+        {
+            logger_.warn("Overriding RING_DELAY to {}ms", newdelay);
+            return Integer.parseInt(newdelay);
+        }
+        else
+            return 30 * 1000;
+    }
 
     /**
      * This pool is used for periodic short (sub-second) tasks.
@@ -404,8 +415,16 @@ public class StorageService implements I
             logger_.info("Loading persisted ring state");
             for (Map.Entry<Token, InetAddress> entry : SystemTable.loadTokens().entrySet())
             {
-                tokenMetadata_.updateNormalToken(entry.getKey(), entry.getValue());
-                Gossiper.instance.addSavedEndpoint(entry.getValue());
+                if (entry.getValue() == FBUtilities.getLocalAddress())
+                {
+                    // entry has been mistakenly added, delete it
+                    SystemTable.removeToken(entry.getKey());
+                }
+                else
+                {
+                    tokenMetadata_.updateNormalToken(entry.getKey(), entry.getValue());
+                    Gossiper.instance.addSavedEndpoint(entry.getValue());
+                }
             }
         }
 
@@ -2331,11 +2350,6 @@ public class StorageService implements I
      */
     public void removeToken(String tokenString)
     {
-        removeToken(tokenString, RING_DELAY);
-    }
-
-    public void removeToken(String tokenString, int delay)
-    {
         InetAddress myAddress = FBUtilities.getBroadcastAddress();
         Token localToken = tokenMetadata_.getToken(myAddress);
         Token token = partitioner.getTokenFactory().fromString(tokenString);
@@ -2382,7 +2396,7 @@ public class StorageService implements I
         calculatePendingRanges();
         // the gossiper will handle spoofing this node's state to REMOVING_TOKEN for us
         // we add our own token so other nodes to let us know when they're done
-        Gossiper.instance.advertiseRemoving(endpoint, token, localToken, delay);
+        Gossiper.instance.advertiseRemoving(endpoint, token, localToken);
 
         // kick off streaming commands
         restoreReplicaCount(endpoint, myAddress);

Modified: cassandra/trunk/test/cassandra.in.sh
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/cassandra.in.sh?rev=1214927&r1=1214926&r2=1214927&view=diff
==============================================================================
--- cassandra/trunk/test/cassandra.in.sh (original)
+++ cassandra/trunk/test/cassandra.in.sh Thu Dec 15 19:34:40 2011
@@ -50,4 +50,5 @@ JVM_OPTS=" \
         -XX:+HeapDumpOnOutOfMemoryError \
         -Dcom.sun.management.jmxremote.port=8090 \
         -Dcom.sun.management.jmxremote.ssl=false \
-        -Dcom.sun.management.jmxremote.authenticate=false"
+        -Dcom.sun.management.jmxremote.authenticate=false \
+        -Dcassandra.ring_delay_ms=1000"

Modified: cassandra/trunk/test/unit/org/apache/cassandra/service/RemoveTest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/service/RemoveTest.java?rev=1214927&r1=1214926&r2=1214927&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/service/RemoveTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/service/RemoveTest.java Thu Dec 15 19:34:40
2011
@@ -125,7 +125,7 @@ public class RemoveTest extends CleanupH
             {
                 try
                 {
-                    ss.removeToken(token, 0);
+                    ss.removeToken(token);
                 }
                 catch (Exception e)
                 {



Mime
View raw message