cassandra git commit: update CHANGES

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 1352ebd61 - fdecab038


update CHANGES


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fdecab03
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fdecab03
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fdecab03

Branch: refs/heads/cassandra-2.2
Commit: fdecab03823b6b1b4a6efed9fb3b675eb58c3f80
Parents: 1352ebd
Author: Jason Brown jasedbr...@gmail.com
Authored: Fri May 29 10:10:31 2015 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Fri May 29 10:10:31 2015 -0700

--
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fdecab03/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 3cae128..dc13bea 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2
+ * ant test-all results incomplete when parsed (CASSANDRA-9463)
  * Disallow frozen types in function arguments and return types for
clarity (CASSANDRA-9411)
  * Static Analysis to warn on unsafe use of Autocloseable instances 
(CASSANDRA-9431)

[2/3] cassandra git commit: update CHANGES

[jasobrown]

update CHANGES


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fdecab03
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fdecab03
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fdecab03

Branch: refs/heads/trunk
Commit: fdecab03823b6b1b4a6efed9fb3b675eb58c3f80
Parents: 1352ebd
Author: Jason Brown jasedbr...@gmail.com
Authored: Fri May 29 10:10:31 2015 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Fri May 29 10:10:31 2015 -0700

--
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fdecab03/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 3cae128..dc13bea 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2
+ * ant test-all results incomplete when parsed (CASSANDRA-9463)
  * Disallow frozen types in function arguments and return types for
clarity (CASSANDRA-9411)
  * Static Analysis to warn on unsafe use of Autocloseable instances 
(CASSANDRA-9431)

[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

[jasobrown]

Merge branch 'cassandra-2.2' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad58bf7c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad58bf7c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad58bf7c

Branch: refs/heads/trunk
Commit: ad58bf7c735897c4cff2db13f3887095e212bdde
Parents: f60a201 fdecab0
Author: Jason Brown jasedbr...@gmail.com
Authored: Fri May 29 10:11:09 2015 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Fri May 29 10:11:09 2015 -0700

--
 CHANGES.txt |   1 +
 build.xml   |  16 +-
 .../CassandraBriefJUnitResultFormatter.java | 312 +++
 .../CassandraXMLJUnitResultFormatter.java   | 380 +++
 4 files changed, 702 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad58bf7c/CHANGES.txt
--
diff --cc CHANGES.txt
index a2b5d9e,dc13bea..9636796
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.0:
 + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
 + * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
 + * Change default garbage collector to G1 (CASSANDRA-7486)
 +
 +
  2.2
+  * ant test-all results incomplete when parsed (CASSANDRA-9463)
   * Disallow frozen types in function arguments and return types for
 clarity (CASSANDRA-9411)
   * Static Analysis to warn on unsafe use of Autocloseable instances 
(CASSANDRA-9431)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad58bf7c/build.xml
--

[1/3] cassandra git commit: ant test-all results incomplete when parsed (part 2)

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/trunk f60a201a3 - ad58bf7c7


ant test-all results incomplete when parsed (part 2)

patch by aweisberg; reviewed by jasobrown for CASSANDRA-9463


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1352ebd6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1352ebd6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1352ebd6

Branch: refs/heads/trunk
Commit: 1352ebd61d2b0949baa9cfb6132985cbfcb58fca
Parents: 302eb46
Author: Jason Brown jasedbr...@gmail.com
Authored: Fri May 29 10:07:59 2015 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Fri May 29 10:07:59 2015 -0700

--
 build.xml   |  16 +-
 .../CassandraBriefJUnitResultFormatter.java | 312 +++
 .../CassandraXMLJUnitResultFormatter.java   | 380 +++
 3 files changed, 701 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1352ebd6/build.xml
--
diff --git a/build.xml b/build.xml
index bb401ee..ecde9f9 100644
--- a/build.xml
+++ b/build.xml
@@ -443,7 +443,8 @@
 dependency groupId=org.caffinitas.ohc artifactId=ohc-core/
 dependency groupId=org.openjdk.jmh artifactId=jmh-core/
 dependency groupId=org.openjdk.jmh 
artifactId=jmh-generator-annprocess/
-   dependency groupId=net.ju-n.compile-command-annotations 
artifactId=compile-command-annotations/
+dependency groupId=net.ju-n.compile-command-annotations 
artifactId=compile-command-annotations/
+dependency groupId=org.apache.ant artifactId=ant-junit 
version=1.9.4 /
   /artifact:pom
 
   artifact:pom id=coverage-deps-pom
@@ -1118,7 +1119,7 @@
 attribute name=exclude default= /
 attribute name=filelist default= /
 attribute name=poffset default=0/
-attribute name=outsubdir default=/
+attribute name=testtag default=/
 
 attribute name=usejacoco default=no/
 sequential
@@ -1130,11 +1131,11 @@
   echo message=running @{suitename} tests/
   mkdir dir=${build.test.dir}/cassandra/
   mkdir dir=${build.test.dir}/output/
-  mkdir dir=${build.test.dir}/output/@{outsubdir}/
+  mkdir dir=${build.test.dir}/output/@{testtag}/
   junit fork=on forkmode=@{forkmode} failureproperty=testfailed 
maxmemory=1024m timeout=@{timeout}
 sysproperty key=net.sourceforge.cobertura.datafile 
file=${cobertura.datafile}/
-formatter type=xml usefile=true/
-formatter type=brief usefile=false/
+formatter 
classname=org.apache.cassandra.CassandraXMLJUnitResultFormatter 
extension=.xml usefile=true/
+formatter 
classname=org.apache.cassandra.CassandraBriefJUnitResultFormatter 
usefile=false/
 jvmarg value=-Dstorage-config=${test.conf}/
 jvmarg value=-Djava.awt.headless=true/
 !-- Cassandra 3.0+ needs jvmarg line=... ${additionalagent} / 
here! (not value=) --
@@ -1146,6 +1147,7 @@
 jvmarg 
value=-Dcassandra.test.use_prepared=${cassandra.test.use_prepared}/
jvmarg value=-Dcassandra.test.offsetseed=@{poffset}/
 jvmarg value=-Dcassandra.test.sstableformatdevelopment=true/
+jvmarg value=-Dcassandra.testtag=@{testtag}/
optjvmargs/
 classpath
   path refid=cassandra.classpath /
@@ -1156,7 +1158,7 @@
 include name=**/*.jar /
   /fileset
 /classpath
-batchtest todir=${build.test.dir}/output/@{outsubdir}
+batchtest todir=${build.test.dir}/output/@{testtag}
 fileset dir=@{inputdir} includes=@{filter} 
excludes=@{exclude}/
 filelist dir=@{inputdir} files=@{filelist}/
 /batchtest
@@ -1272,7 +1274,7 @@
   fileset file=${test.conf}/commitlog_compression.yaml/
 /concat
 echoCompressed config: ${compressed_yaml}/echo
-testmacro suitename=unit inputdir=${test.unit.src} 
exclude=**/pig/*.java timeout=${test.timeout} outsubdir=compression
+testmacro suitename=unit inputdir=${test.unit.src} 
exclude=**/pig/*.java timeout=${test.timeout} testtag=compression
   jvmarg value=-Dlegacy-sstable-root=${test.data}/legacy-sstables/
   jvmarg 
value=-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables/
   jvmarg value=-Dcorrupt-sstable-root=${test.data}/corrupt-sstables/

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1352ebd6/test/unit/org/apache/cassandra/CassandraBriefJUnitResultFormatter.java
--
diff --git 
a/test/unit/org/apache/cassandra/CassandraBriefJUnitResultFormatter.java 
b/test/unit/org/apache/cassandra/CassandraBriefJUnitResultFormatter.java
new file mode 100644
index

cassandra git commit: test-all results incomplete when parsed

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 91187b542 - 162489aed


test-all results incomplete when parsed

patch by aweisberg; reviewed by jasobrown for CASSANDRA-9463


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/162489ae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/162489ae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/162489ae

Branch: refs/heads/cassandra-2.2
Commit: 162489aed57866d5f8185d78a05588e1e81c549e
Parents: 91187b5
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue May 26 15:29:01 2015 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed May 27 08:39:32 2015 -0700

--
 build.xml | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/162489ae/build.xml
--
diff --git a/build.xml b/build.xml
index 69f6a61..cbedf20 100644
--- a/build.xml
+++ b/build.xml
@@ -1116,6 +1116,7 @@
 attribute name=exclude default= /
 attribute name=filelist default= /
 attribute name=poffset default=0/
+attribute name=outsubdir default=/
 
 attribute name=usejacoco default=no/
 sequential
@@ -1127,6 +1128,7 @@
   echo message=running @{suitename} tests/
   mkdir dir=${build.test.dir}/cassandra/
   mkdir dir=${build.test.dir}/output/
+  mkdir dir=${build.test.dir}/output/@{outsubdir}/
   junit fork=on forkmode=@{forkmode} failureproperty=testfailed 
maxmemory=1024m timeout=@{timeout}
 sysproperty key=net.sourceforge.cobertura.datafile 
file=${cobertura.datafile}/
 formatter type=xml usefile=true/
@@ -1152,14 +1154,14 @@
 include name=**/*.jar /
   /fileset
 /classpath
-batchtest todir=${build.test.dir}/output
+batchtest todir=${build.test.dir}/output/@{outsubdir}
 fileset dir=@{inputdir} includes=@{filter} 
excludes=@{exclude}/
 filelist dir=@{inputdir} files=@{filelist}/
 /batchtest
   /junit
   junitreport todir=${build.test.dir}
 fileset dir=${build.test.dir}/output
-  include name=TEST-*.xml/
+  include name=**/TEST-*.xml/
 /fileset
 report format=frames todir=${build.test.dir}/junitreport/
   /junitreport
@@ -1268,7 +1270,7 @@
   fileset file=${test.conf}/commitlog_compression.yaml/
 /concat
 echoCompressed config: ${compressed_yaml}/echo
-testmacro suitename=unit inputdir=${test.unit.src} 
exclude=**/pig/*.java timeout=${test.timeout}
+testmacro suitename=unit inputdir=${test.unit.src} 
exclude=**/pig/*.java timeout=${test.timeout} outsubdir=compression
   jvmarg value=-Dlegacy-sstable-root=${test.data}/legacy-sstables/
   jvmarg 
value=-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables/
   jvmarg value=-Dcorrupt-sstable-root=${test.data}/corrupt-sstables/

cassandra git commit: test-all results incomplete when parsed

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 3123e88e5 - 352302f5a


test-all results incomplete when parsed

patch by aweisberg; reviewed by jasobrown for CASSANDRA-9463


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/352302f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/352302f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/352302f5

Branch: refs/heads/trunk
Commit: 352302f5a7a79ee24061b67f980d3e6bf2fcd0d5
Parents: 3123e88
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue May 26 15:29:01 2015 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue May 26 15:29:01 2015 -0700

--
 build.xml | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/352302f5/build.xml
--
diff --git a/build.xml b/build.xml
index 1e7e444..5ad806f 100644
--- a/build.xml
+++ b/build.xml
@@ -1118,6 +1118,7 @@
 attribute name=exclude default= /
 attribute name=filelist default= /
 attribute name=poffset default=0/
+attribute name=outsubdir default=/
 
 attribute name=usejacoco default=no/
 sequential
@@ -1129,6 +1130,7 @@
   echo message=running @{suitename} tests/
   mkdir dir=${build.test.dir}/cassandra/
   mkdir dir=${build.test.dir}/output/
+  mkdir dir=${build.test.dir}/output/@{outsubdir}/
   junit fork=on forkmode=@{forkmode} failureproperty=testfailed 
maxmemory=1024m timeout=@{timeout}
 sysproperty key=net.sourceforge.cobertura.datafile 
file=${cobertura.datafile}/
 formatter type=xml usefile=true/
@@ -1154,14 +1156,14 @@
 include name=**/*.jar /
   /fileset
 /classpath
-batchtest todir=${build.test.dir}/output
+batchtest todir=${build.test.dir}/output/@{outsubdir}
 fileset dir=@{inputdir} includes=@{filter} 
excludes=@{exclude}/
 filelist dir=@{inputdir} files=@{filelist}/
 /batchtest
   /junit
   junitreport todir=${build.test.dir}
 fileset dir=${build.test.dir}/output
-  include name=TEST-*.xml/
+  include name=**/TEST-*.xml/
 /fileset
 report format=frames todir=${build.test.dir}/junitreport/
   /junitreport
@@ -1270,7 +1272,7 @@
   fileset file=${test.conf}/commitlog_compression.yaml/
 /concat
 echoCompressed config: ${compressed_yaml}/echo
-testmacro suitename=unit inputdir=${test.unit.src} 
exclude=**/pig/*.java timeout=${test.timeout}
+testmacro suitename=unit inputdir=${test.unit.src} 
exclude=**/pig/*.java timeout=${test.timeout} outsubdir=compression
   jvmarg value=-Dlegacy-sstable-root=${test.data}/legacy-sstables/
   jvmarg 
value=-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables/
   jvmarg value=-Dcorrupt-sstable-root=${test.data}/corrupt-sstables/

cassandra git commit: add check of the system wall clock time at startup

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 feb26752b - 1470cee58


add check of the system wall clock time at startup

patch by jasobrown; reviewed by driftx for CASSANDRA-8305


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1470cee5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1470cee5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1470cee5

Branch: refs/heads/cassandra-2.1
Commit: 1470cee58872b89ee8ae5d2f7e287ad7f32ed50b
Parents: feb2675
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Nov 12 18:31:04 2014 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Thu Nov 13 18:23:46 2014 -0800

--
 CHANGES.txt |  1 +
 .../apache/cassandra/service/CassandraDaemon.java   | 16 
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1470cee5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 6caa5c7..6517c6a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.3
+ * add check of the system wall clock time at startup (CASSANDRA-8305)
  * Support for frozen collections (CASSANDRA-7859)
  * Fix overflow on histogram computation (CASSANDRA-8028)
  * Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1470cee5/src/java/org/apache/cassandra/service/CassandraDaemon.java
--
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java 
b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 38d0414..5897a22 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -24,6 +24,7 @@ import java.lang.management.MemoryPoolMXBean;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -72,6 +73,13 @@ public class CassandraDaemon
 
 private static final CassandraDaemon instance = new CassandraDaemon();
 
+/**
+ * The earliest legit timestamp a casandra instance could have ever 
launched.
+ * Date roughly taken from 
http://perspectives.mvdirona.com/2008/07/12/FacebookReleasesCassandraAsOpenSource.aspx
+ * We use this to ensure the system clock is at least somewhat correct at 
startup.
+ */
+private static final long EARLIEST_LAUNCH_DATE = 121582080L;
+
 public Server thriftServer;
 public Server nativeServer;
 
@@ -92,6 +100,14 @@ public class CassandraDaemon
 {
 logger.info(Could not resolve local host);
 }
+
+long now = System.currentTimeMillis();
+if (now  EARLIEST_LAUNCH_DATE)
+{
+logger.error(current machine time is {}, but that is seemingly 
incorrect. exiting now., new Date(now));
+System.exit(3);
+}
+
 // log warnings for different kinds of sub-optimal JVMs.  tldr use 
64-bit Oracle = 1.6u32
 if (!DatabaseDescriptor.hasLargeAddressSpace())
 logger.info(32bit JVM detected.  It is recommended to run 
Cassandra on a 64bit JVM for better performance.);

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

[jasobrown]

Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c6050bc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c6050bc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c6050bc

Branch: refs/heads/trunk
Commit: 0c6050bcaf4ec3aeedb3ba2eecbfee41285a6b79
Parents: b2808b1 1470cee
Author: Jason Brown jasedbr...@gmail.com
Authored: Thu Nov 13 18:24:48 2014 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Thu Nov 13 18:27:31 2014 -0800

--
 CHANGES.txt|  1 +
 .../apache/cassandra/service/CassandraDaemon.java  | 17 +
 2 files changed, 18 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c6050bc/CHANGES.txt
--
diff --cc CHANGES.txt
index 82fbbc5,6517c6a..16e919e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,5 +1,39 @@@
 +3.0
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586) 
 + * Extend Descriptor to include a format value and refactor reader/writer 
apis (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 
7781, 7929,
 +   7924, 7812, 8063)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * improve concurrency of repair (CASSANDRA-6455, 8208)
 +
  2.1.3
+  * add check of the system wall clock time at startup (CASSANDRA-8305)
   * Support for frozen collections (CASSANDRA-7859)
   * Fix overflow on histogram computation (CASSANDRA-8028)
   * Have paxos reuse the timestamp generation of normal queries 
(CASSANDRA-7801)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c6050bc/src/java/org/apache/cassandra/service/CassandraDaemon.java
--
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index 7a51bb2,5897a22..d3ba085
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -102,6 -100,14 +110,15 @@@ public class CassandraDaemo
  {
  logger.info(Could not resolve local host);
  }
+ 
+ long now = System.currentTimeMillis();
+ if (now  EARLIEST_LAUNCH_DATE)
+ {
 -logger.error(current machine time is {}, but that is seemingly 
incorrect. exiting now., new Date(now));
 -System.exit(3);
++String msg = String.format(current machine time is %s, but that 
is seemingly incorrect. exiting now., new Date(now).toString());
++logger.error(msg);
++throw new IllegalStateException(msg);
+ }
+ 
  // log warnings for different kinds of sub-optimal JVMs.  tldr use 
64-bit Oracle = 1.6u32
  if (!DatabaseDescriptor.hasLargeAddressSpace())
  logger.info(32bit JVM detected.  It is recommended to run 
Cassandra on a 64bit JVM for better performance.);

[1/2] cassandra git commit: add check of the system wall clock time at startup

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/trunk b2808b1dc - 0c6050bca


add check of the system wall clock time at startup

patch by jasobrown; reviewed by driftx for CASSANDRA-8305


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1470cee5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1470cee5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1470cee5

Branch: refs/heads/trunk
Commit: 1470cee58872b89ee8ae5d2f7e287ad7f32ed50b
Parents: feb2675
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Nov 12 18:31:04 2014 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Thu Nov 13 18:23:46 2014 -0800

--
 CHANGES.txt |  1 +
 .../apache/cassandra/service/CassandraDaemon.java   | 16 
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1470cee5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 6caa5c7..6517c6a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.3
+ * add check of the system wall clock time at startup (CASSANDRA-8305)
  * Support for frozen collections (CASSANDRA-7859)
  * Fix overflow on histogram computation (CASSANDRA-8028)
  * Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1470cee5/src/java/org/apache/cassandra/service/CassandraDaemon.java
--
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java 
b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 38d0414..5897a22 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -24,6 +24,7 @@ import java.lang.management.MemoryPoolMXBean;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -72,6 +73,13 @@ public class CassandraDaemon
 
 private static final CassandraDaemon instance = new CassandraDaemon();
 
+/**
+ * The earliest legit timestamp a casandra instance could have ever 
launched.
+ * Date roughly taken from 
http://perspectives.mvdirona.com/2008/07/12/FacebookReleasesCassandraAsOpenSource.aspx
+ * We use this to ensure the system clock is at least somewhat correct at 
startup.
+ */
+private static final long EARLIEST_LAUNCH_DATE = 121582080L;
+
 public Server thriftServer;
 public Server nativeServer;
 
@@ -92,6 +100,14 @@ public class CassandraDaemon
 {
 logger.info(Could not resolve local host);
 }
+
+long now = System.currentTimeMillis();
+if (now  EARLIEST_LAUNCH_DATE)
+{
+logger.error(current machine time is {}, but that is seemingly 
incorrect. exiting now., new Date(now));
+System.exit(3);
+}
+
 // log warnings for different kinds of sub-optimal JVMs.  tldr use 
64-bit Oracle = 1.6u32
 if (!DatabaseDescriptor.hasLargeAddressSpace())
 logger.info(32bit JVM detected.  It is recommended to run 
Cassandra on a 64bit JVM for better performance.);

cassandra git commit: Disable SSLv3 for POODLE

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 be7914229 - b93f48a5d


Disable SSLv3 for POODLE

patch by Jeremiah Jordan; reviewed by jasobrown for CASSANDRA-8265


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b93f48a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b93f48a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b93f48a5

Branch: refs/heads/cassandra-2.0
Commit: b93f48a5db321bf7c9fb55a800ed6ab2d6f6b102
Parents: be79142
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Nov 12 15:58:13 2014 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed Nov 12 15:58:13 2014 -0800

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/security/SSLFactory.java   | 4 
 .../org/apache/cassandra/thrift/CustomTThreadPoolServer.java | 4 
 src/java/org/apache/cassandra/transport/Server.java  | 1 +
 src/java/org/apache/cassandra/transport/SimpleClient.java| 1 +
 5 files changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b93f48a5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 47e611c..809a102 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.12:
+ * Disable SSLv3 for POODLE (CASSANDRA-8265)
  * Fix millisecond timestamps in Tracing (CASSANDRA-8297)
  * Include keyspace name in error message when there are insufficient
live nodes to stream from (CASSANDRA-8221)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b93f48a5/src/java/org/apache/cassandra/security/SSLFactory.java
--
diff --git a/src/java/org/apache/cassandra/security/SSLFactory.java 
b/src/java/org/apache/cassandra/security/SSLFactory.java
index 3cb0670..260c828 100644
--- a/src/java/org/apache/cassandra/security/SSLFactory.java
+++ b/src/java/org/apache/cassandra/security/SSLFactory.java
@@ -61,6 +61,7 @@ public final class SSLFactory
 String[] suits = 
filterCipherSuites(serverSocket.getSupportedCipherSuites(), 
options.cipher_suites);
 serverSocket.setEnabledCipherSuites(suits);
 serverSocket.setNeedClientAuth(options.require_client_auth);
+serverSocket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
 serverSocket.bind(new InetSocketAddress(address, port), 500);
 return serverSocket;
 }
@@ -72,6 +73,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) 
ctx.getSocketFactory().createSocket(address, port, localAddress, localPort);
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
+socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
 return socket;
 }
 
@@ -82,6 +84,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) 
ctx.getSocketFactory().createSocket(address, port);
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
+socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
 return socket;
 }
 
@@ -92,6 +95,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) ctx.getSocketFactory().createSocket();
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
+socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
 return socket;
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b93f48a5/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java 
b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
index d1a3304..3111deb 100644
--- a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
+++ b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
@@ -27,6 +27,8 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import javax.net.ssl.SSLServerSocket;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -251,6 +253,8 @@ public class CustomTThreadPoolServer extends TServer
 params.requireClientAuth(true);
 }
 TServerSocket sslServer

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/transport/Server.java
src/java/org/apache/cassandra/transport/SimpleClient.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1217afb5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1217afb5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1217afb5

Branch: refs/heads/cassandra-2.1
Commit: 1217afb5cf68e1d1d8bfc951b74fc4e0fa7b17f2
Parents: 26ea0f6 b93f48a
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Nov 12 16:07:12 2014 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed Nov 12 16:07:12 2014 -0800

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/security/SSLFactory.java   | 4 
 .../org/apache/cassandra/thrift/CustomTThreadPoolServer.java | 4 
 src/java/org/apache/cassandra/transport/Server.java  | 2 +-
 src/java/org/apache/cassandra/transport/SimpleClient.java| 1 +
 5 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1217afb5/CHANGES.txt
--
diff --cc CHANGES.txt
index 51a3ed0,809a102..1910f31
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 -2.0.12:
 +2.1.3
 + * Support for frozen collections (CASSANDRA-7859)
 + * Fix overflow on histogram computation (CASSANDRA-8028)
 + * Have paxos reuse the timestamp generation of normal queries 
(CASSANDRA-7801)
 +Merged from 2.0:
+  * Disable SSLv3 for POODLE (CASSANDRA-8265)
   * Fix millisecond timestamps in Tracing (CASSANDRA-8297)
   * Include keyspace name in error message when there are insufficient
 live nodes to stream from (CASSANDRA-8221)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1217afb5/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1217afb5/src/java/org/apache/cassandra/transport/Server.java
--
diff --cc src/java/org/apache/cassandra/transport/Server.java
index 8af6ee8,092e1ba..2a60242
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@@ -324,10 -296,13 +324,10 @@@ public class Server implements Cassandr
  sslEngine.setUseClientMode(false);
  sslEngine.setEnabledCipherSuites(encryptionOptions.cipher_suites);
  
sslEngine.setNeedClientAuth(encryptionOptions.require_client_auth);
- 
+ sslEngine.setEnabledProtocols(new String[] {SSLv2Hello, 
TLSv1, TLSv1.1, TLSv1.2});
 -
  SslHandler sslHandler = new SslHandler(sslEngine);
 -sslHandler.setIssueHandshake(true);
 -ChannelPipeline pipeline = super.getPipeline();
 -pipeline.addFirst(ssl, sslHandler);
 -return pipeline;
 +super.initChannel(channel);
 +channel.pipeline().addFirst(ssl, sslHandler);
  }
  }
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1217afb5/src/java/org/apache/cassandra/transport/SimpleClient.java
--
diff --cc src/java/org/apache/cassandra/transport/SimpleClient.java
index 3cf9b7b,3bcf751..2e1e45e
--- a/src/java/org/apache/cassandra/transport/SimpleClient.java
+++ b/src/java/org/apache/cassandra/transport/SimpleClient.java
@@@ -253,7 -259,11 +253,8 @@@ public class SimpleClien
  SSLEngine sslEngine = sslContext.createSSLEngine();
  sslEngine.setUseClientMode(true);
  sslEngine.setEnabledCipherSuites(encryptionOptions.cipher_suites);
+ sslEngine.setEnabledProtocols(new String[] {SSLv2Hello, 
TLSv1, TLSv1.1, TLSv1.2});
 -ChannelPipeline pipeline = super.getPipeline();
 -
 -pipeline.addFirst(ssl, new SslHandler(sslEngine));
 -return pipeline;
 +channel.pipeline().addFirst(ssl, new SslHandler(sslEngine));
  }
  }
  

[1/2] cassandra git commit: Disable SSLv3 for POODLE

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 26ea0f6d7 - 1217afb5c


Disable SSLv3 for POODLE

patch by Jeremiah Jordan; reviewed by jasobrown for CASSANDRA-8265


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b93f48a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b93f48a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b93f48a5

Branch: refs/heads/cassandra-2.1
Commit: b93f48a5db321bf7c9fb55a800ed6ab2d6f6b102
Parents: be79142
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Nov 12 15:58:13 2014 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed Nov 12 15:58:13 2014 -0800

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/security/SSLFactory.java   | 4 
 .../org/apache/cassandra/thrift/CustomTThreadPoolServer.java | 4 
 src/java/org/apache/cassandra/transport/Server.java  | 1 +
 src/java/org/apache/cassandra/transport/SimpleClient.java| 1 +
 5 files changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b93f48a5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 47e611c..809a102 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.12:
+ * Disable SSLv3 for POODLE (CASSANDRA-8265)
  * Fix millisecond timestamps in Tracing (CASSANDRA-8297)
  * Include keyspace name in error message when there are insufficient
live nodes to stream from (CASSANDRA-8221)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b93f48a5/src/java/org/apache/cassandra/security/SSLFactory.java
--
diff --git a/src/java/org/apache/cassandra/security/SSLFactory.java 
b/src/java/org/apache/cassandra/security/SSLFactory.java
index 3cb0670..260c828 100644
--- a/src/java/org/apache/cassandra/security/SSLFactory.java
+++ b/src/java/org/apache/cassandra/security/SSLFactory.java
@@ -61,6 +61,7 @@ public final class SSLFactory
 String[] suits = 
filterCipherSuites(serverSocket.getSupportedCipherSuites(), 
options.cipher_suites);
 serverSocket.setEnabledCipherSuites(suits);
 serverSocket.setNeedClientAuth(options.require_client_auth);
+serverSocket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
 serverSocket.bind(new InetSocketAddress(address, port), 500);
 return serverSocket;
 }
@@ -72,6 +73,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) 
ctx.getSocketFactory().createSocket(address, port, localAddress, localPort);
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
+socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
 return socket;
 }
 
@@ -82,6 +84,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) 
ctx.getSocketFactory().createSocket(address, port);
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
+socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
 return socket;
 }
 
@@ -92,6 +95,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) ctx.getSocketFactory().createSocket();
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
+socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
 return socket;
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b93f48a5/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java 
b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
index d1a3304..3111deb 100644
--- a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
+++ b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
@@ -27,6 +27,8 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import javax.net.ssl.SSLServerSocket;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -251,6 +253,8 @@ public class CustomTThreadPoolServer extends TServer
 params.requireClientAuth(true);
 }
 TServerSocket sslServer

[2/3] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/transport/Server.java
src/java/org/apache/cassandra/transport/SimpleClient.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1217afb5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1217afb5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1217afb5

Branch: refs/heads/trunk
Commit: 1217afb5cf68e1d1d8bfc951b74fc4e0fa7b17f2
Parents: 26ea0f6 b93f48a
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Nov 12 16:07:12 2014 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed Nov 12 16:07:12 2014 -0800

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/security/SSLFactory.java   | 4 
 .../org/apache/cassandra/thrift/CustomTThreadPoolServer.java | 4 
 src/java/org/apache/cassandra/transport/Server.java  | 2 +-
 src/java/org/apache/cassandra/transport/SimpleClient.java| 1 +
 5 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1217afb5/CHANGES.txt
--
diff --cc CHANGES.txt
index 51a3ed0,809a102..1910f31
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 -2.0.12:
 +2.1.3
 + * Support for frozen collections (CASSANDRA-7859)
 + * Fix overflow on histogram computation (CASSANDRA-8028)
 + * Have paxos reuse the timestamp generation of normal queries 
(CASSANDRA-7801)
 +Merged from 2.0:
+  * Disable SSLv3 for POODLE (CASSANDRA-8265)
   * Fix millisecond timestamps in Tracing (CASSANDRA-8297)
   * Include keyspace name in error message when there are insufficient
 live nodes to stream from (CASSANDRA-8221)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1217afb5/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1217afb5/src/java/org/apache/cassandra/transport/Server.java
--
diff --cc src/java/org/apache/cassandra/transport/Server.java
index 8af6ee8,092e1ba..2a60242
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@@ -324,10 -296,13 +324,10 @@@ public class Server implements Cassandr
  sslEngine.setUseClientMode(false);
  sslEngine.setEnabledCipherSuites(encryptionOptions.cipher_suites);
  
sslEngine.setNeedClientAuth(encryptionOptions.require_client_auth);
- 
+ sslEngine.setEnabledProtocols(new String[] {SSLv2Hello, 
TLSv1, TLSv1.1, TLSv1.2});
 -
  SslHandler sslHandler = new SslHandler(sslEngine);
 -sslHandler.setIssueHandshake(true);
 -ChannelPipeline pipeline = super.getPipeline();
 -pipeline.addFirst(ssl, sslHandler);
 -return pipeline;
 +super.initChannel(channel);
 +channel.pipeline().addFirst(ssl, sslHandler);
  }
  }
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1217afb5/src/java/org/apache/cassandra/transport/SimpleClient.java
--
diff --cc src/java/org/apache/cassandra/transport/SimpleClient.java
index 3cf9b7b,3bcf751..2e1e45e
--- a/src/java/org/apache/cassandra/transport/SimpleClient.java
+++ b/src/java/org/apache/cassandra/transport/SimpleClient.java
@@@ -253,7 -259,11 +253,8 @@@ public class SimpleClien
  SSLEngine sslEngine = sslContext.createSSLEngine();
  sslEngine.setUseClientMode(true);
  sslEngine.setEnabledCipherSuites(encryptionOptions.cipher_suites);
+ sslEngine.setEnabledProtocols(new String[] {SSLv2Hello, 
TLSv1, TLSv1.1, TLSv1.2});
 -ChannelPipeline pipeline = super.getPipeline();
 -
 -pipeline.addFirst(ssl, new SslHandler(sslEngine));
 -return pipeline;
 +channel.pipeline().addFirst(ssl, new SslHandler(sslEngine));
  }
  }
  

[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

[jasobrown]

Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e15cf78b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e15cf78b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e15cf78b

Branch: refs/heads/trunk
Commit: e15cf78b551b9e7329eb05ab8e6fead905bbfeee
Parents: eb1c283 1217afb
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Nov 12 16:07:44 2014 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed Nov 12 16:07:44 2014 -0800

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/security/SSLFactory.java   | 4 
 .../org/apache/cassandra/thrift/CustomTThreadPoolServer.java | 4 
 src/java/org/apache/cassandra/transport/Server.java  | 2 +-
 src/java/org/apache/cassandra/transport/SimpleClient.java| 1 +
 5 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e15cf78b/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e15cf78b/src/java/org/apache/cassandra/transport/Server.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e15cf78b/src/java/org/apache/cassandra/transport/SimpleClient.java
--

[1/3] cassandra git commit: Disable SSLv3 for POODLE

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/trunk eb1c2831c - e15cf78b5


Disable SSLv3 for POODLE

patch by Jeremiah Jordan; reviewed by jasobrown for CASSANDRA-8265


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b93f48a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b93f48a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b93f48a5

Branch: refs/heads/trunk
Commit: b93f48a5db321bf7c9fb55a800ed6ab2d6f6b102
Parents: be79142
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Nov 12 15:58:13 2014 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed Nov 12 15:58:13 2014 -0800

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/security/SSLFactory.java   | 4 
 .../org/apache/cassandra/thrift/CustomTThreadPoolServer.java | 4 
 src/java/org/apache/cassandra/transport/Server.java  | 1 +
 src/java/org/apache/cassandra/transport/SimpleClient.java| 1 +
 5 files changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b93f48a5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 47e611c..809a102 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.12:
+ * Disable SSLv3 for POODLE (CASSANDRA-8265)
  * Fix millisecond timestamps in Tracing (CASSANDRA-8297)
  * Include keyspace name in error message when there are insufficient
live nodes to stream from (CASSANDRA-8221)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b93f48a5/src/java/org/apache/cassandra/security/SSLFactory.java
--
diff --git a/src/java/org/apache/cassandra/security/SSLFactory.java 
b/src/java/org/apache/cassandra/security/SSLFactory.java
index 3cb0670..260c828 100644
--- a/src/java/org/apache/cassandra/security/SSLFactory.java
+++ b/src/java/org/apache/cassandra/security/SSLFactory.java
@@ -61,6 +61,7 @@ public final class SSLFactory
 String[] suits = 
filterCipherSuites(serverSocket.getSupportedCipherSuites(), 
options.cipher_suites);
 serverSocket.setEnabledCipherSuites(suits);
 serverSocket.setNeedClientAuth(options.require_client_auth);
+serverSocket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
 serverSocket.bind(new InetSocketAddress(address, port), 500);
 return serverSocket;
 }
@@ -72,6 +73,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) 
ctx.getSocketFactory().createSocket(address, port, localAddress, localPort);
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
+socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
 return socket;
 }
 
@@ -82,6 +84,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) 
ctx.getSocketFactory().createSocket(address, port);
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
+socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
 return socket;
 }
 
@@ -92,6 +95,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) ctx.getSocketFactory().createSocket();
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
+socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
 return socket;
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b93f48a5/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java 
b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
index d1a3304..3111deb 100644
--- a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
+++ b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
@@ -27,6 +27,8 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import javax.net.ssl.SSLServerSocket;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -251,6 +253,8 @@ public class CustomTThreadPoolServer extends TServer
 params.requireClientAuth(true);
 }
 TServerSocket sslServer = 
TSSLTransportFactory.getServerSocket

cassandra git commit: ninja-fix nit from casandra-8265 commit (make repeated strings a constant)

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 b93f48a5d - 37d33b208


ninja-fix nit from casandra-8265 commit (make repeated strings a constant)


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37d33b20
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37d33b20
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37d33b20

Branch: refs/heads/cassandra-2.0
Commit: 37d33b2086abb8e073a3ec7f9de23150eb49fb32
Parents: b93f48a
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Nov 12 16:12:36 2014 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed Nov 12 16:12:36 2014 -0800

--
 src/java/org/apache/cassandra/security/SSLFactory.java| 10 +-
 .../apache/cassandra/thrift/CustomTThreadPoolServer.java  |  3 ++-
 src/java/org/apache/cassandra/transport/Server.java   |  2 +-
 src/java/org/apache/cassandra/transport/SimpleClient.java |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/37d33b20/src/java/org/apache/cassandra/security/SSLFactory.java
--
diff --git a/src/java/org/apache/cassandra/security/SSLFactory.java 
b/src/java/org/apache/cassandra/security/SSLFactory.java
index 260c828..956ba67 100644
--- a/src/java/org/apache/cassandra/security/SSLFactory.java
+++ b/src/java/org/apache/cassandra/security/SSLFactory.java
@@ -50,7 +50,7 @@ import com.google.common.collect.Sets;
 public final class SSLFactory
 {
 private static final Logger logger = 
LoggerFactory.getLogger(SSLFactory.class);
-
+public static final String[] ACCEPTED_PROTOCOLS = new String[] 
{SSLv2Hello, TLSv1, TLSv1.1, TLSv1.2};
 private static boolean checkedExpiry = false;
 
 public static SSLServerSocket getServerSocket(EncryptionOptions options, 
InetAddress address, int port) throws IOException
@@ -61,7 +61,7 @@ public final class SSLFactory
 String[] suits = 
filterCipherSuites(serverSocket.getSupportedCipherSuites(), 
options.cipher_suites);
 serverSocket.setEnabledCipherSuites(suits);
 serverSocket.setNeedClientAuth(options.require_client_auth);
-serverSocket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
+serverSocket.setEnabledProtocols(ACCEPTED_PROTOCOLS);
 serverSocket.bind(new InetSocketAddress(address, port), 500);
 return serverSocket;
 }
@@ -73,7 +73,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) 
ctx.getSocketFactory().createSocket(address, port, localAddress, localPort);
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
-socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
+socket.setEnabledProtocols(ACCEPTED_PROTOCOLS);
 return socket;
 }
 
@@ -84,7 +84,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) 
ctx.getSocketFactory().createSocket(address, port);
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
-socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
+socket.setEnabledProtocols(ACCEPTED_PROTOCOLS);
 return socket;
 }
 
@@ -95,7 +95,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) ctx.getSocketFactory().createSocket();
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
-socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
+socket.setEnabledProtocols(ACCEPTED_PROTOCOLS);
 return socket;
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/37d33b20/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java 
b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
index 3111deb..f25c761 100644
--- a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
+++ b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
 import org.apache.cassandra.concurrent.NamedThreadFactory;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions;
+import org.apache.cassandra.security.SSLFactory;
 import org.apache.thrift.TException;
 import org.apache.thrift.TProcessor;
 

[1/2] cassandra git commit: ninja-fix nit from casandra-8265 commit (make repeated strings a constant)

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 1217afb5c - 5615a79cf


ninja-fix nit from casandra-8265 commit (make repeated strings a constant)


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37d33b20
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37d33b20
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37d33b20

Branch: refs/heads/cassandra-2.1
Commit: 37d33b2086abb8e073a3ec7f9de23150eb49fb32
Parents: b93f48a
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Nov 12 16:12:36 2014 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed Nov 12 16:12:36 2014 -0800

--
 src/java/org/apache/cassandra/security/SSLFactory.java| 10 +-
 .../apache/cassandra/thrift/CustomTThreadPoolServer.java  |  3 ++-
 src/java/org/apache/cassandra/transport/Server.java   |  2 +-
 src/java/org/apache/cassandra/transport/SimpleClient.java |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/37d33b20/src/java/org/apache/cassandra/security/SSLFactory.java
--
diff --git a/src/java/org/apache/cassandra/security/SSLFactory.java 
b/src/java/org/apache/cassandra/security/SSLFactory.java
index 260c828..956ba67 100644
--- a/src/java/org/apache/cassandra/security/SSLFactory.java
+++ b/src/java/org/apache/cassandra/security/SSLFactory.java
@@ -50,7 +50,7 @@ import com.google.common.collect.Sets;
 public final class SSLFactory
 {
 private static final Logger logger = 
LoggerFactory.getLogger(SSLFactory.class);
-
+public static final String[] ACCEPTED_PROTOCOLS = new String[] 
{SSLv2Hello, TLSv1, TLSv1.1, TLSv1.2};
 private static boolean checkedExpiry = false;
 
 public static SSLServerSocket getServerSocket(EncryptionOptions options, 
InetAddress address, int port) throws IOException
@@ -61,7 +61,7 @@ public final class SSLFactory
 String[] suits = 
filterCipherSuites(serverSocket.getSupportedCipherSuites(), 
options.cipher_suites);
 serverSocket.setEnabledCipherSuites(suits);
 serverSocket.setNeedClientAuth(options.require_client_auth);
-serverSocket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
+serverSocket.setEnabledProtocols(ACCEPTED_PROTOCOLS);
 serverSocket.bind(new InetSocketAddress(address, port), 500);
 return serverSocket;
 }
@@ -73,7 +73,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) 
ctx.getSocketFactory().createSocket(address, port, localAddress, localPort);
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
-socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
+socket.setEnabledProtocols(ACCEPTED_PROTOCOLS);
 return socket;
 }
 
@@ -84,7 +84,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) 
ctx.getSocketFactory().createSocket(address, port);
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
-socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
+socket.setEnabledProtocols(ACCEPTED_PROTOCOLS);
 return socket;
 }
 
@@ -95,7 +95,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) ctx.getSocketFactory().createSocket();
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
-socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
+socket.setEnabledProtocols(ACCEPTED_PROTOCOLS);
 return socket;
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/37d33b20/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java 
b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
index 3111deb..f25c761 100644
--- a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
+++ b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
 import org.apache.cassandra.concurrent.NamedThreadFactory;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions;
+import org.apache.cassandra.security.SSLFactory;
 import org.apache.thrift.TException;
 import org.apache.thrift.TProcessor;
 

[1/3] cassandra git commit: ninja-fix nit from casandra-8265 commit (make repeated strings a constant)

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/trunk e15cf78b5 - 88d4a14a8


ninja-fix nit from casandra-8265 commit (make repeated strings a constant)


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37d33b20
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37d33b20
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37d33b20

Branch: refs/heads/trunk
Commit: 37d33b2086abb8e073a3ec7f9de23150eb49fb32
Parents: b93f48a
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Nov 12 16:12:36 2014 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed Nov 12 16:12:36 2014 -0800

--
 src/java/org/apache/cassandra/security/SSLFactory.java| 10 +-
 .../apache/cassandra/thrift/CustomTThreadPoolServer.java  |  3 ++-
 src/java/org/apache/cassandra/transport/Server.java   |  2 +-
 src/java/org/apache/cassandra/transport/SimpleClient.java |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/37d33b20/src/java/org/apache/cassandra/security/SSLFactory.java
--
diff --git a/src/java/org/apache/cassandra/security/SSLFactory.java 
b/src/java/org/apache/cassandra/security/SSLFactory.java
index 260c828..956ba67 100644
--- a/src/java/org/apache/cassandra/security/SSLFactory.java
+++ b/src/java/org/apache/cassandra/security/SSLFactory.java
@@ -50,7 +50,7 @@ import com.google.common.collect.Sets;
 public final class SSLFactory
 {
 private static final Logger logger = 
LoggerFactory.getLogger(SSLFactory.class);
-
+public static final String[] ACCEPTED_PROTOCOLS = new String[] 
{SSLv2Hello, TLSv1, TLSv1.1, TLSv1.2};
 private static boolean checkedExpiry = false;
 
 public static SSLServerSocket getServerSocket(EncryptionOptions options, 
InetAddress address, int port) throws IOException
@@ -61,7 +61,7 @@ public final class SSLFactory
 String[] suits = 
filterCipherSuites(serverSocket.getSupportedCipherSuites(), 
options.cipher_suites);
 serverSocket.setEnabledCipherSuites(suits);
 serverSocket.setNeedClientAuth(options.require_client_auth);
-serverSocket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
+serverSocket.setEnabledProtocols(ACCEPTED_PROTOCOLS);
 serverSocket.bind(new InetSocketAddress(address, port), 500);
 return serverSocket;
 }
@@ -73,7 +73,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) 
ctx.getSocketFactory().createSocket(address, port, localAddress, localPort);
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
-socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
+socket.setEnabledProtocols(ACCEPTED_PROTOCOLS);
 return socket;
 }
 
@@ -84,7 +84,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) 
ctx.getSocketFactory().createSocket(address, port);
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
-socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
+socket.setEnabledProtocols(ACCEPTED_PROTOCOLS);
 return socket;
 }
 
@@ -95,7 +95,7 @@ public final class SSLFactory
 SSLSocket socket = (SSLSocket) ctx.getSocketFactory().createSocket();
 String[] suits = filterCipherSuites(socket.getSupportedCipherSuites(), 
options.cipher_suites);
 socket.setEnabledCipherSuites(suits);
-socket.setEnabledProtocols(new String[] {SSLv2Hello, TLSv1, 
TLSv1.1, TLSv1.2});
+socket.setEnabledProtocols(ACCEPTED_PROTOCOLS);
 return socket;
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/37d33b20/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java 
b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
index 3111deb..f25c761 100644
--- a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
+++ b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
 import org.apache.cassandra.concurrent.NamedThreadFactory;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions;
+import org.apache.cassandra.security.SSLFactory;
 import org.apache.thrift.TException;
 import org.apache.thrift.TProcessor;
 import 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
src/java/org/apache/cassandra/transport/Server.java
src/java/org/apache/cassandra/transport/SimpleClient.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5615a79c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5615a79c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5615a79c

Branch: refs/heads/cassandra-2.1
Commit: 5615a79cf0b4579af363688124d3f57fa7efa00d
Parents: 1217afb 37d33b2
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Nov 12 16:16:31 2014 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed Nov 12 16:16:31 2014 -0800

--
 src/java/org/apache/cassandra/security/SSLFactory.java| 10 +-
 .../apache/cassandra/thrift/CustomTThreadPoolServer.java  |  3 ++-
 src/java/org/apache/cassandra/transport/Server.java   |  2 +-
 src/java/org/apache/cassandra/transport/SimpleClient.java |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5615a79c/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
--
diff --cc src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
index 8a4d016,f25c761..7e67110
--- a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
+++ b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
@@@ -35,7 -35,7 +35,8 @@@ import org.slf4j.LoggerFactory
  import org.apache.cassandra.concurrent.NamedThreadFactory;
  import org.apache.cassandra.config.DatabaseDescriptor;
  import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions;
 +import org.apache.cassandra.utils.JVMStabilityInspector;
+ import org.apache.cassandra.security.SSLFactory;
  import org.apache.thrift.TException;
  import org.apache.thrift.TProcessor;
  import org.apache.thrift.protocol.TProtocol;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5615a79c/src/java/org/apache/cassandra/transport/Server.java
--
diff --cc src/java/org/apache/cassandra/transport/Server.java
index 2a60242,df4f127..ba6e895
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@@ -324,10 -296,13 +324,10 @@@ public class Server implements Cassandr
  sslEngine.setUseClientMode(false);
  sslEngine.setEnabledCipherSuites(encryptionOptions.cipher_suites);
  
sslEngine.setNeedClientAuth(encryptionOptions.require_client_auth);
- sslEngine.setEnabledProtocols(new String[] {SSLv2Hello, 
TLSv1, TLSv1.1, TLSv1.2});
+ sslEngine.setEnabledProtocols(SSLFactory.ACCEPTED_PROTOCOLS);
 -
  SslHandler sslHandler = new SslHandler(sslEngine);
 -sslHandler.setIssueHandshake(true);
 -ChannelPipeline pipeline = super.getPipeline();
 -pipeline.addFirst(ssl, sslHandler);
 -return pipeline;
 +super.initChannel(channel);
 +channel.pipeline().addFirst(ssl, sslHandler);
  }
  }
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5615a79c/src/java/org/apache/cassandra/transport/SimpleClient.java
--
diff --cc src/java/org/apache/cassandra/transport/SimpleClient.java
index 2e1e45e,1ed9ab9..3a6ecf7
--- a/src/java/org/apache/cassandra/transport/SimpleClient.java
+++ b/src/java/org/apache/cassandra/transport/SimpleClient.java
@@@ -253,8 -259,11 +253,8 @@@ public class SimpleClien
  SSLEngine sslEngine = sslContext.createSSLEngine();
  sslEngine.setUseClientMode(true);
  sslEngine.setEnabledCipherSuites(encryptionOptions.cipher_suites);
- sslEngine.setEnabledProtocols(new String[] {SSLv2Hello, 
TLSv1, TLSv1.1, TLSv1.2});
+ sslEngine.setEnabledProtocols(SSLFactory.ACCEPTED_PROTOCOLS);
 -ChannelPipeline pipeline = super.getPipeline();
 -
 -pipeline.addFirst(ssl, new SslHandler(sslEngine));
 -return pipeline;
 +channel.pipeline().addFirst(ssl, new SslHandler(sslEngine));
  }
  }
  

[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

[jasobrown]

Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88d4a14a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88d4a14a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88d4a14a

Branch: refs/heads/trunk
Commit: 88d4a14a885274837898853d3ec4c11223aa8a73
Parents: e15cf78 5615a79
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Nov 12 16:16:59 2014 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed Nov 12 16:16:59 2014 -0800

--
 src/java/org/apache/cassandra/security/SSLFactory.java| 10 +-
 .../apache/cassandra/thrift/CustomTThreadPoolServer.java  |  3 ++-
 src/java/org/apache/cassandra/transport/Server.java   |  2 +-
 src/java/org/apache/cassandra/transport/SimpleClient.java |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/88d4a14a/src/java/org/apache/cassandra/transport/Server.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/88d4a14a/src/java/org/apache/cassandra/transport/SimpleClient.java
--

[2/3] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
src/java/org/apache/cassandra/transport/Server.java
src/java/org/apache/cassandra/transport/SimpleClient.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5615a79c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5615a79c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5615a79c

Branch: refs/heads/trunk
Commit: 5615a79cf0b4579af363688124d3f57fa7efa00d
Parents: 1217afb 37d33b2
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Nov 12 16:16:31 2014 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed Nov 12 16:16:31 2014 -0800

--
 src/java/org/apache/cassandra/security/SSLFactory.java| 10 +-
 .../apache/cassandra/thrift/CustomTThreadPoolServer.java  |  3 ++-
 src/java/org/apache/cassandra/transport/Server.java   |  2 +-
 src/java/org/apache/cassandra/transport/SimpleClient.java |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5615a79c/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
--
diff --cc src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
index 8a4d016,f25c761..7e67110
--- a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
+++ b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
@@@ -35,7 -35,7 +35,8 @@@ import org.slf4j.LoggerFactory
  import org.apache.cassandra.concurrent.NamedThreadFactory;
  import org.apache.cassandra.config.DatabaseDescriptor;
  import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions;
 +import org.apache.cassandra.utils.JVMStabilityInspector;
+ import org.apache.cassandra.security.SSLFactory;
  import org.apache.thrift.TException;
  import org.apache.thrift.TProcessor;
  import org.apache.thrift.protocol.TProtocol;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5615a79c/src/java/org/apache/cassandra/transport/Server.java
--
diff --cc src/java/org/apache/cassandra/transport/Server.java
index 2a60242,df4f127..ba6e895
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@@ -324,10 -296,13 +324,10 @@@ public class Server implements Cassandr
  sslEngine.setUseClientMode(false);
  sslEngine.setEnabledCipherSuites(encryptionOptions.cipher_suites);
  
sslEngine.setNeedClientAuth(encryptionOptions.require_client_auth);
- sslEngine.setEnabledProtocols(new String[] {SSLv2Hello, 
TLSv1, TLSv1.1, TLSv1.2});
+ sslEngine.setEnabledProtocols(SSLFactory.ACCEPTED_PROTOCOLS);
 -
  SslHandler sslHandler = new SslHandler(sslEngine);
 -sslHandler.setIssueHandshake(true);
 -ChannelPipeline pipeline = super.getPipeline();
 -pipeline.addFirst(ssl, sslHandler);
 -return pipeline;
 +super.initChannel(channel);
 +channel.pipeline().addFirst(ssl, sslHandler);
  }
  }
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5615a79c/src/java/org/apache/cassandra/transport/SimpleClient.java
--
diff --cc src/java/org/apache/cassandra/transport/SimpleClient.java
index 2e1e45e,1ed9ab9..3a6ecf7
--- a/src/java/org/apache/cassandra/transport/SimpleClient.java
+++ b/src/java/org/apache/cassandra/transport/SimpleClient.java
@@@ -253,8 -259,11 +253,8 @@@ public class SimpleClien
  SSLEngine sslEngine = sslContext.createSSLEngine();
  sslEngine.setUseClientMode(true);
  sslEngine.setEnabledCipherSuites(encryptionOptions.cipher_suites);
- sslEngine.setEnabledProtocols(new String[] {SSLv2Hello, 
TLSv1, TLSv1.1, TLSv1.2});
+ sslEngine.setEnabledProtocols(SSLFactory.ACCEPTED_PROTOCOLS);
 -ChannelPipeline pipeline = super.getPipeline();
 -
 -pipeline.addFirst(ssl, new SslHandler(sslEngine));
 -return pipeline;
 +channel.pipeline().addFirst(ssl, new SslHandler(sslEngine));
  }
  }
  

git commit: Create backup directories for commitlog archiving during startup

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 7497399d0 - d828643f5


Create backup directories for commitlog archiving during startup

patch by Jan Karlsson, reviewed by jasobrown for CASSANDRA-8111


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d828643f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d828643f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d828643f

Branch: refs/heads/cassandra-2.0
Commit: d828643f555aac14be59e7f8b35ac67cb06da20b
Parents: 7497399
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 06:31:20 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 06:31:20 2014 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/db/commitlog/CommitLogArchiver.java   | 16 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d828643f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 84bbe75..2faea63 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.11:
+ * Create backup directories for commitlog archiving during startup 
(CASSANDRA-8111)
  * Reduce totalBlockFor() for LOCAL_* consistency levels (CASSANDRA-8058)
  * Fix merging schemas with re-dropped keyspaces (CASSANDRA-7256)
  * Fix counters in supercolumns during live upgrades from 1.2 (CASSANDRA-7188)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d828643f/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
--
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java 
b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
index f020182..e30443e 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
@@ -45,6 +45,7 @@ public class CommitLogArchiver
 {
 private static final Logger logger = 
LoggerFactory.getLogger(CommitLogArchiver.class);
 public static final SimpleDateFormat format = new 
SimpleDateFormat(:MM:dd HH:mm:ss);
+private static final String DELIMITER = ,;
 static
 {
 format.setTimeZone(TimeZone.getTimeZone(GMT));
@@ -81,6 +82,17 @@ public class CommitLogArchiver
 archiveCommand = 
commitlog_commands.getProperty(archive_command);
 restoreCommand = 
commitlog_commands.getProperty(restore_command);
 restoreDirectories = 
commitlog_commands.getProperty(restore_directories);
+for (String dir : restoreDirectories.split(DELIMITER))
+{
+File directory = new File(dir);
+if (!directory.exists())
+{
+if (!directory.mkdir())
+{
+throw new RuntimeException(Unable to create 
directory  + dir);
+}
+}
+}
 String targetTime = 
commitlog_commands.getProperty(restore_point_in_time);
 precision = 
TimeUnit.valueOf(commitlog_commands.getProperty(precision, MICROSECONDS));
 try
@@ -151,12 +163,12 @@ public class CommitLogArchiver
 if (Strings.isNullOrEmpty(restoreDirectories))
 return;
 
-for (String dir : restoreDirectories.split(,))
+for (String dir : restoreDirectories.split(DELIMITER))
 {
 File[] files = new File(dir).listFiles();
 if (files == null)
 {
-throw new RuntimeException(Unable to list director  + dir);
+throw new RuntimeException(Unable to list directory  + dir);
 }
 for (File fromFile : files)
 {

[1/2] git commit: Create backup directories for commitlog archiving during startup

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 c5cbd58a3 - 4b7161da4


Create backup directories for commitlog archiving during startup

patch by Jan Karlsson, reviewed by jasobrown for CASSANDRA-8111


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d828643f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d828643f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d828643f

Branch: refs/heads/cassandra-2.1
Commit: d828643f555aac14be59e7f8b35ac67cb06da20b
Parents: 7497399
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 06:31:20 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 06:31:20 2014 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/db/commitlog/CommitLogArchiver.java   | 16 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d828643f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 84bbe75..2faea63 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.11:
+ * Create backup directories for commitlog archiving during startup 
(CASSANDRA-8111)
  * Reduce totalBlockFor() for LOCAL_* consistency levels (CASSANDRA-8058)
  * Fix merging schemas with re-dropped keyspaces (CASSANDRA-7256)
  * Fix counters in supercolumns during live upgrades from 1.2 (CASSANDRA-7188)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d828643f/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
--
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java 
b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
index f020182..e30443e 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
@@ -45,6 +45,7 @@ public class CommitLogArchiver
 {
 private static final Logger logger = 
LoggerFactory.getLogger(CommitLogArchiver.class);
 public static final SimpleDateFormat format = new 
SimpleDateFormat(:MM:dd HH:mm:ss);
+private static final String DELIMITER = ,;
 static
 {
 format.setTimeZone(TimeZone.getTimeZone(GMT));
@@ -81,6 +82,17 @@ public class CommitLogArchiver
 archiveCommand = 
commitlog_commands.getProperty(archive_command);
 restoreCommand = 
commitlog_commands.getProperty(restore_command);
 restoreDirectories = 
commitlog_commands.getProperty(restore_directories);
+for (String dir : restoreDirectories.split(DELIMITER))
+{
+File directory = new File(dir);
+if (!directory.exists())
+{
+if (!directory.mkdir())
+{
+throw new RuntimeException(Unable to create 
directory  + dir);
+}
+}
+}
 String targetTime = 
commitlog_commands.getProperty(restore_point_in_time);
 precision = 
TimeUnit.valueOf(commitlog_commands.getProperty(precision, MICROSECONDS));
 try
@@ -151,12 +163,12 @@ public class CommitLogArchiver
 if (Strings.isNullOrEmpty(restoreDirectories))
 return;
 
-for (String dir : restoreDirectories.split(,))
+for (String dir : restoreDirectories.split(DELIMITER))
 {
 File[] files = new File(dir).listFiles();
 if (files == null)
 {
-throw new RuntimeException(Unable to list director  + dir);
+throw new RuntimeException(Unable to list directory  + dir);
 }
 for (File fromFile : files)
 {

[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b7161da
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b7161da
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b7161da

Branch: refs/heads/cassandra-2.1
Commit: 4b7161da4aacb2ca9e56ef78258df114d217ccde
Parents: c5cbd58 d828643
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 06:33:54 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 06:33:54 2014 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/db/commitlog/CommitLogArchiver.java   | 16 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b7161da/CHANGES.txt
--
diff --cc CHANGES.txt
index b6b1953,2faea63..bbe6982
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,76 -1,5 +1,77 @@@
 -2.0.11:
 +2.1.1
 + * Fix high memory use due to tracking reads on incrementally opened sstable 
readers (CASSANDRA-8066)
 + * Fix EXECUTE request with skipMetadata=false returning no metadata
 +   (CASSANDRA-8054)
 + * Allow concurrent use of CQLBulkOutputFormat (CASSANDRA-7776)
 + * Shutdown JVM on OOM (CASSANDRA-7507)
 + * Upgrade netty version and enable epoll event loop (CASSANDRA-7761)
 + * Don't duplicate sstables smaller than split size when using
 +   the sstablesplitter tool (CASSANDRA-7616)
 + * Avoid re-parsing already prepared statements (CASSANDRA-7923)
 + * Fix some Thrift slice deletions and updates of COMPACT STORAGE
 +   tables with some clustering columns omitted (CASSANDRA-7990)
 + * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction 
(CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (cqlsh) Tab completeion for indexes on map keys (CASSANDRA-7972)
 + * (cqlsh) Fix UDT field selection in select clause (CASSANDRA-7891)
 + * Fix resource leak in event of corrupt sstable
 + * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945)
 + * Fix saving caches when a table is dropped (CASSANDRA-7784)
 + * Add better error checking of new stress profile (CASSANDRA-7716)
 + * Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom 
(CASSANDRA-7934)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (cqlsh) tab-completion for triggers (CASSANDRA-7824)
 + * (cqlsh) Support for query paging (CASSANDRA-7514)
 + * (cqlsh) Show progress of COPY operations (CASSANDRA-7789)
 + * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
 + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
 + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
 +   output (CASSANDRA-7659)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
 + * Support list index operations with conditions (CASSANDRA-7499)
 + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
 + * (cqlsh) Error when tracing query (CASSANDRA-7613)
 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
 + * 

[3/3] git commit: Merge branch 'cassandra-2.1' into trunk

[jasobrown]

Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25821864
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25821864
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25821864

Branch: refs/heads/trunk
Commit: 25821864f7b8a9926761b9c93d5afeb637850a26
Parents: cd60129 4b7161d
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 06:34:26 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 06:34:26 2014 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/db/commitlog/CommitLogArchiver.java   | 16 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/25821864/CHANGES.txt
--

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b7161da
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b7161da
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b7161da

Branch: refs/heads/trunk
Commit: 4b7161da4aacb2ca9e56ef78258df114d217ccde
Parents: c5cbd58 d828643
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 06:33:54 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 06:33:54 2014 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/db/commitlog/CommitLogArchiver.java   | 16 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b7161da/CHANGES.txt
--
diff --cc CHANGES.txt
index b6b1953,2faea63..bbe6982
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,76 -1,5 +1,77 @@@
 -2.0.11:
 +2.1.1
 + * Fix high memory use due to tracking reads on incrementally opened sstable 
readers (CASSANDRA-8066)
 + * Fix EXECUTE request with skipMetadata=false returning no metadata
 +   (CASSANDRA-8054)
 + * Allow concurrent use of CQLBulkOutputFormat (CASSANDRA-7776)
 + * Shutdown JVM on OOM (CASSANDRA-7507)
 + * Upgrade netty version and enable epoll event loop (CASSANDRA-7761)
 + * Don't duplicate sstables smaller than split size when using
 +   the sstablesplitter tool (CASSANDRA-7616)
 + * Avoid re-parsing already prepared statements (CASSANDRA-7923)
 + * Fix some Thrift slice deletions and updates of COMPACT STORAGE
 +   tables with some clustering columns omitted (CASSANDRA-7990)
 + * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction 
(CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (cqlsh) Tab completeion for indexes on map keys (CASSANDRA-7972)
 + * (cqlsh) Fix UDT field selection in select clause (CASSANDRA-7891)
 + * Fix resource leak in event of corrupt sstable
 + * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945)
 + * Fix saving caches when a table is dropped (CASSANDRA-7784)
 + * Add better error checking of new stress profile (CASSANDRA-7716)
 + * Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom 
(CASSANDRA-7934)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (cqlsh) tab-completion for triggers (CASSANDRA-7824)
 + * (cqlsh) Support for query paging (CASSANDRA-7514)
 + * (cqlsh) Show progress of COPY operations (CASSANDRA-7789)
 + * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
 + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
 + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
 +   output (CASSANDRA-7659)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
 + * Support list index operations with conditions (CASSANDRA-7499)
 + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
 + * (cqlsh) Error when tracing query (CASSANDRA-7613)
 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
 + * SSTableExport 

[1/3] git commit: Create backup directories for commitlog archiving during startup

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/trunk cd601294d - 25821864f


Create backup directories for commitlog archiving during startup

patch by Jan Karlsson, reviewed by jasobrown for CASSANDRA-8111


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d828643f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d828643f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d828643f

Branch: refs/heads/trunk
Commit: d828643f555aac14be59e7f8b35ac67cb06da20b
Parents: 7497399
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 06:31:20 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 06:31:20 2014 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/db/commitlog/CommitLogArchiver.java   | 16 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d828643f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 84bbe75..2faea63 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.11:
+ * Create backup directories for commitlog archiving during startup 
(CASSANDRA-8111)
  * Reduce totalBlockFor() for LOCAL_* consistency levels (CASSANDRA-8058)
  * Fix merging schemas with re-dropped keyspaces (CASSANDRA-7256)
  * Fix counters in supercolumns during live upgrades from 1.2 (CASSANDRA-7188)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d828643f/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
--
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java 
b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
index f020182..e30443e 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
@@ -45,6 +45,7 @@ public class CommitLogArchiver
 {
 private static final Logger logger = 
LoggerFactory.getLogger(CommitLogArchiver.class);
 public static final SimpleDateFormat format = new 
SimpleDateFormat(:MM:dd HH:mm:ss);
+private static final String DELIMITER = ,;
 static
 {
 format.setTimeZone(TimeZone.getTimeZone(GMT));
@@ -81,6 +82,17 @@ public class CommitLogArchiver
 archiveCommand = 
commitlog_commands.getProperty(archive_command);
 restoreCommand = 
commitlog_commands.getProperty(restore_command);
 restoreDirectories = 
commitlog_commands.getProperty(restore_directories);
+for (String dir : restoreDirectories.split(DELIMITER))
+{
+File directory = new File(dir);
+if (!directory.exists())
+{
+if (!directory.mkdir())
+{
+throw new RuntimeException(Unable to create 
directory  + dir);
+}
+}
+}
 String targetTime = 
commitlog_commands.getProperty(restore_point_in_time);
 precision = 
TimeUnit.valueOf(commitlog_commands.getProperty(precision, MICROSECONDS));
 try
@@ -151,12 +163,12 @@ public class CommitLogArchiver
 if (Strings.isNullOrEmpty(restoreDirectories))
 return;
 
-for (String dir : restoreDirectories.split(,))
+for (String dir : restoreDirectories.split(DELIMITER))
 {
 File[] files = new File(dir).listFiles();
 if (files == null)
 {
-throw new RuntimeException(Unable to list director  + dir);
+throw new RuntimeException(Unable to list directory  + dir);
 }
 for (File fromFile : files)
 {

git commit: ninja fix to add null check on CommitLogArchiver startup

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 d828643f5 - cc8eeefe8


ninja fix to add null check on CommitLogArchiver startup


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc8eeefe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc8eeefe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc8eeefe

Branch: refs/heads/cassandra-2.0
Commit: cc8eeefe8895e01a2a5f387788bb3772b4dabbc9
Parents: d828643
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 06:57:52 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 06:57:52 2014 -0700

--
 .../cassandra/db/commitlog/CommitLogArchiver.java  | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc8eeefe/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
--
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java 
b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
index e30443e..8957643 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
@@ -82,14 +82,17 @@ public class CommitLogArchiver
 archiveCommand = 
commitlog_commands.getProperty(archive_command);
 restoreCommand = 
commitlog_commands.getProperty(restore_command);
 restoreDirectories = 
commitlog_commands.getProperty(restore_directories);
-for (String dir : restoreDirectories.split(DELIMITER))
+if (restoreDirectories != null  
!restoreDirectories.isEmpty())
 {
-File directory = new File(dir);
-if (!directory.exists())
+for (String dir : restoreDirectories.split(DELIMITER))
 {
-if (!directory.mkdir())
+File directory = new File(dir);
+if (!directory.exists())
 {
-throw new RuntimeException(Unable to create 
directory  + dir);
+if (!directory.mkdir())
+{
+throw new RuntimeException(Unable to create 
directory:  + dir);
+}
 }
 }
 }

[1/2] git commit: ninja fix to add null check on CommitLogArchiver startup

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 4b7161da4 - b76dc9727


ninja fix to add null check on CommitLogArchiver startup


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc8eeefe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc8eeefe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc8eeefe

Branch: refs/heads/cassandra-2.1
Commit: cc8eeefe8895e01a2a5f387788bb3772b4dabbc9
Parents: d828643
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 06:57:52 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 06:57:52 2014 -0700

--
 .../cassandra/db/commitlog/CommitLogArchiver.java  | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc8eeefe/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
--
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java 
b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
index e30443e..8957643 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
@@ -82,14 +82,17 @@ public class CommitLogArchiver
 archiveCommand = 
commitlog_commands.getProperty(archive_command);
 restoreCommand = 
commitlog_commands.getProperty(restore_command);
 restoreDirectories = 
commitlog_commands.getProperty(restore_directories);
-for (String dir : restoreDirectories.split(DELIMITER))
+if (restoreDirectories != null  
!restoreDirectories.isEmpty())
 {
-File directory = new File(dir);
-if (!directory.exists())
+for (String dir : restoreDirectories.split(DELIMITER))
 {
-if (!directory.mkdir())
+File directory = new File(dir);
+if (!directory.exists())
 {
-throw new RuntimeException(Unable to create 
directory  + dir);
+if (!directory.mkdir())
+{
+throw new RuntimeException(Unable to create 
directory:  + dir);
+}
 }
 }
 }

[3/3] git commit: Merge branch 'cassandra-2.1' into trunk

[jasobrown]

Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/18912409
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18912409
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18912409

Branch: refs/heads/trunk
Commit: 18912409116e4ceb8cac037264e76c194fb879d6
Parents: 2582186 b76dc97
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 06:59:14 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 06:59:14 2014 -0700

--
 .../cassandra/db/commitlog/CommitLogArchiver.java  | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)
--

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b76dc972
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b76dc972
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b76dc972

Branch: refs/heads/trunk
Commit: b76dc9727403c6f9ef2eaaf9f990d784b4d2a722
Parents: 4b7161d cc8eeef
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 06:58:46 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 06:58:46 2014 -0700

--
 .../cassandra/db/commitlog/CommitLogArchiver.java  | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b76dc972/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
--

[1/3] git commit: ninja fix to add null check on CommitLogArchiver startup

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 25821864f - 189124091


ninja fix to add null check on CommitLogArchiver startup


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc8eeefe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc8eeefe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc8eeefe

Branch: refs/heads/trunk
Commit: cc8eeefe8895e01a2a5f387788bb3772b4dabbc9
Parents: d828643
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 06:57:52 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 06:57:52 2014 -0700

--
 .../cassandra/db/commitlog/CommitLogArchiver.java  | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc8eeefe/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
--
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java 
b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
index e30443e..8957643 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
@@ -82,14 +82,17 @@ public class CommitLogArchiver
 archiveCommand = 
commitlog_commands.getProperty(archive_command);
 restoreCommand = 
commitlog_commands.getProperty(restore_command);
 restoreDirectories = 
commitlog_commands.getProperty(restore_directories);
-for (String dir : restoreDirectories.split(DELIMITER))
+if (restoreDirectories != null  
!restoreDirectories.isEmpty())
 {
-File directory = new File(dir);
-if (!directory.exists())
+for (String dir : restoreDirectories.split(DELIMITER))
 {
-if (!directory.mkdir())
+File directory = new File(dir);
+if (!directory.exists())
 {
-throw new RuntimeException(Unable to create 
directory  + dir);
+if (!directory.mkdir())
+{
+throw new RuntimeException(Unable to create 
directory:  + dir);
+}
 }
 }
 }

[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b76dc972
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b76dc972
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b76dc972

Branch: refs/heads/cassandra-2.1
Commit: b76dc9727403c6f9ef2eaaf9f990d784b4d2a722
Parents: 4b7161d cc8eeef
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 06:58:46 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 06:58:46 2014 -0700

--
 .../cassandra/db/commitlog/CommitLogArchiver.java  | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b76dc972/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
--

git commit: Gossip should ignore generation numbers too far in the future

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 ae9c06692 - 8be8a086c


Gossip should ignore generation numbers too far in the future

patch by jasobrown; reviewed by driftx for CASSANDRA-8113


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8be8a086
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8be8a086
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8be8a086

Branch: refs/heads/cassandra-2.1
Commit: 8be8a086cb40f3280e9af5543d7b170241b268d8
Parents: ae9c066
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 14:55:42 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 14:55:42 2014 -0700

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/gms/Gossiper.java | 11 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8be8a086/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 1c7ee38..6d9d221 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.1
+ * Gossip should ignore generation numbers too far in the future 
(CASSANDRA-8113)
  * Fix NPE when creating a table with frozen sets, lists (CASSANDRA-8104)
  * Fix high memory use due to tracking reads on incrementally opened sstable
readers (CASSANDRA-8066)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8be8a086/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java 
b/src/java/org/apache/cassandra/gms/Gossiper.java
index bedc8d7..ae8bf32 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -82,6 +82,9 @@ public class Gossiper implements 
IFailureDetectionEventListener, GossiperMBean
 public static final Gossiper instance = new Gossiper();
 
 public static final long aVeryLongTime = 259200 * 1000; // 3 days
+
+/** Maximimum difference in generation and version values we are willing 
to accept about a peer */
+private static final long MAX_GENERATION_DIFFERENCE = 86400 * 365;
 private long FatClientTimeout;
 private final Random random = new Random();
 private final ComparatorInetAddress inetcomparator = new 
ComparatorInetAddress()
@@ -984,7 +987,13 @@ public class Gossiper implements 
IFailureDetectionEventListener, GossiperMBean
 if (logger.isTraceEnabled())
 logger.trace(ep + local generation  + localGeneration + 
, remote generation  + remoteGeneration);
 
-if (remoteGeneration  localGeneration)
+if (remoteGeneration  localGeneration + 
MAX_GENERATION_DIFFERENCE)
+{
+// assume some peer has corrupted memory and is 
broadcasting an unbelievable generation about another peer (or itself)
+logger.warn(received an invalid gossip generation for 
peer {}; local generation = {}, received generation = {}, ep, localGeneration, 
remoteGeneration);
+continue;
+}
+else if (remoteGeneration  localGeneration)
 {
 if (logger.isTraceEnabled())
 logger.trace(Updating heartbeat state generation to  
+ remoteGeneration +  from  + localGeneration +  for  + ep);

[2/2] git commit: Merge branch 'cassandra-2.1' into trunk

[jasobrown]

Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/18549038
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18549038
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18549038

Branch: refs/heads/trunk
Commit: 18549038a1ea76a48b2bb4a3eede642978ef966d
Parents: 6630b87 8be8a08
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 14:56:33 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 14:56:33 2014 -0700

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/gms/Gossiper.java | 11 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/18549038/CHANGES.txt
--
diff --cc CHANGES.txt
index 5dac7f4,6d9d221..be84b11
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,5 +1,35 @@@
 +3.0
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 
7781, 7929,
 +   7924, 7812, 8063)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * improve concurrency of repair (CASSANDRA-6455)
 +
 +
  2.1.1
+  * Gossip should ignore generation numbers too far in the future 
(CASSANDRA-8113)
   * Fix NPE when creating a table with frozen sets, lists (CASSANDRA-8104)
   * Fix high memory use due to tracking reads on incrementally opened sstable
 readers (CASSANDRA-8066)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/18549038/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index c488b09,ae8bf32..364837d
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -990,12 -985,18 +993,18 @@@ public class Gossiper implements IFailu
  int localGeneration = 
localEpStatePtr.getHeartBeatState().getGeneration();
  int remoteGeneration = 
remoteState.getHeartBeatState().getGeneration();
  if (logger.isTraceEnabled())
 -logger.trace(ep + local generation  + localGeneration + 
, remote generation  + remoteGeneration);
 +logger.trace({} local generation {}, remote generation 
{}, ep, localGeneration, remoteGeneration);
  
- if (remoteGeneration  localGeneration)
+ if (remoteGeneration  localGeneration + 
MAX_GENERATION_DIFFERENCE)
+ {
+ // assume some peer has corrupted memory and is 
broadcasting an unbelievable generation about another peer (or itself)
+ logger.warn(received an invalid gossip generation for 
peer {}; local generation = {}, received generation = {}, ep, localGeneration, 
remoteGeneration);
+ continue;
+ }
+ else if (remoteGeneration  localGeneration)
  {
  if (logger.isTraceEnabled())
 -logger.trace(Updating heartbeat state generation to 
 + remoteGeneration +  from  + localGeneration +  for  + ep);
 +logger.trace(Updating heartbeat state generation to 
{} from {} for {}, remoteGeneration, localGeneration, ep);
  // major state change will handle the update by inserting 
the remote 

[1/2] git commit: Gossip should ignore generation numbers too far in the future

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 6630b8786 - 18549038a


Gossip should ignore generation numbers too far in the future

patch by jasobrown; reviewed by driftx for CASSANDRA-8113


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8be8a086
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8be8a086
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8be8a086

Branch: refs/heads/trunk
Commit: 8be8a086cb40f3280e9af5543d7b170241b268d8
Parents: ae9c066
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 14:55:42 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 14:55:42 2014 -0700

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/gms/Gossiper.java | 11 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8be8a086/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 1c7ee38..6d9d221 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.1
+ * Gossip should ignore generation numbers too far in the future 
(CASSANDRA-8113)
  * Fix NPE when creating a table with frozen sets, lists (CASSANDRA-8104)
  * Fix high memory use due to tracking reads on incrementally opened sstable
readers (CASSANDRA-8066)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8be8a086/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java 
b/src/java/org/apache/cassandra/gms/Gossiper.java
index bedc8d7..ae8bf32 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -82,6 +82,9 @@ public class Gossiper implements 
IFailureDetectionEventListener, GossiperMBean
 public static final Gossiper instance = new Gossiper();
 
 public static final long aVeryLongTime = 259200 * 1000; // 3 days
+
+/** Maximimum difference in generation and version values we are willing 
to accept about a peer */
+private static final long MAX_GENERATION_DIFFERENCE = 86400 * 365;
 private long FatClientTimeout;
 private final Random random = new Random();
 private final ComparatorInetAddress inetcomparator = new 
ComparatorInetAddress()
@@ -984,7 +987,13 @@ public class Gossiper implements 
IFailureDetectionEventListener, GossiperMBean
 if (logger.isTraceEnabled())
 logger.trace(ep + local generation  + localGeneration + 
, remote generation  + remoteGeneration);
 
-if (remoteGeneration  localGeneration)
+if (remoteGeneration  localGeneration + 
MAX_GENERATION_DIFFERENCE)
+{
+// assume some peer has corrupted memory and is 
broadcasting an unbelievable generation about another peer (or itself)
+logger.warn(received an invalid gossip generation for 
peer {}; local generation = {}, received generation = {}, ep, localGeneration, 
remoteGeneration);
+continue;
+}
+else if (remoteGeneration  localGeneration)
 {
 if (logger.isTraceEnabled())
 logger.trace(Updating heartbeat state generation to  
+ remoteGeneration +  from  + localGeneration +  for  + ep);

git commit: ninja-remove unneeded continue statement

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 8be8a086c - 311d1


ninja-remove unneeded continue statement


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/311d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/311d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/311d

Branch: refs/heads/cassandra-2.1
Commit: 311d182c24f830924501fde6474438e82b41
Parents: 8be8a08
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 14:58:54 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 14:58:54 2014 -0700

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/311d/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java 
b/src/java/org/apache/cassandra/gms/Gossiper.java
index ae8bf32..5f0e576 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -991,7 +991,6 @@ public class Gossiper implements 
IFailureDetectionEventListener, GossiperMBean
 {
 // assume some peer has corrupted memory and is 
broadcasting an unbelievable generation about another peer (or itself)
 logger.warn(received an invalid gossip generation for 
peer {}; local generation = {}, received generation = {}, ep, localGeneration, 
remoteGeneration);
-continue;
 }
 else if (remoteGeneration  localGeneration)
 {

[2/2] git commit: Merge branch 'cassandra-2.1' into trunk

[jasobrown]

Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/18886e12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18886e12
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18886e12

Branch: refs/heads/trunk
Commit: 18886e128bfb1e85456dee61f64378fe5a9ff3d1
Parents: 1854903 311
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 14:59:52 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 14:59:52 2014 -0700

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/18886e12/src/java/org/apache/cassandra/gms/Gossiper.java
--

[1/2] git commit: ninja-remove unneeded continue statement

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 18549038a - 18886e128


ninja-remove unneeded continue statement


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/311d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/311d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/311d

Branch: refs/heads/trunk
Commit: 311d182c24f830924501fde6474438e82b41
Parents: 8be8a08
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 14:58:54 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 14:58:54 2014 -0700

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/311d/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java 
b/src/java/org/apache/cassandra/gms/Gossiper.java
index ae8bf32..5f0e576 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -991,7 +991,6 @@ public class Gossiper implements 
IFailureDetectionEventListener, GossiperMBean
 {
 // assume some peer has corrupted memory and is 
broadcasting an unbelievable generation about another peer (or itself)
 logger.warn(received an invalid gossip generation for 
peer {}; local generation = {}, received generation = {}, ep, localGeneration, 
remoteGeneration);
-continue;
 }
 else if (remoteGeneration  localGeneration)
 {

git commit: SSL does not work in cassandra-cli.

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 6eec29ed8 - df046dfe0


SSL does not work in cassandra-cli.

patch by jasobrown, reviewed by beobal for CASSANDRA-7899


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df046dfe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df046dfe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df046dfe

Branch: refs/heads/cassandra-2.0
Commit: df046dfe092ea5a08ec0e29a00d30423284d1f86
Parents: 6eec29e
Author: Jason Brown jasobr...@apple.com
Authored: Mon Oct 6 14:44:51 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Mon Oct 6 14:44:51 2014 -0700

--
 CHANGES.txt |  1 +
 .../cli/transport/FramedTransportFactory.java   | 32 -
 .../cli/transport/SSLTransportFactory.java  | 47 
 .../cassandra/thrift/SSLTransportFactory.java   |  6 +--
 4 files changed, 4 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046dfe/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 66d7e72..c811ebf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.11:
+ * SSL does not work in cassandra-cli (CASSANDRA-7899)
  * Fix potential exception when using ReversedType in DynamicCompositeType
(CASSANDRA-7898)
  * Better validation of collection values (CASSANDRA-7833)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046dfe/src/java/org/apache/cassandra/cli/transport/FramedTransportFactory.java
--
diff --git 
a/src/java/org/apache/cassandra/cli/transport/FramedTransportFactory.java 
b/src/java/org/apache/cassandra/cli/transport/FramedTransportFactory.java
deleted file mode 100644
index dc7ef81..000
--- a/src/java/org/apache/cassandra/cli/transport/FramedTransportFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cassandra.cli.transport;
-
-import org.apache.thrift.transport.TFramedTransport;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportFactory;
-
-public class FramedTransportFactory extends TTransportFactory
-{
-public static final int DEFAULT_MAX_FRAME_SIZE = 15 * 1024 * 1024; // 15 
MiB
-
-public TTransport getTransport(TTransport base)
-{
-return new TFramedTransport(base, DEFAULT_MAX_FRAME_SIZE);
-}
-}

http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046dfe/src/java/org/apache/cassandra/cli/transport/SSLTransportFactory.java
--
diff --git 
a/src/java/org/apache/cassandra/cli/transport/SSLTransportFactory.java 
b/src/java/org/apache/cassandra/cli/transport/SSLTransportFactory.java
deleted file mode 100644
index 4aa9fc1..000
--- a/src/java/org/apache/cassandra/cli/transport/SSLTransportFactory.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cassandra.cli.transport;
-
-import org.apache.cassandra.cli.CliMain;
-import org.apache.cassandra.cli.CliSessionState;
-import

[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/26016046
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26016046
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26016046

Branch: refs/heads/cassandra-2.1
Commit: 2601604695e421dd056601b1d84a35bf58809a1e
Parents: b760990 df046df
Author: Jason Brown jasobr...@apple.com
Authored: Mon Oct 6 14:54:25 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Mon Oct 6 14:54:25 2014 -0700

--
 CHANGES.txt |  1 +
 .../cli/transport/FramedTransportFactory.java   | 32 -
 .../cli/transport/SSLTransportFactory.java  | 47 
 .../cassandra/thrift/SSLTransportFactory.java   |  5 ++-
 4 files changed, 4 insertions(+), 81 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26016046/CHANGES.txt
--
diff --cc CHANGES.txt
index e9e9fce,c811ebf..f9523ed
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,64 -1,5 +1,65 @@@
 -2.0.11:
 +2.1.1
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction 
(CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (cqlsh) Tab completeion for indexes on map keys (CASSANDRA-7972)
 + * (cqlsh) Fix UDT field selection in select clause (CASSANDRA-7891)
 + * Fix resource leak in event of corrupt sstable
 + * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945)
 + * Fix saving caches when a table is dropped (CASSANDRA-7784)
 + * Add better error checking of new stress profile (CASSANDRA-7716)
 + * Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom 
(CASSANDRA-7934)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (cqlsh) tab-completion for triggers (CASSANDRA-7824)
 + * (cqlsh) Support for query paging (CASSANDRA-7514)
 + * (cqlsh) Show progress of COPY operations (CASSANDRA-7789)
 + * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
 + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
 + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
 +   output (CASSANDRA-7659)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
 + * Support list index operations with conditions (CASSANDRA-7499)
 + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
 + * (cqlsh) Error when tracing query (CASSANDRA-7613)
 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
 + * SSTableExport uses correct validator to create string representation of 
partition
 +   keys (CASSANDRA-7498)
 + * Avoid NPEs when receiving type changes for an unknown keyspace 
(CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * 

[1/2] git commit: SSL does not work in cassandra-cli.

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 b7609903b - 260160469


SSL does not work in cassandra-cli.

patch by jasobrown, reviewed by beobal for CASSANDRA-7899


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df046dfe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df046dfe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df046dfe

Branch: refs/heads/cassandra-2.1
Commit: df046dfe092ea5a08ec0e29a00d30423284d1f86
Parents: 6eec29e
Author: Jason Brown jasobr...@apple.com
Authored: Mon Oct 6 14:44:51 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Mon Oct 6 14:44:51 2014 -0700

--
 CHANGES.txt |  1 +
 .../cli/transport/FramedTransportFactory.java   | 32 -
 .../cli/transport/SSLTransportFactory.java  | 47 
 .../cassandra/thrift/SSLTransportFactory.java   |  6 +--
 4 files changed, 4 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046dfe/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 66d7e72..c811ebf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.11:
+ * SSL does not work in cassandra-cli (CASSANDRA-7899)
  * Fix potential exception when using ReversedType in DynamicCompositeType
(CASSANDRA-7898)
  * Better validation of collection values (CASSANDRA-7833)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046dfe/src/java/org/apache/cassandra/cli/transport/FramedTransportFactory.java
--
diff --git 
a/src/java/org/apache/cassandra/cli/transport/FramedTransportFactory.java 
b/src/java/org/apache/cassandra/cli/transport/FramedTransportFactory.java
deleted file mode 100644
index dc7ef81..000
--- a/src/java/org/apache/cassandra/cli/transport/FramedTransportFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cassandra.cli.transport;
-
-import org.apache.thrift.transport.TFramedTransport;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportFactory;
-
-public class FramedTransportFactory extends TTransportFactory
-{
-public static final int DEFAULT_MAX_FRAME_SIZE = 15 * 1024 * 1024; // 15 
MiB
-
-public TTransport getTransport(TTransport base)
-{
-return new TFramedTransport(base, DEFAULT_MAX_FRAME_SIZE);
-}
-}

http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046dfe/src/java/org/apache/cassandra/cli/transport/SSLTransportFactory.java
--
diff --git 
a/src/java/org/apache/cassandra/cli/transport/SSLTransportFactory.java 
b/src/java/org/apache/cassandra/cli/transport/SSLTransportFactory.java
deleted file mode 100644
index 4aa9fc1..000
--- a/src/java/org/apache/cassandra/cli/transport/SSLTransportFactory.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cassandra.cli.transport;
-
-import org.apache.cassandra.cli.CliMain;
-import org.apache.cassandra.cli.CliSessionState;
-import

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/26016046
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26016046
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26016046

Branch: refs/heads/trunk
Commit: 2601604695e421dd056601b1d84a35bf58809a1e
Parents: b760990 df046df
Author: Jason Brown jasobr...@apple.com
Authored: Mon Oct 6 14:54:25 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Mon Oct 6 14:54:25 2014 -0700

--
 CHANGES.txt |  1 +
 .../cli/transport/FramedTransportFactory.java   | 32 -
 .../cli/transport/SSLTransportFactory.java  | 47 
 .../cassandra/thrift/SSLTransportFactory.java   |  5 ++-
 4 files changed, 4 insertions(+), 81 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26016046/CHANGES.txt
--
diff --cc CHANGES.txt
index e9e9fce,c811ebf..f9523ed
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,64 -1,5 +1,65 @@@
 -2.0.11:
 +2.1.1
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction 
(CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (cqlsh) Tab completeion for indexes on map keys (CASSANDRA-7972)
 + * (cqlsh) Fix UDT field selection in select clause (CASSANDRA-7891)
 + * Fix resource leak in event of corrupt sstable
 + * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945)
 + * Fix saving caches when a table is dropped (CASSANDRA-7784)
 + * Add better error checking of new stress profile (CASSANDRA-7716)
 + * Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom 
(CASSANDRA-7934)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (cqlsh) tab-completion for triggers (CASSANDRA-7824)
 + * (cqlsh) Support for query paging (CASSANDRA-7514)
 + * (cqlsh) Show progress of COPY operations (CASSANDRA-7789)
 + * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
 + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
 + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
 +   output (CASSANDRA-7659)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
 + * Support list index operations with conditions (CASSANDRA-7499)
 + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
 + * (cqlsh) Error when tracing query (CASSANDRA-7613)
 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
 + * SSTableExport uses correct validator to create string representation of 
partition
 +   keys (CASSANDRA-7498)
 + * Avoid NPEs when receiving type changes for an unknown keyspace 
(CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include 

[1/3] git commit: SSL does not work in cassandra-cli.

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 3afd0a86d - f72668552


SSL does not work in cassandra-cli.

patch by jasobrown, reviewed by beobal for CASSANDRA-7899


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df046dfe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df046dfe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df046dfe

Branch: refs/heads/trunk
Commit: df046dfe092ea5a08ec0e29a00d30423284d1f86
Parents: 6eec29e
Author: Jason Brown jasobr...@apple.com
Authored: Mon Oct 6 14:44:51 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Mon Oct 6 14:44:51 2014 -0700

--
 CHANGES.txt |  1 +
 .../cli/transport/FramedTransportFactory.java   | 32 -
 .../cli/transport/SSLTransportFactory.java  | 47 
 .../cassandra/thrift/SSLTransportFactory.java   |  6 +--
 4 files changed, 4 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046dfe/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 66d7e72..c811ebf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.11:
+ * SSL does not work in cassandra-cli (CASSANDRA-7899)
  * Fix potential exception when using ReversedType in DynamicCompositeType
(CASSANDRA-7898)
  * Better validation of collection values (CASSANDRA-7833)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046dfe/src/java/org/apache/cassandra/cli/transport/FramedTransportFactory.java
--
diff --git 
a/src/java/org/apache/cassandra/cli/transport/FramedTransportFactory.java 
b/src/java/org/apache/cassandra/cli/transport/FramedTransportFactory.java
deleted file mode 100644
index dc7ef81..000
--- a/src/java/org/apache/cassandra/cli/transport/FramedTransportFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cassandra.cli.transport;
-
-import org.apache.thrift.transport.TFramedTransport;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportFactory;
-
-public class FramedTransportFactory extends TTransportFactory
-{
-public static final int DEFAULT_MAX_FRAME_SIZE = 15 * 1024 * 1024; // 15 
MiB
-
-public TTransport getTransport(TTransport base)
-{
-return new TFramedTransport(base, DEFAULT_MAX_FRAME_SIZE);
-}
-}

http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046dfe/src/java/org/apache/cassandra/cli/transport/SSLTransportFactory.java
--
diff --git 
a/src/java/org/apache/cassandra/cli/transport/SSLTransportFactory.java 
b/src/java/org/apache/cassandra/cli/transport/SSLTransportFactory.java
deleted file mode 100644
index 4aa9fc1..000
--- a/src/java/org/apache/cassandra/cli/transport/SSLTransportFactory.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cassandra.cli.transport;
-
-import org.apache.cassandra.cli.CliMain;
-import org.apache.cassandra.cli.CliSessionState;
-import

[3/3] git commit: Merge branch 'cassandra-2.1' into trunk

[jasobrown]

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/thrift/SSLTransportFactory.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f7266855
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7266855
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7266855

Branch: refs/heads/trunk
Commit: f7266855218b8e9eb34a62ad933c4ed889a71c64
Parents: 3afd0a8 2601604
Author: Jason Brown jasobr...@apple.com
Authored: Mon Oct 6 14:56:35 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Mon Oct 6 14:56:35 2014 -0700

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/thrift/SSLTransportFactory.java | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7266855/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7266855/src/java/org/apache/cassandra/thrift/SSLTransportFactory.java
--

[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
build.xml


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d692141
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d692141
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d692141

Branch: refs/heads/cassandra-2.1
Commit: 8d692141970aeef5d0566b336fa7f14c1e54bcef
Parents: 037963c e6f307f
Author: Jason Brown jasobr...@apple.com
Authored: Fri Sep 5 16:45:20 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri Sep 5 16:45:20 2014 -0700

--
 build.xml   |   4 ++--
 lib/thrift-server-0.3.6.jar | Bin 39588 - 0 bytes
 lib/thrift-server-0.3.7.jar | Bin 0 - 39988 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d692141/build.xml
--
diff --cc build.xml
index 0880975,829c873..5f2b568
--- a/build.xml
+++ b/build.xml
@@@ -366,11 -359,9 +366,11 @@@
  exclusion groupId=junit artifactId=junit/
/dependency
dependency groupId=com.googlecode.json-simple 
artifactId=json-simple version=1.1/
 -  dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib version=1.1.2/
 -  dependency groupId=com.github.stephenc artifactId=jamm 
version=0.2.5/
 - dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.7/
 +  dependency groupId=com.boundary artifactId=high-scale-lib 
version=1.0.6/
 +  dependency groupId=com.github.jbellis artifactId=jamm 
version=0.2.6/
-   dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6
++  dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.7
 +  exclusion groupId=org.slf4j artifactId=slf4j-log4j12/
 +  /dependency
dependency groupId=org.yaml artifactId=snakeyaml 
version=1.11/
dependency groupId=org.apache.thrift artifactId=libthrift 
version=0.9.1/
  
@@@ -495,12 -466,13 +495,12 @@@
  dependency groupId=org.mindrot artifactId=jbcrypt/
  dependency groupId=com.yammer.metrics artifactId=metrics-core/
  dependency groupId=com.addthis.metrics 
artifactId=reporter-config/
- dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
+ dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.7/
 +dependency groupId=com.clearspring.analytics artifactId=stream 
version=2.5.2 /
  dependency groupId=net.sf.supercsv artifactId=super-csv 
version=2.1.0 /
  
 -dependency groupId=log4j artifactId=log4j/
 -!-- cassandra has a hard dependency on log4j, so force slf4j's log4j 
provider at runtime --
 -dependency groupId=org.slf4j artifactId=slf4j-log4j12 
scope=runtime/
 +dependency groupId=ch.qos.logback artifactId=logback-core/
 +dependency groupId=ch.qos.logback artifactId=logback-classic/
  
  dependency groupId=org.apache.thrift artifactId=libthrift/
  dependency groupId=org.apache.cassandra 
artifactId=cassandra-thrift/

[1/2] git commit: bump thrift-server version to 0.3.7 to properly shutdown invocation pool shutdown patch by Pavel Yaskevich; tested by Philip Thompson for CASSANDRA-7594

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 037963c62 - 8d6921419


bump thrift-server version to 0.3.7 to properly shutdown invocation pool 
shutdown
patch by Pavel Yaskevich; tested by Philip Thompson for CASSANDRA-7594


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e6f307f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6f307f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6f307f4

Branch: refs/heads/cassandra-2.1
Commit: e6f307f4e5be4bf2cd18e153d28e2310e5f8d3da
Parents: 46ef962
Author: Pavel Yaskevich xe...@apache.org
Authored: Fri Sep 5 14:23:24 2014 -0700
Committer: Pavel Yaskevich xe...@apache.org
Committed: Fri Sep 5 14:23:24 2014 -0700

--
 build.xml   |   4 ++--
 lib/thrift-server-0.3.6.jar | Bin 39588 - 0 bytes
 lib/thrift-server-0.3.7.jar | Bin 0 - 39988 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6f307f4/build.xml
--
diff --git a/build.xml b/build.xml
index f456fa8..829c873 100644
--- a/build.xml
+++ b/build.xml
@@ -361,7 +361,7 @@
   dependency groupId=com.googlecode.json-simple 
artifactId=json-simple version=1.1/
   dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib version=1.1.2/
   dependency groupId=com.github.stephenc artifactId=jamm 
version=0.2.5/
-  dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
+  dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.7/
   dependency groupId=org.yaml artifactId=snakeyaml 
version=1.11/
   dependency groupId=org.apache.thrift artifactId=libthrift 
version=0.9.1/
 
@@ -467,7 +467,7 @@
 dependency groupId=org.mindrot artifactId=jbcrypt/
 dependency groupId=com.yammer.metrics artifactId=metrics-core/
 dependency groupId=com.addthis.metrics 
artifactId=reporter-config/
-dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
+dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.7/
 dependency groupId=net.sf.supercsv artifactId=super-csv 
version=2.1.0 /
 
 dependency groupId=log4j artifactId=log4j/

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6f307f4/lib/thrift-server-0.3.6.jar
--
diff --git a/lib/thrift-server-0.3.6.jar b/lib/thrift-server-0.3.6.jar
deleted file mode 100644
index c974f75..000
Binary files a/lib/thrift-server-0.3.6.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6f307f4/lib/thrift-server-0.3.7.jar
--
diff --git a/lib/thrift-server-0.3.7.jar b/lib/thrift-server-0.3.7.jar
new file mode 100644
index 000..1231618
Binary files /dev/null and b/lib/thrift-server-0.3.7.jar differ

[1/2] git commit: bump thrift-server version to 0.3.7 to properly shutdown invocation pool shutdown patch by Pavel Yaskevich; tested by Philip Thompson for CASSANDRA-7594

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 c1dc378e0 - 5d5401d67


bump thrift-server version to 0.3.7 to properly shutdown invocation pool 
shutdown
patch by Pavel Yaskevich; tested by Philip Thompson for CASSANDRA-7594


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e6f307f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6f307f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6f307f4

Branch: refs/heads/cassandra-2.1.0
Commit: e6f307f4e5be4bf2cd18e153d28e2310e5f8d3da
Parents: 46ef962
Author: Pavel Yaskevich xe...@apache.org
Authored: Fri Sep 5 14:23:24 2014 -0700
Committer: Pavel Yaskevich xe...@apache.org
Committed: Fri Sep 5 14:23:24 2014 -0700

--
 build.xml   |   4 ++--
 lib/thrift-server-0.3.6.jar | Bin 39588 - 0 bytes
 lib/thrift-server-0.3.7.jar | Bin 0 - 39988 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6f307f4/build.xml
--
diff --git a/build.xml b/build.xml
index f456fa8..829c873 100644
--- a/build.xml
+++ b/build.xml
@@ -361,7 +361,7 @@
   dependency groupId=com.googlecode.json-simple 
artifactId=json-simple version=1.1/
   dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib version=1.1.2/
   dependency groupId=com.github.stephenc artifactId=jamm 
version=0.2.5/
-  dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
+  dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.7/
   dependency groupId=org.yaml artifactId=snakeyaml 
version=1.11/
   dependency groupId=org.apache.thrift artifactId=libthrift 
version=0.9.1/
 
@@ -467,7 +467,7 @@
 dependency groupId=org.mindrot artifactId=jbcrypt/
 dependency groupId=com.yammer.metrics artifactId=metrics-core/
 dependency groupId=com.addthis.metrics 
artifactId=reporter-config/
-dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
+dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.7/
 dependency groupId=net.sf.supercsv artifactId=super-csv 
version=2.1.0 /
 
 dependency groupId=log4j artifactId=log4j/

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6f307f4/lib/thrift-server-0.3.6.jar
--
diff --git a/lib/thrift-server-0.3.6.jar b/lib/thrift-server-0.3.6.jar
deleted file mode 100644
index c974f75..000
Binary files a/lib/thrift-server-0.3.6.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6f307f4/lib/thrift-server-0.3.7.jar
--
diff --git a/lib/thrift-server-0.3.7.jar b/lib/thrift-server-0.3.7.jar
new file mode 100644
index 000..1231618
Binary files /dev/null and b/lib/thrift-server-0.3.7.jar differ

[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.1.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d215692
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d215692
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d215692

Branch: refs/heads/cassandra-2.1
Commit: 7d215692fdc226b15a72e5459f1d0f24cee8eeda
Parents: 8d69214 5d5401d
Author: Jason Brown jasobr...@apple.com
Authored: Fri Sep 5 16:47:35 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri Sep 5 16:47:35 2014 -0700

--

--

[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d5401d6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d5401d6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d5401d6

Branch: refs/heads/cassandra-2.1.0
Commit: 5d5401d67d8e3fc42eb5a2b6d404fb193863c36d
Parents: c1dc378 e6f307f
Author: Jason Brown jasobr...@apple.com
Authored: Fri Sep 5 16:47:06 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri Sep 5 16:47:06 2014 -0700

--

--

[1/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 8d6921419 - 7d215692f


Merge branch 'cassandra-2.0' into cassandra-2.1.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d5401d6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d5401d6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d5401d6

Branch: refs/heads/cassandra-2.1
Commit: 5d5401d67d8e3fc42eb5a2b6d404fb193863c36d
Parents: c1dc378 e6f307f
Author: Jason Brown jasobr...@apple.com
Authored: Fri Sep 5 16:47:06 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri Sep 5 16:47:06 2014 -0700

--

--

[3/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d5401d6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d5401d6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d5401d6

Branch: refs/heads/trunk
Commit: 5d5401d67d8e3fc42eb5a2b6d404fb193863c36d
Parents: c1dc378 e6f307f
Author: Jason Brown jasobr...@apple.com
Authored: Fri Sep 5 16:47:06 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri Sep 5 16:47:06 2014 -0700

--

--

[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.1.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d215692
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d215692
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d215692

Branch: refs/heads/trunk
Commit: 7d215692fdc226b15a72e5459f1d0f24cee8eeda
Parents: 8d69214 5d5401d
Author: Jason Brown jasobr...@apple.com
Authored: Fri Sep 5 16:47:35 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri Sep 5 16:47:35 2014 -0700

--

--

[1/5] git commit: bump thrift-server version to 0.3.7 to properly shutdown invocation pool shutdown patch by Pavel Yaskevich; tested by Philip Thompson for CASSANDRA-7594

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 022932338 - 916efcb6f


bump thrift-server version to 0.3.7 to properly shutdown invocation pool 
shutdown
patch by Pavel Yaskevich; tested by Philip Thompson for CASSANDRA-7594


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e6f307f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6f307f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6f307f4

Branch: refs/heads/trunk
Commit: e6f307f4e5be4bf2cd18e153d28e2310e5f8d3da
Parents: 46ef962
Author: Pavel Yaskevich xe...@apache.org
Authored: Fri Sep 5 14:23:24 2014 -0700
Committer: Pavel Yaskevich xe...@apache.org
Committed: Fri Sep 5 14:23:24 2014 -0700

--
 build.xml   |   4 ++--
 lib/thrift-server-0.3.6.jar | Bin 39588 - 0 bytes
 lib/thrift-server-0.3.7.jar | Bin 0 - 39988 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6f307f4/build.xml
--
diff --git a/build.xml b/build.xml
index f456fa8..829c873 100644
--- a/build.xml
+++ b/build.xml
@@ -361,7 +361,7 @@
   dependency groupId=com.googlecode.json-simple 
artifactId=json-simple version=1.1/
   dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib version=1.1.2/
   dependency groupId=com.github.stephenc artifactId=jamm 
version=0.2.5/
-  dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
+  dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.7/
   dependency groupId=org.yaml artifactId=snakeyaml 
version=1.11/
   dependency groupId=org.apache.thrift artifactId=libthrift 
version=0.9.1/
 
@@ -467,7 +467,7 @@
 dependency groupId=org.mindrot artifactId=jbcrypt/
 dependency groupId=com.yammer.metrics artifactId=metrics-core/
 dependency groupId=com.addthis.metrics 
artifactId=reporter-config/
-dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
+dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.7/
 dependency groupId=net.sf.supercsv artifactId=super-csv 
version=2.1.0 /
 
 dependency groupId=log4j artifactId=log4j/

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6f307f4/lib/thrift-server-0.3.6.jar
--
diff --git a/lib/thrift-server-0.3.6.jar b/lib/thrift-server-0.3.6.jar
deleted file mode 100644
index c974f75..000
Binary files a/lib/thrift-server-0.3.6.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6f307f4/lib/thrift-server-0.3.7.jar
--
diff --git a/lib/thrift-server-0.3.7.jar b/lib/thrift-server-0.3.7.jar
new file mode 100644
index 000..1231618
Binary files /dev/null and b/lib/thrift-server-0.3.7.jar differ

[5/5] git commit: Merge branch 'cassandra-2.1' into trunk

[jasobrown]

Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/916efcb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/916efcb6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/916efcb6

Branch: refs/heads/trunk
Commit: 916efcb6fb4d0b1c788c74e97053701155d0ed1d
Parents: 0229323 7d21569
Author: Jason Brown jasobr...@apple.com
Authored: Fri Sep 5 16:48:17 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri Sep 5 16:48:17 2014 -0700

--
 build.xml   |   4 ++--
 lib/thrift-server-0.3.6.jar | Bin 39588 - 0 bytes
 lib/thrift-server-0.3.7.jar | Bin 0 - 39988 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/916efcb6/build.xml
--
diff --cc build.xml
index 00d1c86,5f2b568..8016a8b
--- a/build.xml
+++ b/build.xml
@@@ -493,10 -495,9 +493,10 @@@
  dependency groupId=org.mindrot artifactId=jbcrypt/
  dependency groupId=com.yammer.metrics artifactId=metrics-core/
  dependency groupId=com.addthis.metrics 
artifactId=reporter-config/
- dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
+ dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.7/
  dependency groupId=com.clearspring.analytics artifactId=stream 
version=2.5.2 /
  dependency groupId=net.sf.supercsv artifactId=super-csv 
version=2.1.0 /
 +dependency groupId=org.javassist artifactId=javassist/
  
  dependency groupId=ch.qos.logback artifactId=logback-core/
  dependency groupId=ch.qos.logback artifactId=logback-classic/

[2/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
build.xml


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d692141
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d692141
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d692141

Branch: refs/heads/trunk
Commit: 8d692141970aeef5d0566b336fa7f14c1e54bcef
Parents: 037963c e6f307f
Author: Jason Brown jasobr...@apple.com
Authored: Fri Sep 5 16:45:20 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri Sep 5 16:45:20 2014 -0700

--
 build.xml   |   4 ++--
 lib/thrift-server-0.3.6.jar | Bin 39588 - 0 bytes
 lib/thrift-server-0.3.7.jar | Bin 0 - 39988 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d692141/build.xml
--
diff --cc build.xml
index 0880975,829c873..5f2b568
--- a/build.xml
+++ b/build.xml
@@@ -366,11 -359,9 +366,11 @@@
  exclusion groupId=junit artifactId=junit/
/dependency
dependency groupId=com.googlecode.json-simple 
artifactId=json-simple version=1.1/
 -  dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib version=1.1.2/
 -  dependency groupId=com.github.stephenc artifactId=jamm 
version=0.2.5/
 - dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.7/
 +  dependency groupId=com.boundary artifactId=high-scale-lib 
version=1.0.6/
 +  dependency groupId=com.github.jbellis artifactId=jamm 
version=0.2.6/
-   dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6
++  dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.7
 +  exclusion groupId=org.slf4j artifactId=slf4j-log4j12/
 +  /dependency
dependency groupId=org.yaml artifactId=snakeyaml 
version=1.11/
dependency groupId=org.apache.thrift artifactId=libthrift 
version=0.9.1/
  
@@@ -495,12 -466,13 +495,12 @@@
  dependency groupId=org.mindrot artifactId=jbcrypt/
  dependency groupId=com.yammer.metrics artifactId=metrics-core/
  dependency groupId=com.addthis.metrics 
artifactId=reporter-config/
- dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
+ dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.7/
 +dependency groupId=com.clearspring.analytics artifactId=stream 
version=2.5.2 /
  dependency groupId=net.sf.supercsv artifactId=super-csv 
version=2.1.0 /
  
 -dependency groupId=log4j artifactId=log4j/
 -!-- cassandra has a hard dependency on log4j, so force slf4j's log4j 
provider at runtime --
 -dependency groupId=org.slf4j artifactId=slf4j-log4j12 
scope=runtime/
 +dependency groupId=ch.qos.logback artifactId=logback-core/
 +dependency groupId=ch.qos.logback artifactId=logback-classic/
  
  dependency groupId=org.apache.thrift artifactId=libthrift/
  dependency groupId=org.apache.cassandra 
artifactId=cassandra-thrift/

[1/2] git commit: Make disruptor_thrift_server invocation pool configurable patch by Pavel Yaskevich; reviewed by Jason Brown for CASSANDRA-7594

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 e75fe5c4f - cae871575


Make disruptor_thrift_server invocation pool configurable
patch by Pavel Yaskevich; reviewed by Jason Brown for CASSANDRA-7594


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b22089d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b22089d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b22089d7

Branch: refs/heads/cassandra-2.1
Commit: b22089d7c8f723defec10359e026c767cae57224
Parents: 968ffd8
Author: Pavel Yaskevich xe...@apache.org
Authored: Tue Sep 2 15:44:48 2014 -0700
Committer: Pavel Yaskevich xe...@apache.org
Committed: Tue Sep 2 16:14:27 2014 -0700

--
 CHANGES.txt|   1 +
 build.xml  |   4 ++--
 lib/thrift-server-0.3.6.jar| Bin 0 - 39588 bytes
 lib/thrift-server-internal-only-0.3.3.jar  | Bin 39191 - 0 bytes
 .../cassandra/thrift/THsHaDisruptorServer.java |  13 +
 5 files changed, 16 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b22089d7/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 6d77f3c..4954b7f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
  * Always reject inequality on the partition key without token()
(CASSANDRA-7722)
  * Always send Paxos commit to all replicas (CASSANDRA-7479)
+ * Make disruptor_thrift_server invocation pool configurable (CASSANDRA-7594)
 
 
 2.0.10

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b22089d7/build.xml
--
diff --git a/build.xml b/build.xml
index dd59bd2..f456fa8 100644
--- a/build.xml
+++ b/build.xml
@@ -361,7 +361,7 @@
   dependency groupId=com.googlecode.json-simple 
artifactId=json-simple version=1.1/
   dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib version=1.1.2/
   dependency groupId=com.github.stephenc artifactId=jamm 
version=0.2.5/
-  dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.3/
+  dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
   dependency groupId=org.yaml artifactId=snakeyaml 
version=1.11/
   dependency groupId=org.apache.thrift artifactId=libthrift 
version=0.9.1/
 
@@ -467,7 +467,7 @@
 dependency groupId=org.mindrot artifactId=jbcrypt/
 dependency groupId=com.yammer.metrics artifactId=metrics-core/
 dependency groupId=com.addthis.metrics 
artifactId=reporter-config/
-dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.3/
+dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
 dependency groupId=net.sf.supercsv artifactId=super-csv 
version=2.1.0 /
 
 dependency groupId=log4j artifactId=log4j/

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b22089d7/lib/thrift-server-0.3.6.jar
--
diff --git a/lib/thrift-server-0.3.6.jar b/lib/thrift-server-0.3.6.jar
new file mode 100644
index 000..c974f75
Binary files /dev/null and b/lib/thrift-server-0.3.6.jar differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b22089d7/lib/thrift-server-internal-only-0.3.3.jar
--
diff --git a/lib/thrift-server-internal-only-0.3.3.jar 
b/lib/thrift-server-internal-only-0.3.3.jar
deleted file mode 100644
index 6a1fbae..000
Binary files a/lib/thrift-server-internal-only-0.3.3.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b22089d7/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java 
b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
index e3b89d2..dd501ec 100644
--- a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
+++ b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
@@ -19,9 +19,14 @@
 package org.apache.cassandra.thrift;
 
 import java.net.InetSocketAddress;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 import com.thinkaurelius.thrift.Message;
 import com.thinkaurelius.thrift.TDisruptorServer;
+import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
+import org.apache.cassandra.concurrent.NamedThreadFactory;
 import org.slf4j.Logger;
 

[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
build.xml
lib/thrift-server-0.3.5.jar
lib/thrift-server-0.3.6.jar


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cae87157
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cae87157
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cae87157

Branch: refs/heads/cassandra-2.1
Commit: cae87157501d57b83facc1a5719b24424301f469
Parents: e75fe5c b22089d
Author: Jason Brown jasobr...@apple.com
Authored: Wed Sep 3 10:45:52 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed Sep 3 10:45:52 2014 -0700

--
 CHANGES.txt|   5 +
 build.xml  |   4 ++--
 lib/thrift-server-0.3.5.jar| Bin 39220 - 0 bytes
 lib/thrift-server-0.3.6.jar| Bin 0 - 39588 bytes
 .../cassandra/thrift/THsHaDisruptorServer.java |  13 +
 5 files changed, 20 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cae87157/CHANGES.txt
--
diff --cc CHANGES.txt
index a58af8f,4954b7f..e93b16c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -65,6 -5,10 +65,11 @@@ Merged from 2.0
   * Always reject inequality on the partition key without token()
 (CASSANDRA-7722)
   * Always send Paxos commit to all replicas (CASSANDRA-7479)
+  * Make disruptor_thrift_server invocation pool configurable (CASSANDRA-7594)
+ 
+ 
+ 2.0.10
++ cassandra-2.0
   * Don't send schema change responses and events for no-op DDL
 statements (CASSANDRA-7600)
   * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cae87157/build.xml
--
diff --cc build.xml
index e678d88,f456fa8..0880975
--- a/build.xml
+++ b/build.xml
@@@ -366,11 -359,9 +366,11 @@@
  exclusion groupId=junit artifactId=junit/
/dependency
dependency groupId=com.googlecode.json-simple 
artifactId=json-simple version=1.1/
 -  dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib version=1.1.2/
 -  dependency groupId=com.github.stephenc artifactId=jamm 
version=0.2.5/
 - dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
 +  dependency groupId=com.boundary artifactId=high-scale-lib 
version=1.0.6/
 +  dependency groupId=com.github.jbellis artifactId=jamm 
version=0.2.6/
-   dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.5
++  dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6
 +  exclusion groupId=org.slf4j artifactId=slf4j-log4j12/
 +  /dependency
dependency groupId=org.yaml artifactId=snakeyaml 
version=1.11/
dependency groupId=org.apache.thrift artifactId=libthrift 
version=0.9.1/
  
@@@ -495,12 -466,13 +495,12 @@@
  dependency groupId=org.mindrot artifactId=jbcrypt/
  dependency groupId=com.yammer.metrics artifactId=metrics-core/
  dependency groupId=com.addthis.metrics 
artifactId=reporter-config/
- dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.5/
+ dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
 +dependency groupId=com.clearspring.analytics artifactId=stream 
version=2.5.2 /
  dependency groupId=net.sf.supercsv artifactId=super-csv 
version=2.1.0 /
  
 -dependency groupId=log4j artifactId=log4j/
 -!-- cassandra has a hard dependency on log4j, so force slf4j's log4j 
provider at runtime --
 -dependency groupId=org.slf4j artifactId=slf4j-log4j12 
scope=runtime/
 +dependency groupId=ch.qos.logback artifactId=logback-core/
 +dependency groupId=ch.qos.logback artifactId=logback-classic/
  
  dependency groupId=org.apache.thrift artifactId=libthrift/
  dependency groupId=org.apache.cassandra 
artifactId=cassandra-thrift/

[1/2] git commit: Make disruptor_thrift_server invocation pool configurable patch by Pavel Yaskevich; reviewed by Jason Brown for CASSANDRA-7594

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 cf76ac66a - 0de4135f9


Make disruptor_thrift_server invocation pool configurable
patch by Pavel Yaskevich; reviewed by Jason Brown for CASSANDRA-7594


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b22089d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b22089d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b22089d7

Branch: refs/heads/cassandra-2.1.0
Commit: b22089d7c8f723defec10359e026c767cae57224
Parents: 968ffd8
Author: Pavel Yaskevich xe...@apache.org
Authored: Tue Sep 2 15:44:48 2014 -0700
Committer: Pavel Yaskevich xe...@apache.org
Committed: Tue Sep 2 16:14:27 2014 -0700

--
 CHANGES.txt|   1 +
 build.xml  |   4 ++--
 lib/thrift-server-0.3.6.jar| Bin 0 - 39588 bytes
 lib/thrift-server-internal-only-0.3.3.jar  | Bin 39191 - 0 bytes
 .../cassandra/thrift/THsHaDisruptorServer.java |  13 +
 5 files changed, 16 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b22089d7/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 6d77f3c..4954b7f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
  * Always reject inequality on the partition key without token()
(CASSANDRA-7722)
  * Always send Paxos commit to all replicas (CASSANDRA-7479)
+ * Make disruptor_thrift_server invocation pool configurable (CASSANDRA-7594)
 
 
 2.0.10

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b22089d7/build.xml
--
diff --git a/build.xml b/build.xml
index dd59bd2..f456fa8 100644
--- a/build.xml
+++ b/build.xml
@@ -361,7 +361,7 @@
   dependency groupId=com.googlecode.json-simple 
artifactId=json-simple version=1.1/
   dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib version=1.1.2/
   dependency groupId=com.github.stephenc artifactId=jamm 
version=0.2.5/
-  dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.3/
+  dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
   dependency groupId=org.yaml artifactId=snakeyaml 
version=1.11/
   dependency groupId=org.apache.thrift artifactId=libthrift 
version=0.9.1/
 
@@ -467,7 +467,7 @@
 dependency groupId=org.mindrot artifactId=jbcrypt/
 dependency groupId=com.yammer.metrics artifactId=metrics-core/
 dependency groupId=com.addthis.metrics 
artifactId=reporter-config/
-dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.3/
+dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
 dependency groupId=net.sf.supercsv artifactId=super-csv 
version=2.1.0 /
 
 dependency groupId=log4j artifactId=log4j/

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b22089d7/lib/thrift-server-0.3.6.jar
--
diff --git a/lib/thrift-server-0.3.6.jar b/lib/thrift-server-0.3.6.jar
new file mode 100644
index 000..c974f75
Binary files /dev/null and b/lib/thrift-server-0.3.6.jar differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b22089d7/lib/thrift-server-internal-only-0.3.3.jar
--
diff --git a/lib/thrift-server-internal-only-0.3.3.jar 
b/lib/thrift-server-internal-only-0.3.3.jar
deleted file mode 100644
index 6a1fbae..000
Binary files a/lib/thrift-server-internal-only-0.3.3.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b22089d7/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java 
b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
index e3b89d2..dd501ec 100644
--- a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
+++ b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
@@ -19,9 +19,14 @@
 package org.apache.cassandra.thrift;
 
 import java.net.InetSocketAddress;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 import com.thinkaurelius.thrift.Message;
 import com.thinkaurelius.thrift.TDisruptorServer;
+import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
+import org.apache.cassandra.concurrent.NamedThreadFactory;
 import org.slf4j.Logger;
 

[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0de4135f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0de4135f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0de4135f

Branch: refs/heads/cassandra-2.1.0
Commit: 0de4135f9be9f397cd77becfd8e3fefe0c4e78ec
Parents: cf76ac6 b22089d
Author: Jason Brown jasobr...@apple.com
Authored: Wed Sep 3 10:47:14 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed Sep 3 10:47:14 2014 -0700

--

--

[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.1.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c99f37e1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c99f37e1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c99f37e1

Branch: refs/heads/cassandra-2.1
Commit: c99f37e1959c072b1691cbe95eedd9dfd251df1f
Parents: cae8715 0de4135
Author: Jason Brown jasobr...@apple.com
Authored: Wed Sep 3 10:47:50 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed Sep 3 10:47:50 2014 -0700

--

--

[1/3] git commit: Fix NPE when using collections in frozen tuple

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 cae871575 - c99f37e19


Fix NPE when using collections in frozen tuple

patch by omichallat; reviewed by slebresne for CASSANDRA-7869


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf76ac66
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf76ac66
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf76ac66

Branch: refs/heads/cassandra-2.1
Commit: cf76ac66af4344acaaf44f8dec3ef584cff79bf2
Parents: 82136e3
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Sep 3 19:01:20 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Sep 3 19:01:20 2014 +0200

--
 CHANGES.txt |  4 ++
 .../org/apache/cassandra/cql3/CQL3Type.java |  3 +-
 .../apache/cassandra/cql3/TupleTypeTest.java| 39 
 3 files changed, 45 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf76ac66/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b33bec4..93d77c1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.1.0
+ * Add null check for keys when freezing collection (CASSANDRA-7869)
+
+
 2.1.0-rc7
  * Add frozen keyword and require UDT to be frozen (CASSANDRA-7857)
  * Track added sstable size correctly (CASSANDRA-7239)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf76ac66/src/java/org/apache/cassandra/cql3/CQL3Type.java
--
diff --git a/src/java/org/apache/cassandra/cql3/CQL3Type.java 
b/src/java/org/apache/cassandra/cql3/CQL3Type.java
index 1589d6a..bb3bc62 100644
--- a/src/java/org/apache/cassandra/cql3/CQL3Type.java
+++ b/src/java/org/apache/cassandra/cql3/CQL3Type.java
@@ -404,7 +404,8 @@ public interface CQL3Type
 
 public Raw freeze()
 {
-keys.freeze();
+if (keys != null)
+keys.freeze();
 values.freeze();
 return super.freeze();
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf76ac66/test/unit/org/apache/cassandra/cql3/TupleTypeTest.java
--
diff --git a/test/unit/org/apache/cassandra/cql3/TupleTypeTest.java 
b/test/unit/org/apache/cassandra/cql3/TupleTypeTest.java
index 4ce24f8..f8771c1 100644
--- a/test/unit/org/apache/cassandra/cql3/TupleTypeTest.java
+++ b/test/unit/org/apache/cassandra/cql3/TupleTypeTest.java
@@ -100,4 +100,43 @@ public class TupleTypeTest extends CQLTester
 {
 assertInvalid(CREATE TABLE wrong (k int PRIMARY KEY, v tupleint, 
text));
 }
+
+@Test
+public void testFrozenTupleWithList() throws Throwable
+{
+createTable(CREATE TABLE %s (k int PRIMARY KEY, t frozentupletext, 
listint));
+
+execute(INSERT INTO %s (k, t) VALUES (?, ?), 0, tuple(foo, list(2, 
1)));
+execute(INSERT INTO %s (k, t) VALUES (?, ?), 1, tuple(bar, list(3, 
4)));
+assertAllRows(
+row(0, tuple(foo, list(2, 1))),
+row(1, tuple(bar, list(3, 4)))
+);
+}
+
+@Test
+public void testFrozenTupleWithSet() throws Throwable
+{
+createTable(CREATE TABLE %s (k int PRIMARY KEY, t frozentupletext, 
setint));
+
+execute(INSERT INTO %s (k, t) VALUES (?, ?), 0, tuple(foo, set(2, 
1)));
+execute(INSERT INTO %s (k, t) VALUES (?, ?), 1, tuple(bar, set(3, 
4)));
+assertAllRows(
+row(0, tuple(foo, set(2, 1))),
+row(1, tuple(bar, set(3, 4)))
+);
+}
+
+@Test
+public void testFrozenTupleWithMap() throws Throwable
+{
+createTable(CREATE TABLE %s (k int PRIMARY KEY, t frozentupletext, 
mapint, int));
+
+execute(INSERT INTO %s (k, t) VALUES (?, ?), 0, tuple(foo, map(2, 
1)));
+execute(INSERT INTO %s (k, t) VALUES (?, ?), 1, tuple(bar, map(3, 
4)));
+assertAllRows(
+row(0, tuple(foo, map(2, 1))),
+row(1, tuple(bar, map(3, 4)))
+);
+}
 }

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0de4135f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0de4135f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0de4135f

Branch: refs/heads/cassandra-2.1
Commit: 0de4135f9be9f397cd77becfd8e3fefe0c4e78ec
Parents: cf76ac6 b22089d
Author: Jason Brown jasobr...@apple.com
Authored: Wed Sep 3 10:47:14 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed Sep 3 10:47:14 2014 -0700

--

--

[6/6] git commit: Merge branch 'cassandra-2.1' into trunk

[jasobrown]

Merge branch 'cassandra-2.1' into trunk

Conflicts:
CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/936dea89
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/936dea89
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/936dea89

Branch: refs/heads/trunk
Commit: 936dea8952820b4eb16b87963a86a358389321f0
Parents: a88a783 c99f37e
Author: Jason Brown jasobr...@apple.com
Authored: Wed Sep 3 10:48:50 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed Sep 3 10:48:50 2014 -0700

--
 CHANGES.txt|   9 +
 build.xml  |   4 ++--
 lib/thrift-server-0.3.5.jar| Bin 39220 - 0 bytes
 lib/thrift-server-0.3.6.jar| Bin 0 - 39588 bytes
 .../cassandra/thrift/THsHaDisruptorServer.java |  13 +
 5 files changed, 24 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/936dea89/CHANGES.txt
--
diff --cc CHANGES.txt
index 281b63b,e93b16c..dd847cd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -86,6 -65,14 +86,15 @@@ Merged from 2.0
   * Always reject inequality on the partition key without token()
 (CASSANDRA-7722)
   * Always send Paxos commit to all replicas (CASSANDRA-7479)
+  * Make disruptor_thrift_server invocation pool configurable (CASSANDRA-7594)
+ 
+ 
+ 2.0.10
+  cassandra-2.0
+  * Don't send schema change responses and events for no-op DDL
+statements (CASSANDRA-7600)
+  * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
++ cassandra-2.1
   * Configure system.paxos with LeveledCompactionStrategy (CASSANDRA-7753)
   * Fix ALTER clustering column type from DateType to TimestampType when
 using DESC clustering order (CASSANRDA-7797)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/936dea89/build.xml
--

[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0de4135f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0de4135f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0de4135f

Branch: refs/heads/trunk
Commit: 0de4135f9be9f397cd77becfd8e3fefe0c4e78ec
Parents: cf76ac6 b22089d
Author: Jason Brown jasobr...@apple.com
Authored: Wed Sep 3 10:47:14 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed Sep 3 10:47:14 2014 -0700

--

--

[2/6] git commit: Fix NPE when using collections in frozen tuple

[jasobrown]

Fix NPE when using collections in frozen tuple

patch by omichallat; reviewed by slebresne for CASSANDRA-7869


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf76ac66
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf76ac66
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf76ac66

Branch: refs/heads/trunk
Commit: cf76ac66af4344acaaf44f8dec3ef584cff79bf2
Parents: 82136e3
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Sep 3 19:01:20 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Sep 3 19:01:20 2014 +0200

--
 CHANGES.txt |  4 ++
 .../org/apache/cassandra/cql3/CQL3Type.java |  3 +-
 .../apache/cassandra/cql3/TupleTypeTest.java| 39 
 3 files changed, 45 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf76ac66/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b33bec4..93d77c1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.1.0
+ * Add null check for keys when freezing collection (CASSANDRA-7869)
+
+
 2.1.0-rc7
  * Add frozen keyword and require UDT to be frozen (CASSANDRA-7857)
  * Track added sstable size correctly (CASSANDRA-7239)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf76ac66/src/java/org/apache/cassandra/cql3/CQL3Type.java
--
diff --git a/src/java/org/apache/cassandra/cql3/CQL3Type.java 
b/src/java/org/apache/cassandra/cql3/CQL3Type.java
index 1589d6a..bb3bc62 100644
--- a/src/java/org/apache/cassandra/cql3/CQL3Type.java
+++ b/src/java/org/apache/cassandra/cql3/CQL3Type.java
@@ -404,7 +404,8 @@ public interface CQL3Type
 
 public Raw freeze()
 {
-keys.freeze();
+if (keys != null)
+keys.freeze();
 values.freeze();
 return super.freeze();
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf76ac66/test/unit/org/apache/cassandra/cql3/TupleTypeTest.java
--
diff --git a/test/unit/org/apache/cassandra/cql3/TupleTypeTest.java 
b/test/unit/org/apache/cassandra/cql3/TupleTypeTest.java
index 4ce24f8..f8771c1 100644
--- a/test/unit/org/apache/cassandra/cql3/TupleTypeTest.java
+++ b/test/unit/org/apache/cassandra/cql3/TupleTypeTest.java
@@ -100,4 +100,43 @@ public class TupleTypeTest extends CQLTester
 {
 assertInvalid(CREATE TABLE wrong (k int PRIMARY KEY, v tupleint, 
text));
 }
+
+@Test
+public void testFrozenTupleWithList() throws Throwable
+{
+createTable(CREATE TABLE %s (k int PRIMARY KEY, t frozentupletext, 
listint));
+
+execute(INSERT INTO %s (k, t) VALUES (?, ?), 0, tuple(foo, list(2, 
1)));
+execute(INSERT INTO %s (k, t) VALUES (?, ?), 1, tuple(bar, list(3, 
4)));
+assertAllRows(
+row(0, tuple(foo, list(2, 1))),
+row(1, tuple(bar, list(3, 4)))
+);
+}
+
+@Test
+public void testFrozenTupleWithSet() throws Throwable
+{
+createTable(CREATE TABLE %s (k int PRIMARY KEY, t frozentupletext, 
setint));
+
+execute(INSERT INTO %s (k, t) VALUES (?, ?), 0, tuple(foo, set(2, 
1)));
+execute(INSERT INTO %s (k, t) VALUES (?, ?), 1, tuple(bar, set(3, 
4)));
+assertAllRows(
+row(0, tuple(foo, set(2, 1))),
+row(1, tuple(bar, set(3, 4)))
+);
+}
+
+@Test
+public void testFrozenTupleWithMap() throws Throwable
+{
+createTable(CREATE TABLE %s (k int PRIMARY KEY, t frozentupletext, 
mapint, int));
+
+execute(INSERT INTO %s (k, t) VALUES (?, ?), 0, tuple(foo, map(2, 
1)));
+execute(INSERT INTO %s (k, t) VALUES (?, ?), 1, tuple(bar, map(3, 
4)));
+assertAllRows(
+row(0, tuple(foo, map(2, 1))),
+row(1, tuple(bar, map(3, 4)))
+);
+}
 }

[1/6] git commit: Make disruptor_thrift_server invocation pool configurable patch by Pavel Yaskevich; reviewed by Jason Brown for CASSANDRA-7594

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/trunk a88a78380 - 936dea895


Make disruptor_thrift_server invocation pool configurable
patch by Pavel Yaskevich; reviewed by Jason Brown for CASSANDRA-7594


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b22089d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b22089d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b22089d7

Branch: refs/heads/trunk
Commit: b22089d7c8f723defec10359e026c767cae57224
Parents: 968ffd8
Author: Pavel Yaskevich xe...@apache.org
Authored: Tue Sep 2 15:44:48 2014 -0700
Committer: Pavel Yaskevich xe...@apache.org
Committed: Tue Sep 2 16:14:27 2014 -0700

--
 CHANGES.txt|   1 +
 build.xml  |   4 ++--
 lib/thrift-server-0.3.6.jar| Bin 0 - 39588 bytes
 lib/thrift-server-internal-only-0.3.3.jar  | Bin 39191 - 0 bytes
 .../cassandra/thrift/THsHaDisruptorServer.java |  13 +
 5 files changed, 16 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b22089d7/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 6d77f3c..4954b7f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
  * Always reject inequality on the partition key without token()
(CASSANDRA-7722)
  * Always send Paxos commit to all replicas (CASSANDRA-7479)
+ * Make disruptor_thrift_server invocation pool configurable (CASSANDRA-7594)
 
 
 2.0.10

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b22089d7/build.xml
--
diff --git a/build.xml b/build.xml
index dd59bd2..f456fa8 100644
--- a/build.xml
+++ b/build.xml
@@ -361,7 +361,7 @@
   dependency groupId=com.googlecode.json-simple 
artifactId=json-simple version=1.1/
   dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib version=1.1.2/
   dependency groupId=com.github.stephenc artifactId=jamm 
version=0.2.5/
-  dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.3/
+  dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
   dependency groupId=org.yaml artifactId=snakeyaml 
version=1.11/
   dependency groupId=org.apache.thrift artifactId=libthrift 
version=0.9.1/
 
@@ -467,7 +467,7 @@
 dependency groupId=org.mindrot artifactId=jbcrypt/
 dependency groupId=com.yammer.metrics artifactId=metrics-core/
 dependency groupId=com.addthis.metrics 
artifactId=reporter-config/
-dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.3/
+dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
 dependency groupId=net.sf.supercsv artifactId=super-csv 
version=2.1.0 /
 
 dependency groupId=log4j artifactId=log4j/

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b22089d7/lib/thrift-server-0.3.6.jar
--
diff --git a/lib/thrift-server-0.3.6.jar b/lib/thrift-server-0.3.6.jar
new file mode 100644
index 000..c974f75
Binary files /dev/null and b/lib/thrift-server-0.3.6.jar differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b22089d7/lib/thrift-server-internal-only-0.3.3.jar
--
diff --git a/lib/thrift-server-internal-only-0.3.3.jar 
b/lib/thrift-server-internal-only-0.3.3.jar
deleted file mode 100644
index 6a1fbae..000
Binary files a/lib/thrift-server-internal-only-0.3.3.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b22089d7/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java 
b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
index e3b89d2..dd501ec 100644
--- a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
+++ b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
@@ -19,9 +19,14 @@
 package org.apache.cassandra.thrift;
 
 import java.net.InetSocketAddress;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 import com.thinkaurelius.thrift.Message;
 import com.thinkaurelius.thrift.TDisruptorServer;
+import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
+import org.apache.cassandra.concurrent.NamedThreadFactory;
 import org.slf4j.Logger;
 import 

[3/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
build.xml
lib/thrift-server-0.3.5.jar
lib/thrift-server-0.3.6.jar


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cae87157
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cae87157
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cae87157

Branch: refs/heads/trunk
Commit: cae87157501d57b83facc1a5719b24424301f469
Parents: e75fe5c b22089d
Author: Jason Brown jasobr...@apple.com
Authored: Wed Sep 3 10:45:52 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed Sep 3 10:45:52 2014 -0700

--
 CHANGES.txt|   5 +
 build.xml  |   4 ++--
 lib/thrift-server-0.3.5.jar| Bin 39220 - 0 bytes
 lib/thrift-server-0.3.6.jar| Bin 0 - 39588 bytes
 .../cassandra/thrift/THsHaDisruptorServer.java |  13 +
 5 files changed, 20 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cae87157/CHANGES.txt
--
diff --cc CHANGES.txt
index a58af8f,4954b7f..e93b16c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -65,6 -5,10 +65,11 @@@ Merged from 2.0
   * Always reject inequality on the partition key without token()
 (CASSANDRA-7722)
   * Always send Paxos commit to all replicas (CASSANDRA-7479)
+  * Make disruptor_thrift_server invocation pool configurable (CASSANDRA-7594)
+ 
+ 
+ 2.0.10
++ cassandra-2.0
   * Don't send schema change responses and events for no-op DDL
 statements (CASSANDRA-7600)
   * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cae87157/build.xml
--
diff --cc build.xml
index e678d88,f456fa8..0880975
--- a/build.xml
+++ b/build.xml
@@@ -366,11 -359,9 +366,11 @@@
  exclusion groupId=junit artifactId=junit/
/dependency
dependency groupId=com.googlecode.json-simple 
artifactId=json-simple version=1.1/
 -  dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib version=1.1.2/
 -  dependency groupId=com.github.stephenc artifactId=jamm 
version=0.2.5/
 - dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
 +  dependency groupId=com.boundary artifactId=high-scale-lib 
version=1.0.6/
 +  dependency groupId=com.github.jbellis artifactId=jamm 
version=0.2.6/
-   dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.5
++  dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6
 +  exclusion groupId=org.slf4j artifactId=slf4j-log4j12/
 +  /dependency
dependency groupId=org.yaml artifactId=snakeyaml 
version=1.11/
dependency groupId=org.apache.thrift artifactId=libthrift 
version=0.9.1/
  
@@@ -495,12 -466,13 +495,12 @@@
  dependency groupId=org.mindrot artifactId=jbcrypt/
  dependency groupId=com.yammer.metrics artifactId=metrics-core/
  dependency groupId=com.addthis.metrics 
artifactId=reporter-config/
- dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.5/
+ dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
 +dependency groupId=com.clearspring.analytics artifactId=stream 
version=2.5.2 /
  dependency groupId=net.sf.supercsv artifactId=super-csv 
version=2.1.0 /
  
 -dependency groupId=log4j artifactId=log4j/
 -!-- cassandra has a hard dependency on log4j, so force slf4j's log4j 
provider at runtime --
 -dependency groupId=org.slf4j artifactId=slf4j-log4j12 
scope=runtime/
 +dependency groupId=ch.qos.logback artifactId=logback-core/
 +dependency groupId=ch.qos.logback artifactId=logback-classic/
  
  dependency groupId=org.apache.thrift artifactId=libthrift/
  dependency groupId=org.apache.cassandra 
artifactId=cassandra-thrift/

[5/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.1.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c99f37e1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c99f37e1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c99f37e1

Branch: refs/heads/trunk
Commit: c99f37e1959c072b1691cbe95eedd9dfd251df1f
Parents: cae8715 0de4135
Author: Jason Brown jasobr...@apple.com
Authored: Wed Sep 3 10:47:50 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed Sep 3 10:47:50 2014 -0700

--

--

git commit: Anti-compaction proceeds if any part of the repair failed

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 895eaecc3 - eb4032e5f


Anti-compaction proceeds if any part of the repair failed

patch by jasobrown; reviewed by yukim for CASSANDRA-7521


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb4032e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb4032e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb4032e5

Branch: refs/heads/cassandra-2.1.0
Commit: eb4032e5fb4b5c7ec4f59989c0e62ebc431c1e21
Parents: 895eaec
Author: Jason Brown jasobr...@apple.com
Authored: Tue Jul 8 16:20:58 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Tue Jul 8 16:20:58 2014 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/service/ActiveRepairService.java  | 22 +++-
 .../cassandra/service/StorageService.java   |  5 -
 3 files changed, 17 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb4032e5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 180b044..7fff2d4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
 2.1.0-final
  * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
+ * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
 
 
 2.1.0-rc3

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb4032e5/src/java/org/apache/cassandra/service/ActiveRepairService.java
--
diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java 
b/src/java/org/apache/cassandra/service/ActiveRepairService.java
index 70394bc..35a86f6 100644
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@ -316,19 +316,21 @@ public class ActiveRepairService
 parentRepairSessions.put(parentRepairSession, new 
ParentRepairSession(columnFamilyStores, ranges, sstablesToRepair, 
System.currentTimeMillis()));
 }
 
-public void finishParentSession(UUID parentSession, SetInetAddress 
neighbors) throws InterruptedException, ExecutionException, IOException
+public void finishParentSession(UUID parentSession, SetInetAddress 
neighbors, boolean doAntiCompaction) throws InterruptedException, 
ExecutionException, IOException
 {
-
-for (InetAddress neighbor : neighbors)
-{
-AnticompactionRequest acr = new 
AnticompactionRequest(parentSession);
-MessageOutRepairMessage req = acr.createMessage();
-MessagingService.instance().sendOneWay(req, neighbor);
-}
 try
 {
-ListFuture? futures = doAntiCompaction(parentSession);
-FBUtilities.waitOnFutures(futures);
+if (doAntiCompaction)
+{
+for (InetAddress neighbor : neighbors)
+{
+AnticompactionRequest acr = new 
AnticompactionRequest(parentSession);
+MessageOutRepairMessage req = acr.createMessage();
+MessagingService.instance().sendOneWay(req, neighbor);
+}
+ListFuture? futures = doAntiCompaction(parentSession);
+FBUtilities.waitOnFutures(futures);
+}
 }
 finally
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb4032e5/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index feaeac8..3fd3781 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2765,6 +2765,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 }
 }
 
+boolean successful = true;
 for (RepairFuture future : futures)
 {
 try
@@ -2776,19 +2777,21 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 }
 catch (ExecutionException e)
 {
+successful = false;
 message = String.format(Repair session %s for range 
%s failed with error %s, future.session.getId(), 
future.session.getRange().toString(), e.getCause().getMessage());
 logger.error(message, e);
 sendNotification(repair, message, new int[]{cmd

[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.1.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9d2684a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9d2684a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9d2684a

Branch: refs/heads/cassandra-2.1
Commit: b9d2684a89339e0290fb5db51bfb2c551f150e59
Parents: 8571fb5 eb4032e
Author: Jason Brown jasobr...@apple.com
Authored: Tue Jul 8 16:22:26 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Tue Jul 8 16:22:26 2014 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/service/ActiveRepairService.java  | 22 +++-
 .../cassandra/service/StorageService.java   |  5 -
 3 files changed, 17 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9d2684a/CHANGES.txt
--
diff --cc CHANGES.txt
index 9e84d31,7fff2d4..b3d8a4c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,6 +1,13 @@@
 +2.1.1
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 +
 +
  2.1.0-final
   * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
+  * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
  
  
  2.1.0-rc3

[1/2] git commit: Anti-compaction proceeds if any part of the repair failed

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 8571fb578 - b9d2684a8


Anti-compaction proceeds if any part of the repair failed

patch by jasobrown; reviewed by yukim for CASSANDRA-7521


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb4032e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb4032e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb4032e5

Branch: refs/heads/cassandra-2.1
Commit: eb4032e5fb4b5c7ec4f59989c0e62ebc431c1e21
Parents: 895eaec
Author: Jason Brown jasobr...@apple.com
Authored: Tue Jul 8 16:20:58 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Tue Jul 8 16:20:58 2014 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/service/ActiveRepairService.java  | 22 +++-
 .../cassandra/service/StorageService.java   |  5 -
 3 files changed, 17 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb4032e5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 180b044..7fff2d4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
 2.1.0-final
  * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
+ * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
 
 
 2.1.0-rc3

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb4032e5/src/java/org/apache/cassandra/service/ActiveRepairService.java
--
diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java 
b/src/java/org/apache/cassandra/service/ActiveRepairService.java
index 70394bc..35a86f6 100644
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@ -316,19 +316,21 @@ public class ActiveRepairService
 parentRepairSessions.put(parentRepairSession, new 
ParentRepairSession(columnFamilyStores, ranges, sstablesToRepair, 
System.currentTimeMillis()));
 }
 
-public void finishParentSession(UUID parentSession, SetInetAddress 
neighbors) throws InterruptedException, ExecutionException, IOException
+public void finishParentSession(UUID parentSession, SetInetAddress 
neighbors, boolean doAntiCompaction) throws InterruptedException, 
ExecutionException, IOException
 {
-
-for (InetAddress neighbor : neighbors)
-{
-AnticompactionRequest acr = new 
AnticompactionRequest(parentSession);
-MessageOutRepairMessage req = acr.createMessage();
-MessagingService.instance().sendOneWay(req, neighbor);
-}
 try
 {
-ListFuture? futures = doAntiCompaction(parentSession);
-FBUtilities.waitOnFutures(futures);
+if (doAntiCompaction)
+{
+for (InetAddress neighbor : neighbors)
+{
+AnticompactionRequest acr = new 
AnticompactionRequest(parentSession);
+MessageOutRepairMessage req = acr.createMessage();
+MessagingService.instance().sendOneWay(req, neighbor);
+}
+ListFuture? futures = doAntiCompaction(parentSession);
+FBUtilities.waitOnFutures(futures);
+}
 }
 finally
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb4032e5/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index feaeac8..3fd3781 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2765,6 +2765,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 }
 }
 
+boolean successful = true;
 for (RepairFuture future : futures)
 {
 try
@@ -2776,19 +2777,21 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 }
 catch (ExecutionException e)
 {
+successful = false;
 message = String.format(Repair session %s for range 
%s failed with error %s, future.session.getId(), 
future.session.getRange().toString(), e.getCause().getMessage());
 logger.error(message, e);
 sendNotification(repair, message, new int[]{cmd

[3/3] git commit: Merge branch 'cassandra-2.1' into trunk

[jasobrown]

Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23b02247
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23b02247
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23b02247

Branch: refs/heads/trunk
Commit: 23b0224751b754bb35bffc47baa343e3463b50ba
Parents: cae3cb2 b9d2684
Author: Jason Brown jasobr...@apple.com
Authored: Tue Jul 8 16:23:11 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Tue Jul 8 16:23:11 2014 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/service/ActiveRepairService.java  | 22 +++-
 .../cassandra/service/StorageService.java   |  5 -
 3 files changed, 17 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/23b02247/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/23b02247/src/java/org/apache/cassandra/service/StorageService.java
--

[1/3] git commit: Anti-compaction proceeds if any part of the repair failed

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/trunk cae3cb2a9 - 23b022475


Anti-compaction proceeds if any part of the repair failed

patch by jasobrown; reviewed by yukim for CASSANDRA-7521


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb4032e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb4032e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb4032e5

Branch: refs/heads/trunk
Commit: eb4032e5fb4b5c7ec4f59989c0e62ebc431c1e21
Parents: 895eaec
Author: Jason Brown jasobr...@apple.com
Authored: Tue Jul 8 16:20:58 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Tue Jul 8 16:20:58 2014 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/service/ActiveRepairService.java  | 22 +++-
 .../cassandra/service/StorageService.java   |  5 -
 3 files changed, 17 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb4032e5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 180b044..7fff2d4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
 2.1.0-final
  * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
+ * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
 
 
 2.1.0-rc3

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb4032e5/src/java/org/apache/cassandra/service/ActiveRepairService.java
--
diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java 
b/src/java/org/apache/cassandra/service/ActiveRepairService.java
index 70394bc..35a86f6 100644
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@ -316,19 +316,21 @@ public class ActiveRepairService
 parentRepairSessions.put(parentRepairSession, new 
ParentRepairSession(columnFamilyStores, ranges, sstablesToRepair, 
System.currentTimeMillis()));
 }
 
-public void finishParentSession(UUID parentSession, SetInetAddress 
neighbors) throws InterruptedException, ExecutionException, IOException
+public void finishParentSession(UUID parentSession, SetInetAddress 
neighbors, boolean doAntiCompaction) throws InterruptedException, 
ExecutionException, IOException
 {
-
-for (InetAddress neighbor : neighbors)
-{
-AnticompactionRequest acr = new 
AnticompactionRequest(parentSession);
-MessageOutRepairMessage req = acr.createMessage();
-MessagingService.instance().sendOneWay(req, neighbor);
-}
 try
 {
-ListFuture? futures = doAntiCompaction(parentSession);
-FBUtilities.waitOnFutures(futures);
+if (doAntiCompaction)
+{
+for (InetAddress neighbor : neighbors)
+{
+AnticompactionRequest acr = new 
AnticompactionRequest(parentSession);
+MessageOutRepairMessage req = acr.createMessage();
+MessagingService.instance().sendOneWay(req, neighbor);
+}
+ListFuture? futures = doAntiCompaction(parentSession);
+FBUtilities.waitOnFutures(futures);
+}
 }
 finally
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb4032e5/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index feaeac8..3fd3781 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2765,6 +2765,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 }
 }
 
+boolean successful = true;
 for (RepairFuture future : futures)
 {
 try
@@ -2776,19 +2777,21 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 }
 catch (ExecutionException e)
 {
+successful = false;
 message = String.format(Repair session %s for range 
%s failed with error %s, future.session.getId(), 
future.session.getRange().toString(), e.getCause().getMessage());
 logger.error(message, e);
 sendNotification(repair, message, new int[]{cmd, 
ActiveRepairService.Status.SESSION_FAILED.ordinal

[2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.1.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9d2684a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9d2684a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9d2684a

Branch: refs/heads/trunk
Commit: b9d2684a89339e0290fb5db51bfb2c551f150e59
Parents: 8571fb5 eb4032e
Author: Jason Brown jasobr...@apple.com
Authored: Tue Jul 8 16:22:26 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Tue Jul 8 16:22:26 2014 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/service/ActiveRepairService.java  | 22 +++-
 .../cassandra/service/StorageService.java   |  5 -
 3 files changed, 17 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9d2684a/CHANGES.txt
--
diff --cc CHANGES.txt
index 9e84d31,7fff2d4..b3d8a4c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,6 +1,13 @@@
 +2.1.1
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 +
 +
  2.1.0-final
   * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
+  * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
  
  
  2.1.0-rc3

git commit: ninja fix to lower the logging level of anticompaction when printing ranges

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 547cf1d10 - cbe4fd02a


ninja fix to lower the logging level of anticompaction when printing ranges


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cbe4fd02
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cbe4fd02
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cbe4fd02

Branch: refs/heads/cassandra-2.1.0
Commit: cbe4fd02aec75a359df34b48bafdf7361796f527
Parents: 547cf1d
Author: Jason Brown jasobr...@apple.com
Authored: Mon Jul 7 06:34:00 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Mon Jul 7 06:34:00 2014 -0700

--
 .../org/apache/cassandra/db/compaction/CompactionManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbe4fd02/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 227f908..66accf0 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -397,7 +397,8 @@ public class CompactionManager implements 
CompactionManagerMBean
   CollectionSSTableReader 
validatedForRepair,
   long repairedAt) throws 
InterruptedException, ExecutionException, IOException
 {
-logger.info(Starting anticompaction for ranges {}, ranges);
+logger.info(Starting anticompaction);
+logger.debug(Starting anticompaction for ranges {}, ranges);
 SetSSTableReader sstables = new HashSet(validatedForRepair);
 SetSSTableReader mutatedRepairStatuses = new HashSet();
 SetSSTableReader nonAnticompacting = new HashSet();

[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.1.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b54c4e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b54c4e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b54c4e5

Branch: refs/heads/cassandra-2.1
Commit: 0b54c4e500cb16b493c360d92a2b22b1c119c8a2
Parents: aac8e6c cbe4fd0
Author: Jason Brown jasobr...@apple.com
Authored: Mon Jul 7 06:34:56 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Mon Jul 7 06:34:56 2014 -0700

--
 .../org/apache/cassandra/db/compaction/CompactionManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b54c4e5/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--

[1/2] git commit: ninja fix to lower the logging level of anticompaction when printing ranges

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 aac8e6c7f - 0b54c4e50


ninja fix to lower the logging level of anticompaction when printing ranges


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cbe4fd02
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cbe4fd02
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cbe4fd02

Branch: refs/heads/cassandra-2.1
Commit: cbe4fd02aec75a359df34b48bafdf7361796f527
Parents: 547cf1d
Author: Jason Brown jasobr...@apple.com
Authored: Mon Jul 7 06:34:00 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Mon Jul 7 06:34:00 2014 -0700

--
 .../org/apache/cassandra/db/compaction/CompactionManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbe4fd02/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 227f908..66accf0 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -397,7 +397,8 @@ public class CompactionManager implements 
CompactionManagerMBean
   CollectionSSTableReader 
validatedForRepair,
   long repairedAt) throws 
InterruptedException, ExecutionException, IOException
 {
-logger.info(Starting anticompaction for ranges {}, ranges);
+logger.info(Starting anticompaction);
+logger.debug(Starting anticompaction for ranges {}, ranges);
 SetSSTableReader sstables = new HashSet(validatedForRepair);
 SetSSTableReader mutatedRepairStatuses = new HashSet();
 SetSSTableReader nonAnticompacting = new HashSet();

[2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.1.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b54c4e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b54c4e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b54c4e5

Branch: refs/heads/trunk
Commit: 0b54c4e500cb16b493c360d92a2b22b1c119c8a2
Parents: aac8e6c cbe4fd0
Author: Jason Brown jasobr...@apple.com
Authored: Mon Jul 7 06:34:56 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Mon Jul 7 06:34:56 2014 -0700

--
 .../org/apache/cassandra/db/compaction/CompactionManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b54c4e5/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--

[3/3] git commit: Merge branch 'cassandra-2.1' into trunk

[jasobrown]

Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ae5def8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ae5def8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ae5def8

Branch: refs/heads/trunk
Commit: 0ae5def831858e3ecba3aa5d510bc2575f4b5ba3
Parents: 968810e 0b54c4e
Author: Jason Brown jasobr...@apple.com
Authored: Mon Jul 7 06:35:25 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Mon Jul 7 06:35:25 2014 -0700

--
 .../org/apache/cassandra/db/compaction/CompactionManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ae5def8/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--

[1/3] git commit: ninja fix to lower the logging level of anticompaction when printing ranges

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 968810e50 - 0ae5def83


ninja fix to lower the logging level of anticompaction when printing ranges


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cbe4fd02
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cbe4fd02
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cbe4fd02

Branch: refs/heads/trunk
Commit: cbe4fd02aec75a359df34b48bafdf7361796f527
Parents: 547cf1d
Author: Jason Brown jasobr...@apple.com
Authored: Mon Jul 7 06:34:00 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Mon Jul 7 06:34:00 2014 -0700

--
 .../org/apache/cassandra/db/compaction/CompactionManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbe4fd02/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 227f908..66accf0 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -397,7 +397,8 @@ public class CompactionManager implements 
CompactionManagerMBean
   CollectionSSTableReader 
validatedForRepair,
   long repairedAt) throws 
InterruptedException, ExecutionException, IOException
 {
-logger.info(Starting anticompaction for ranges {}, ranges);
+logger.info(Starting anticompaction);
+logger.debug(Starting anticompaction for ranges {}, ranges);
 SetSSTableReader sstables = new HashSet(validatedForRepair);
 SetSSTableReader mutatedRepairStatuses = new HashSet();
 SetSSTableReader nonAnticompacting = new HashSet();

git commit: ninja fix to lower the logging level on StreamReader/CSR

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 0e393c935 - ea38ddced


ninja fix to lower the logging level on StreamReader/CSR


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea38ddce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea38ddce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea38ddce

Branch: refs/heads/cassandra-2.1.0
Commit: ea38ddced296ad289347c664bfa6a9f4ab50feff
Parents: 0e393c9
Author: Jason Brown jasobr...@apple.com
Authored: Wed Jul 2 16:01:56 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed Jul 2 16:01:56 2014 -0700

--
 src/java/org/apache/cassandra/streaming/StreamReader.java  | 2 +-
 .../cassandra/streaming/compress/CompressedStreamReader.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea38ddce/src/java/org/apache/cassandra/streaming/StreamReader.java
--
diff --git a/src/java/org/apache/cassandra/streaming/StreamReader.java 
b/src/java/org/apache/cassandra/streaming/StreamReader.java
index 7963629..f47479f 100644
--- a/src/java/org/apache/cassandra/streaming/StreamReader.java
+++ b/src/java/org/apache/cassandra/streaming/StreamReader.java
@@ -79,7 +79,7 @@ public class StreamReader
  */
 public SSTableWriter read(ReadableByteChannel channel) throws IOException
 {
-logger.info(reading file from {}, repairedAt = {}, session.peer, 
repairedAt);
+logger.debug(reading file from {}, repairedAt = {}, session.peer, 
repairedAt);
 long totalSize = totalSize();
 
 PairString, String kscf = Schema.instance.getCF(cfId);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea38ddce/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
--
diff --git 
a/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java 
b/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
index d843351..ebd191b 100644
--- 
a/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
+++ 
b/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
@@ -61,7 +61,7 @@ public class CompressedStreamReader extends StreamReader
 @Override
 public SSTableWriter read(ReadableByteChannel channel) throws IOException
 {
-logger.info(reading file from {}, repairedAt = {}, session.peer, 
repairedAt);
+logger.debug(reading file from {}, repairedAt = {}, session.peer, 
repairedAt);
 long totalSize = totalSize();
 
 PairString, String kscf = Schema.instance.getCF(cfId);

[1/2] git commit: ninja fix to lower the logging level on StreamReader/CSR

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 b48d0da6d - 047c67efb


ninja fix to lower the logging level on StreamReader/CSR


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea38ddce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea38ddce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea38ddce

Branch: refs/heads/cassandra-2.1
Commit: ea38ddced296ad289347c664bfa6a9f4ab50feff
Parents: 0e393c9
Author: Jason Brown jasobr...@apple.com
Authored: Wed Jul 2 16:01:56 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed Jul 2 16:01:56 2014 -0700

--
 src/java/org/apache/cassandra/streaming/StreamReader.java  | 2 +-
 .../cassandra/streaming/compress/CompressedStreamReader.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea38ddce/src/java/org/apache/cassandra/streaming/StreamReader.java
--
diff --git a/src/java/org/apache/cassandra/streaming/StreamReader.java 
b/src/java/org/apache/cassandra/streaming/StreamReader.java
index 7963629..f47479f 100644
--- a/src/java/org/apache/cassandra/streaming/StreamReader.java
+++ b/src/java/org/apache/cassandra/streaming/StreamReader.java
@@ -79,7 +79,7 @@ public class StreamReader
  */
 public SSTableWriter read(ReadableByteChannel channel) throws IOException
 {
-logger.info(reading file from {}, repairedAt = {}, session.peer, 
repairedAt);
+logger.debug(reading file from {}, repairedAt = {}, session.peer, 
repairedAt);
 long totalSize = totalSize();
 
 PairString, String kscf = Schema.instance.getCF(cfId);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea38ddce/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
--
diff --git 
a/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java 
b/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
index d843351..ebd191b 100644
--- 
a/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
+++ 
b/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
@@ -61,7 +61,7 @@ public class CompressedStreamReader extends StreamReader
 @Override
 public SSTableWriter read(ReadableByteChannel channel) throws IOException
 {
-logger.info(reading file from {}, repairedAt = {}, session.peer, 
repairedAt);
+logger.debug(reading file from {}, repairedAt = {}, session.peer, 
repairedAt);
 long totalSize = totalSize();
 
 PairString, String kscf = Schema.instance.getCF(cfId);

[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.1.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/047c67ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/047c67ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/047c67ef

Branch: refs/heads/cassandra-2.1
Commit: 047c67efb579607955a7637bb96ed181e7a37f56
Parents: b48d0da ea38ddc
Author: Jason Brown jasobr...@apple.com
Authored: Wed Jul 2 16:03:02 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed Jul 2 16:03:02 2014 -0700

--
 src/java/org/apache/cassandra/streaming/StreamReader.java  | 2 +-
 .../cassandra/streaming/compress/CompressedStreamReader.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--

[3/3] git commit: Merge branch 'cassandra-2.1' into trunk

[jasobrown]

Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c58b2b28
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c58b2b28
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c58b2b28

Branch: refs/heads/trunk
Commit: c58b2b28e728c071ac5741b0275638a413124721
Parents: 89463a5 047c67e
Author: Jason Brown jasobr...@apple.com
Authored: Wed Jul 2 16:03:31 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed Jul 2 16:03:31 2014 -0700

--
 src/java/org/apache/cassandra/streaming/StreamReader.java  | 2 +-
 .../cassandra/streaming/compress/CompressedStreamReader.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c58b2b28/src/java/org/apache/cassandra/streaming/StreamReader.java
--

[1/3] git commit: ninja fix to lower the logging level on StreamReader/CSR

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 89463a567 - c58b2b28e


ninja fix to lower the logging level on StreamReader/CSR


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea38ddce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea38ddce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea38ddce

Branch: refs/heads/trunk
Commit: ea38ddced296ad289347c664bfa6a9f4ab50feff
Parents: 0e393c9
Author: Jason Brown jasobr...@apple.com
Authored: Wed Jul 2 16:01:56 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed Jul 2 16:01:56 2014 -0700

--
 src/java/org/apache/cassandra/streaming/StreamReader.java  | 2 +-
 .../cassandra/streaming/compress/CompressedStreamReader.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea38ddce/src/java/org/apache/cassandra/streaming/StreamReader.java
--
diff --git a/src/java/org/apache/cassandra/streaming/StreamReader.java 
b/src/java/org/apache/cassandra/streaming/StreamReader.java
index 7963629..f47479f 100644
--- a/src/java/org/apache/cassandra/streaming/StreamReader.java
+++ b/src/java/org/apache/cassandra/streaming/StreamReader.java
@@ -79,7 +79,7 @@ public class StreamReader
  */
 public SSTableWriter read(ReadableByteChannel channel) throws IOException
 {
-logger.info(reading file from {}, repairedAt = {}, session.peer, 
repairedAt);
+logger.debug(reading file from {}, repairedAt = {}, session.peer, 
repairedAt);
 long totalSize = totalSize();
 
 PairString, String kscf = Schema.instance.getCF(cfId);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea38ddce/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
--
diff --git 
a/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java 
b/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
index d843351..ebd191b 100644
--- 
a/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
+++ 
b/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
@@ -61,7 +61,7 @@ public class CompressedStreamReader extends StreamReader
 @Override
 public SSTableWriter read(ReadableByteChannel channel) throws IOException
 {
-logger.info(reading file from {}, repairedAt = {}, session.peer, 
repairedAt);
+logger.debug(reading file from {}, repairedAt = {}, session.peer, 
repairedAt);
 long totalSize = totalSize();
 
 PairString, String kscf = Schema.instance.getCF(cfId);

[2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.1.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/047c67ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/047c67ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/047c67ef

Branch: refs/heads/trunk
Commit: 047c67efb579607955a7637bb96ed181e7a37f56
Parents: b48d0da ea38ddc
Author: Jason Brown jasobr...@apple.com
Authored: Wed Jul 2 16:03:02 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed Jul 2 16:03:02 2014 -0700

--
 src/java/org/apache/cassandra/streaming/StreamReader.java  | 2 +-
 .../cassandra/streaming/compress/CompressedStreamReader.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--

git commit: Hint streaming can cause decommission to fail

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-1.2 ea26dbd73 - 2f497eda0


Hint streaming can cause decommission to fail

patch by jasobrown, reviewed by marcuse for CASSANDRA-7219


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f497eda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f497eda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f497eda

Branch: refs/heads/cassandra-1.2
Commit: 2f497eda0f121fce68256e18748d04bd7cbfe032
Parents: ea26dbd
Author: Jason Brown jasobr...@apple.com
Authored: Fri May 30 05:40:30 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri May 30 05:40:30 2014 -0700

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/service/StorageService.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f497eda/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index ba3a675..ef5f72a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,6 +26,7 @@
  * exit CQLSH with error status code if script fails (CASSANDRA-6344)
  * Fix bug with some IN queries missig results (CASSANDRA-7105)
  * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
+ * Hint streaming can cause decommission to fail (CASSANDRA-7219)
 
 
 1.2.16

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f497eda/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 8e7c073..494da33 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2966,7 +2966,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private CountDownLatch streamHints()
 {
-if (HintedHandOffManager.instance.listEndpointsPendingHints().size() 
== 0)
+ColumnFamilyStore hintsCF = 
Table.open(Table.SYSTEM_KS).getColumnFamilyStore(SystemTable.HINTS_CF);
+if (hintsCF.getMemtableColumnsCount() == 0  hintsCF.estimateKeys() 
== 0)
 return new CountDownLatch(0);
 
 // gather all live nodes in the cluster that aren't also leaving

[1/2] git commit: Hint streaming can cause decommission to fail

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 7216639e5 - c2563dbc8


Hint streaming can cause decommission to fail

patch by jasobrown, reviewed by marcuse for CASSANDRA-7219


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f497eda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f497eda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f497eda

Branch: refs/heads/cassandra-2.0
Commit: 2f497eda0f121fce68256e18748d04bd7cbfe032
Parents: ea26dbd
Author: Jason Brown jasobr...@apple.com
Authored: Fri May 30 05:40:30 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri May 30 05:40:30 2014 -0700

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/service/StorageService.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f497eda/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index ba3a675..ef5f72a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,6 +26,7 @@
  * exit CQLSH with error status code if script fails (CASSANDRA-6344)
  * Fix bug with some IN queries missig results (CASSANDRA-7105)
  * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
+ * Hint streaming can cause decommission to fail (CASSANDRA-7219)
 
 
 1.2.16

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f497eda/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 8e7c073..494da33 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2966,7 +2966,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private CountDownLatch streamHints()
 {
-if (HintedHandOffManager.instance.listEndpointsPendingHints().size() 
== 0)
+ColumnFamilyStore hintsCF = 
Table.open(Table.SYSTEM_KS).getColumnFamilyStore(SystemTable.HINTS_CF);
+if (hintsCF.getMemtableColumnsCount() == 0  hintsCF.estimateKeys() 
== 0)
 return new CountDownLatch(0);
 
 // gather all live nodes in the cluster that aren't also leaving

[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

[jasobrown]

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/service/StorageService.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2563dbc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2563dbc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2563dbc

Branch: refs/heads/cassandra-2.0
Commit: c2563dbc8b83437dc825ac6c0969ccb5b8e5d55e
Parents: 7216639 2f497ed
Author: Jason Brown jasobr...@apple.com
Authored: Fri May 30 05:47:05 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri May 30 05:47:05 2014 -0700

--
 CHANGES.txt   | 2 ++
 src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2563dbc/CHANGES.txt
--
diff --cc CHANGES.txt
index 28c2ad6,ef5f72a..75e6759
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -71,61 -25,11 +71,63 @@@ Merged from 1.2
   * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191)
   * exit CQLSH with error status code if script fails (CASSANDRA-6344)
   * Fix bug with some IN queries missig results (CASSANDRA-7105)
+  * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
+  * Hint streaming can cause decommission to fail (CASSANDRA-7219)
  
  
 -1.2.16
 +2.0.7
 + * Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
 + * Avoid early loading of non-system keyspaces before compaction-leftovers 
 +   cleanup at startup (CASSANDRA-6913)
 + * Restrict Windows to parallel repairs (CASSANDRA-6907)
 + * (Hadoop) Allow manually specifying start/end tokens in CFIF 
(CASSANDRA-6436)
 + * Fix NPE in MeteredFlusher (CASSANDRA-6820)
 + * Fix race processing range scan responses (CASSANDRA-6820)
 + * Allow deleting snapshots from dropped keyspaces (CASSANDRA-6821)
 + * Add uuid() function (CASSANDRA-6473)
 + * Omit tombstones from schema digests (CASSANDRA-6862)
 + * Include correct consistencyLevel in LWT timeout (CASSANDRA-6884)
 + * Lower chances for losing new SSTables during nodetool refresh and
 +   ColumnFamilyStore.loadNewSSTables (CASSANDRA-6514)
 + * Add support for DELETE ... IF EXISTS to CQL3 (CASSANDRA-5708)
 + * Update hadoop_cql3_word_count example (CASSANDRA-6793)
 + * Fix handling of RejectedExecution in sync Thrift server (CASSANDRA-6788)
 + * Log more information when exceeding tombstone_warn_threshold 
(CASSANDRA-6865)
 + * Fix truncate to not abort due to unreachable fat clients (CASSANDRA-6864)
 + * Fix schema concurrency exceptions (CASSANDRA-6841)
 + * Fix leaking validator FH in StreamWriter (CASSANDRA-6832)
 + * Fix saving triggers to schema (CASSANDRA-6789)
 + * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
 + * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)
 + * Fix static counter columns (CASSANDRA-6827)
 + * Restore expiring-deleted (cell) compaction optimization (CASSANDRA-6844)
 + * Fix CompactionManager.needsCleanup (CASSANDRA-6845)
 + * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779)
 + * Read message id as string from earlier versions (CASSANDRA-6840)
 + * Properly use the Paxos consistency for (non-protocol) batch 
(CASSANDRA-6837)
 + * Add paranoid disk failure option (CASSANDRA-6646)
 + * Improve PerRowSecondaryIndex performance (CASSANDRA-6876)
 + * Extend triggers to support CAS updates (CASSANDRA-6882)
 + * Static columns with IF NOT EXISTS don't always work as expected 
(CASSANDRA-6873)
 + * Fix paging with SELECT DISTINCT (CASSANDRA-6857)
 + * Fix UnsupportedOperationException on CAS timeout (CASSANDRA-6923)
 + * Improve MeteredFlusher handling of MF-unaffected column families
 +   (CASSANDRA-6867)
 + * Add CqlRecordReader using native pagination (CASSANDRA-6311)
 + * Add QueryHandler interface (CASSANDRA-6659)
 + * Track liveRatio per-memtable, not per-CF (CASSANDRA-6945)
 + * Make sure upgradesstables keeps sstable level (CASSANDRA-6958)
 + * Fix LIMIT with static columns (CASSANDRA-6956)
 + * Fix clash with CQL column name in thrift validation (CASSANDRA-6892)
 + * Fix error with super columns in mixed 1.2-2.0 clusters (CASSANDRA-6966)
 + * Fix bad skip of sstables on slice query with composite start/finish 
(CASSANDRA-6825)
 + * Fix unintended update with conditional statement (CASSANDRA-6893)
 + * Fix map element access in IF (CASSANDRA-6914)
 + * Avoid costly range calculations for range queries on system keyspaces
 +   (CASSANDRA-6906)
 + * Fix SSTable not released if stream session fails (CASSANDRA-6818)
 + * Avoid build failure due to ANTLR timeout (CASSANDRA-6991)
 +Merged from 1.2:
   * 

[1/4] git commit: Hint streaming can cause decommission to fail

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 825b23be9 - d4f63aa57


Hint streaming can cause decommission to fail

patch by jasobrown, reviewed by marcuse for CASSANDRA-7219


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f497eda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f497eda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f497eda

Branch: refs/heads/trunk
Commit: 2f497eda0f121fce68256e18748d04bd7cbfe032
Parents: ea26dbd
Author: Jason Brown jasobr...@apple.com
Authored: Fri May 30 05:40:30 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri May 30 05:40:30 2014 -0700

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/service/StorageService.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f497eda/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index ba3a675..ef5f72a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,6 +26,7 @@
  * exit CQLSH with error status code if script fails (CASSANDRA-6344)
  * Fix bug with some IN queries missig results (CASSANDRA-7105)
  * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
+ * Hint streaming can cause decommission to fail (CASSANDRA-7219)
 
 
 1.2.16

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f497eda/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 8e7c073..494da33 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2966,7 +2966,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private CountDownLatch streamHints()
 {
-if (HintedHandOffManager.instance.listEndpointsPendingHints().size() 
== 0)
+ColumnFamilyStore hintsCF = 
Table.open(Table.SYSTEM_KS).getColumnFamilyStore(SystemTable.HINTS_CF);
+if (hintsCF.getMemtableColumnsCount() == 0  hintsCF.estimateKeys() 
== 0)
 return new CountDownLatch(0);
 
 // gather all live nodes in the cluster that aren't also leaving

[1/3] git commit: Hint streaming can cause decommission to fail

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 30df4a728 - a30dfbd74


Hint streaming can cause decommission to fail

patch by jasobrown, reviewed by marcuse for CASSANDRA-7219


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f497eda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f497eda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f497eda

Branch: refs/heads/cassandra-2.1
Commit: 2f497eda0f121fce68256e18748d04bd7cbfe032
Parents: ea26dbd
Author: Jason Brown jasobr...@apple.com
Authored: Fri May 30 05:40:30 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri May 30 05:40:30 2014 -0700

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/service/StorageService.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f497eda/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index ba3a675..ef5f72a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,6 +26,7 @@
  * exit CQLSH with error status code if script fails (CASSANDRA-6344)
  * Fix bug with some IN queries missig results (CASSANDRA-7105)
  * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
+ * Hint streaming can cause decommission to fail (CASSANDRA-7219)
 
 
 1.2.16

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f497eda/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 8e7c073..494da33 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2966,7 +2966,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private CountDownLatch streamHints()
 {
-if (HintedHandOffManager.instance.listEndpointsPendingHints().size() 
== 0)
+ColumnFamilyStore hintsCF = 
Table.open(Table.SYSTEM_KS).getColumnFamilyStore(SystemTable.HINTS_CF);
+if (hintsCF.getMemtableColumnsCount() == 0  hintsCF.estimateKeys() 
== 0)
 return new CountDownLatch(0);
 
 // gather all live nodes in the cluster that aren't also leaving

[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a30dfbd7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a30dfbd7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a30dfbd7

Branch: refs/heads/trunk
Commit: a30dfbd74f38b773bc05fedbd20884c68eec2071
Parents: 30df4a7 c2563db
Author: Jason Brown jasobr...@apple.com
Authored: Fri May 30 05:48:39 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri May 30 05:48:39 2014 -0700

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a30dfbd7/CHANGES.txt
--
diff --cc CHANGES.txt
index 521114e,75e6759..7603f88
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -93,122 -70,12 +93,123 @@@ Merged from 1.2
   * exit CQLSH with error status code if script fails (CASSANDRA-6344)
   * Fix bug with some IN queries missig results (CASSANDRA-7105)
   * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
+  * Hint streaming can cause decommission to fail (CASSANDRA-7219)
  
  
 -2.0.7
 +2.1.0-beta2
 + * Increase default CL space to 8GB (CASSANDRA-7031)
 + * Add range tombstones to read repair digests (CASSANDRA-6863)
 + * Fix BTree.clear for large updates (CASSANDRA-6943)
 + * Fail write instead of logging a warning when unable to append to CL
 +   (CASSANDRA-6764)
 + * Eliminate possibility of CL segment appearing twice in active list 
 +   (CASSANDRA-6557)
 + * Apply DONTNEED fadvise to commitlog segments (CASSANDRA-6759)
 + * Switch CRC component to Adler and include it for compressed sstables 
 +   (CASSANDRA-4165)
 + * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451)
 + * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899)
 + * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897)
 + * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573)
 + * Fix ABTC NPE and apply update function correctly (CASSANDRA-6692)
 + * Allow nodetool to use a file or prompt for password (CASSANDRA-6660)
 + * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742)
 + * Fix assertion error in ALTER TYPE RENAME (CASSANDRA-6705)
 + * Scrub should not always clear out repaired status (CASSANDRA-5351)
 + * Improve handling of range tombstone for wide partitions (CASSANDRA-6446)
 + * Fix ClassCastException for compact table with composites (CASSANDRA-6738)
 + * Fix potentially repairing with wrong nodes (CASSANDRA-6808)
 + * Change caching option syntax (CASSANDRA-6745)
 + * Fix stress to do proper counter reads (CASSANDRA-6835)
 + * Fix help message for stress counter_write (CASSANDRA-6824)
 + * Fix stress smart Thrift client to pick servers correctly (CASSANDRA-6848)
 + * Add logging levels (minimal, normal or verbose) to stress tool 
(CASSANDRA-6849)
 + * Fix race condition in Batch CLE (CASSANDRA-6860)
 + * Improve cleanup/scrub/upgradesstables failure handling (CASSANDRA-6774)
 + * ByteBuffer write() methods for serializing sstables (CASSANDRA-6781)
 + * Proper compare function for CollectionType (CASSANDRA-6783)
 + * Update native server to Netty 4 (CASSANDRA-6236)
 + * Fix off-by-one error in stress (CASSANDRA-6883)
 + * Make OpOrder AutoCloseable (CASSANDRA-6901)
 + * Remove sync repair JMX interface (CASSANDRA-6900)
 + * Add multiple memory allocation options for memtables (CASSANDRA-6689, 6694)
 + * Remove adjusted op rate from stress output (CASSANDRA-6921)
 + * Add optimized CF.hasColumns() implementations (CASSANDRA-6941)
 + * Serialize batchlog mutations with the version of the target node
 +   (CASSANDRA-6931)
 + * Optimize CounterColumn#reconcile() (CASSANDRA-6953)
 + * Properly remove 1.2 sstable support in 2.1 (CASSANDRA-6869)
 + * Lock counter cells, not partitions (CASSANDRA-6880)
 + * Track presence of legacy counter shards in sstables (CASSANDRA-6888)
 + * Ensure safe resource cleanup when replacing sstables (CASSANDRA-6912)
 + * Add failure handler to async callback (CASSANDRA-6747)
 + * Fix AE when closing SSTable without releasing reference (CASSANDRA-7000)
 + * Clean up IndexInfo on keyspace/table drops (CASSANDRA-6924)
 + * Only snapshot relative SSTables when sequential repair (CASSANDRA-7024)
 + * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
 + * fix cassandra stress errors on reads with native protocol (CASSANDRA-7033)
 + * Use OpOrder to guard sstable references for reads (CASSANDRA-6919)
 + * Preemptive opening of compaction result (CASSANDRA-6916)
 + * Multi-threaded scrub/cleanup/upgradesstables 

[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

[jasobrown]

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/service/StorageService.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2563dbc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2563dbc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2563dbc

Branch: refs/heads/trunk
Commit: c2563dbc8b83437dc825ac6c0969ccb5b8e5d55e
Parents: 7216639 2f497ed
Author: Jason Brown jasobr...@apple.com
Authored: Fri May 30 05:47:05 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri May 30 05:47:05 2014 -0700

--
 CHANGES.txt   | 2 ++
 src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2563dbc/CHANGES.txt
--
diff --cc CHANGES.txt
index 28c2ad6,ef5f72a..75e6759
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -71,61 -25,11 +71,63 @@@ Merged from 1.2
   * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191)
   * exit CQLSH with error status code if script fails (CASSANDRA-6344)
   * Fix bug with some IN queries missig results (CASSANDRA-7105)
+  * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
+  * Hint streaming can cause decommission to fail (CASSANDRA-7219)
  
  
 -1.2.16
 +2.0.7
 + * Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
 + * Avoid early loading of non-system keyspaces before compaction-leftovers 
 +   cleanup at startup (CASSANDRA-6913)
 + * Restrict Windows to parallel repairs (CASSANDRA-6907)
 + * (Hadoop) Allow manually specifying start/end tokens in CFIF 
(CASSANDRA-6436)
 + * Fix NPE in MeteredFlusher (CASSANDRA-6820)
 + * Fix race processing range scan responses (CASSANDRA-6820)
 + * Allow deleting snapshots from dropped keyspaces (CASSANDRA-6821)
 + * Add uuid() function (CASSANDRA-6473)
 + * Omit tombstones from schema digests (CASSANDRA-6862)
 + * Include correct consistencyLevel in LWT timeout (CASSANDRA-6884)
 + * Lower chances for losing new SSTables during nodetool refresh and
 +   ColumnFamilyStore.loadNewSSTables (CASSANDRA-6514)
 + * Add support for DELETE ... IF EXISTS to CQL3 (CASSANDRA-5708)
 + * Update hadoop_cql3_word_count example (CASSANDRA-6793)
 + * Fix handling of RejectedExecution in sync Thrift server (CASSANDRA-6788)
 + * Log more information when exceeding tombstone_warn_threshold 
(CASSANDRA-6865)
 + * Fix truncate to not abort due to unreachable fat clients (CASSANDRA-6864)
 + * Fix schema concurrency exceptions (CASSANDRA-6841)
 + * Fix leaking validator FH in StreamWriter (CASSANDRA-6832)
 + * Fix saving triggers to schema (CASSANDRA-6789)
 + * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
 + * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)
 + * Fix static counter columns (CASSANDRA-6827)
 + * Restore expiring-deleted (cell) compaction optimization (CASSANDRA-6844)
 + * Fix CompactionManager.needsCleanup (CASSANDRA-6845)
 + * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779)
 + * Read message id as string from earlier versions (CASSANDRA-6840)
 + * Properly use the Paxos consistency for (non-protocol) batch 
(CASSANDRA-6837)
 + * Add paranoid disk failure option (CASSANDRA-6646)
 + * Improve PerRowSecondaryIndex performance (CASSANDRA-6876)
 + * Extend triggers to support CAS updates (CASSANDRA-6882)
 + * Static columns with IF NOT EXISTS don't always work as expected 
(CASSANDRA-6873)
 + * Fix paging with SELECT DISTINCT (CASSANDRA-6857)
 + * Fix UnsupportedOperationException on CAS timeout (CASSANDRA-6923)
 + * Improve MeteredFlusher handling of MF-unaffected column families
 +   (CASSANDRA-6867)
 + * Add CqlRecordReader using native pagination (CASSANDRA-6311)
 + * Add QueryHandler interface (CASSANDRA-6659)
 + * Track liveRatio per-memtable, not per-CF (CASSANDRA-6945)
 + * Make sure upgradesstables keeps sstable level (CASSANDRA-6958)
 + * Fix LIMIT with static columns (CASSANDRA-6956)
 + * Fix clash with CQL column name in thrift validation (CASSANDRA-6892)
 + * Fix error with super columns in mixed 1.2-2.0 clusters (CASSANDRA-6966)
 + * Fix bad skip of sstables on slice query with composite start/finish 
(CASSANDRA-6825)
 + * Fix unintended update with conditional statement (CASSANDRA-6893)
 + * Fix map element access in IF (CASSANDRA-6914)
 + * Avoid costly range calculations for range queries on system keyspaces
 +   (CASSANDRA-6906)
 + * Fix SSTable not released if stream session fails (CASSANDRA-6818)
 + * Avoid build failure due to ANTLR timeout (CASSANDRA-6991)
 +Merged from 1.2:
   * Add 

[4/4] git commit: Merge branch 'cassandra-2.1' into trunk

[jasobrown]

Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4f63aa5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4f63aa5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4f63aa5

Branch: refs/heads/trunk
Commit: d4f63aa578eec0412b7392cba208a0df5e62aa2d
Parents: 825b23b a30dfbd
Author: Jason Brown jasobr...@apple.com
Authored: Fri May 30 05:52:57 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri May 30 05:52:57 2014 -0700

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4f63aa5/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4f63aa5/src/java/org/apache/cassandra/service/StorageService.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

[jasobrown]

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/service/StorageService.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2563dbc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2563dbc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2563dbc

Branch: refs/heads/cassandra-2.1
Commit: c2563dbc8b83437dc825ac6c0969ccb5b8e5d55e
Parents: 7216639 2f497ed
Author: Jason Brown jasobr...@apple.com
Authored: Fri May 30 05:47:05 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri May 30 05:47:05 2014 -0700

--
 CHANGES.txt   | 2 ++
 src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2563dbc/CHANGES.txt
--
diff --cc CHANGES.txt
index 28c2ad6,ef5f72a..75e6759
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -71,61 -25,11 +71,63 @@@ Merged from 1.2
   * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191)
   * exit CQLSH with error status code if script fails (CASSANDRA-6344)
   * Fix bug with some IN queries missig results (CASSANDRA-7105)
+  * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
+  * Hint streaming can cause decommission to fail (CASSANDRA-7219)
  
  
 -1.2.16
 +2.0.7
 + * Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
 + * Avoid early loading of non-system keyspaces before compaction-leftovers 
 +   cleanup at startup (CASSANDRA-6913)
 + * Restrict Windows to parallel repairs (CASSANDRA-6907)
 + * (Hadoop) Allow manually specifying start/end tokens in CFIF 
(CASSANDRA-6436)
 + * Fix NPE in MeteredFlusher (CASSANDRA-6820)
 + * Fix race processing range scan responses (CASSANDRA-6820)
 + * Allow deleting snapshots from dropped keyspaces (CASSANDRA-6821)
 + * Add uuid() function (CASSANDRA-6473)
 + * Omit tombstones from schema digests (CASSANDRA-6862)
 + * Include correct consistencyLevel in LWT timeout (CASSANDRA-6884)
 + * Lower chances for losing new SSTables during nodetool refresh and
 +   ColumnFamilyStore.loadNewSSTables (CASSANDRA-6514)
 + * Add support for DELETE ... IF EXISTS to CQL3 (CASSANDRA-5708)
 + * Update hadoop_cql3_word_count example (CASSANDRA-6793)
 + * Fix handling of RejectedExecution in sync Thrift server (CASSANDRA-6788)
 + * Log more information when exceeding tombstone_warn_threshold 
(CASSANDRA-6865)
 + * Fix truncate to not abort due to unreachable fat clients (CASSANDRA-6864)
 + * Fix schema concurrency exceptions (CASSANDRA-6841)
 + * Fix leaking validator FH in StreamWriter (CASSANDRA-6832)
 + * Fix saving triggers to schema (CASSANDRA-6789)
 + * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
 + * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)
 + * Fix static counter columns (CASSANDRA-6827)
 + * Restore expiring-deleted (cell) compaction optimization (CASSANDRA-6844)
 + * Fix CompactionManager.needsCleanup (CASSANDRA-6845)
 + * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779)
 + * Read message id as string from earlier versions (CASSANDRA-6840)
 + * Properly use the Paxos consistency for (non-protocol) batch 
(CASSANDRA-6837)
 + * Add paranoid disk failure option (CASSANDRA-6646)
 + * Improve PerRowSecondaryIndex performance (CASSANDRA-6876)
 + * Extend triggers to support CAS updates (CASSANDRA-6882)
 + * Static columns with IF NOT EXISTS don't always work as expected 
(CASSANDRA-6873)
 + * Fix paging with SELECT DISTINCT (CASSANDRA-6857)
 + * Fix UnsupportedOperationException on CAS timeout (CASSANDRA-6923)
 + * Improve MeteredFlusher handling of MF-unaffected column families
 +   (CASSANDRA-6867)
 + * Add CqlRecordReader using native pagination (CASSANDRA-6311)
 + * Add QueryHandler interface (CASSANDRA-6659)
 + * Track liveRatio per-memtable, not per-CF (CASSANDRA-6945)
 + * Make sure upgradesstables keeps sstable level (CASSANDRA-6958)
 + * Fix LIMIT with static columns (CASSANDRA-6956)
 + * Fix clash with CQL column name in thrift validation (CASSANDRA-6892)
 + * Fix error with super columns in mixed 1.2-2.0 clusters (CASSANDRA-6966)
 + * Fix bad skip of sstables on slice query with composite start/finish 
(CASSANDRA-6825)
 + * Fix unintended update with conditional statement (CASSANDRA-6893)
 + * Fix map element access in IF (CASSANDRA-6914)
 + * Avoid costly range calculations for range queries on system keyspaces
 +   (CASSANDRA-6906)
 + * Fix SSTable not released if stream session fails (CASSANDRA-6818)
 + * Avoid build failure due to ANTLR timeout (CASSANDRA-6991)
 +Merged from 1.2:
   * 

[3/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a30dfbd7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a30dfbd7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a30dfbd7

Branch: refs/heads/cassandra-2.1
Commit: a30dfbd74f38b773bc05fedbd20884c68eec2071
Parents: 30df4a7 c2563db
Author: Jason Brown jasobr...@apple.com
Authored: Fri May 30 05:48:39 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri May 30 05:48:39 2014 -0700

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a30dfbd7/CHANGES.txt
--
diff --cc CHANGES.txt
index 521114e,75e6759..7603f88
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -93,122 -70,12 +93,123 @@@ Merged from 1.2
   * exit CQLSH with error status code if script fails (CASSANDRA-6344)
   * Fix bug with some IN queries missig results (CASSANDRA-7105)
   * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
+  * Hint streaming can cause decommission to fail (CASSANDRA-7219)
  
  
 -2.0.7
 +2.1.0-beta2
 + * Increase default CL space to 8GB (CASSANDRA-7031)
 + * Add range tombstones to read repair digests (CASSANDRA-6863)
 + * Fix BTree.clear for large updates (CASSANDRA-6943)
 + * Fail write instead of logging a warning when unable to append to CL
 +   (CASSANDRA-6764)
 + * Eliminate possibility of CL segment appearing twice in active list 
 +   (CASSANDRA-6557)
 + * Apply DONTNEED fadvise to commitlog segments (CASSANDRA-6759)
 + * Switch CRC component to Adler and include it for compressed sstables 
 +   (CASSANDRA-4165)
 + * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451)
 + * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899)
 + * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897)
 + * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573)
 + * Fix ABTC NPE and apply update function correctly (CASSANDRA-6692)
 + * Allow nodetool to use a file or prompt for password (CASSANDRA-6660)
 + * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742)
 + * Fix assertion error in ALTER TYPE RENAME (CASSANDRA-6705)
 + * Scrub should not always clear out repaired status (CASSANDRA-5351)
 + * Improve handling of range tombstone for wide partitions (CASSANDRA-6446)
 + * Fix ClassCastException for compact table with composites (CASSANDRA-6738)
 + * Fix potentially repairing with wrong nodes (CASSANDRA-6808)
 + * Change caching option syntax (CASSANDRA-6745)
 + * Fix stress to do proper counter reads (CASSANDRA-6835)
 + * Fix help message for stress counter_write (CASSANDRA-6824)
 + * Fix stress smart Thrift client to pick servers correctly (CASSANDRA-6848)
 + * Add logging levels (minimal, normal or verbose) to stress tool 
(CASSANDRA-6849)
 + * Fix race condition in Batch CLE (CASSANDRA-6860)
 + * Improve cleanup/scrub/upgradesstables failure handling (CASSANDRA-6774)
 + * ByteBuffer write() methods for serializing sstables (CASSANDRA-6781)
 + * Proper compare function for CollectionType (CASSANDRA-6783)
 + * Update native server to Netty 4 (CASSANDRA-6236)
 + * Fix off-by-one error in stress (CASSANDRA-6883)
 + * Make OpOrder AutoCloseable (CASSANDRA-6901)
 + * Remove sync repair JMX interface (CASSANDRA-6900)
 + * Add multiple memory allocation options for memtables (CASSANDRA-6689, 6694)
 + * Remove adjusted op rate from stress output (CASSANDRA-6921)
 + * Add optimized CF.hasColumns() implementations (CASSANDRA-6941)
 + * Serialize batchlog mutations with the version of the target node
 +   (CASSANDRA-6931)
 + * Optimize CounterColumn#reconcile() (CASSANDRA-6953)
 + * Properly remove 1.2 sstable support in 2.1 (CASSANDRA-6869)
 + * Lock counter cells, not partitions (CASSANDRA-6880)
 + * Track presence of legacy counter shards in sstables (CASSANDRA-6888)
 + * Ensure safe resource cleanup when replacing sstables (CASSANDRA-6912)
 + * Add failure handler to async callback (CASSANDRA-6747)
 + * Fix AE when closing SSTable without releasing reference (CASSANDRA-7000)
 + * Clean up IndexInfo on keyspace/table drops (CASSANDRA-6924)
 + * Only snapshot relative SSTables when sequential repair (CASSANDRA-7024)
 + * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
 + * fix cassandra stress errors on reads with native protocol (CASSANDRA-7033)
 + * Use OpOrder to guard sstable references for reads (CASSANDRA-6919)
 + * Preemptive opening of compaction result (CASSANDRA-6916)
 + * Multi-threaded 

[3/4] git commit: make sure manifest's parent dirs exist before trying to write the file.

[jasobrown]

make sure manifest's parent dirs exist before trying to write the file.


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d267cf88
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d267cf88
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d267cf88

Branch: refs/heads/trunk
Commit: d267cf88c870a05efc9109a53b51b8628b4dfe48
Parents: e241319
Author: Jason Brown jasobr...@apple.com
Authored: Wed May 7 16:34:29 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed May 7 16:34:29 2014 -0700

--
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d267cf88/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 33b7303..417a5b4 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -2171,9 +2171,10 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 final JSONObject manifestJSON = new JSONObject();
 manifestJSON.put(files, filesJSONArr);
 
-
 try
 {
+if (!manifestFile.getParentFile().exists())
+manifestFile.getParentFile().mkdirs();
 PrintStream out = new PrintStream(manifestFile);
 out.println(manifestJSON.toJSONString());
 out.close();

git commit: Starting threads in the OutboundTcpConnectionPool constructor causes race conditions

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 2e61cd5e0 - 05bacaeab


Starting threads in the OutboundTcpConnectionPool constructor causes race 
conditions

patch by sbtourist; reviewed by jasobrown for CASSANDRA-7177


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05bacaea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05bacaea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05bacaea

Branch: refs/heads/cassandra-2.0
Commit: 05bacaeabc96a6d85fbf908dce8474acffcab730
Parents: 2e61cd5
Author: Jason Brown jasobr...@apple.com
Authored: Wed May 7 11:58:56 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed May 7 11:58:56 2014 -0700

--
 CHANGES.txt |  2 +-
 .../apache/cassandra/net/MessagingService.java  |  6 +--
 .../net/OutboundTcpConnectionPool.java  | 41 +---
 3 files changed, 40 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/05bacaea/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index fc192ef..65ee6cf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,6 @@
 2.0.9
  * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
-
+ * Starting threads in OutboundTcpConnectionPool constructor causes race 
conditions (CASSANDRA-7177)
 
 2.0.8
  * Correctly delete scheduled range xfers (CASSANDRA-7143)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/05bacaea/src/java/org/apache/cassandra/net/MessagingService.java
--
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java 
b/src/java/org/apache/cassandra/net/MessagingService.java
index cccf698..dbd76d6 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -498,11 +498,11 @@ public final class MessagingService implements 
MessagingServiceMBean
 cp = new OutboundTcpConnectionPool(to);
 OutboundTcpConnectionPool existingPool = 
connectionManagers.putIfAbsent(to, cp);
 if (existingPool != null)
-{
-cp.close();
 cp = existingPool;
-}
+else
+cp.start();
 }
+cp.waitForStarted();
 return cp;
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/05bacaea/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
--
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java 
b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
index 81168c6..c45fc53 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
@@ -22,6 +22,8 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.nio.channels.SocketChannel;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.cassandra.concurrent.Stage;
 import org.apache.cassandra.config.Config;
@@ -36,6 +38,7 @@ public class OutboundTcpConnectionPool
 {
 // pointer for the real Address.
 private final InetAddress id;
+private final CountDownLatch started;
 public final OutboundTcpConnection cmdCon;
 public final OutboundTcpConnection ackCon;
 // pointer to the reseted Address.
@@ -46,13 +49,10 @@ public class OutboundTcpConnectionPool
 {
 id = remoteEp;
 resetedEndpoint = SystemKeyspace.getPreferredIP(remoteEp);
+started = new CountDownLatch(1);
 
 cmdCon = new OutboundTcpConnection(this);
-cmdCon.start();
 ackCon = new OutboundTcpConnection(this);
-ackCon.start();
-
-metrics = new ConnectionMetrics(id, this);
 }
 
 /**
@@ -167,14 +167,45 @@ public class OutboundTcpConnectionPool
 }
 return true;
 }
+
+public void start()
+{
+cmdCon.start();
+ackCon.start();
+
+metrics = new ConnectionMetrics(id, this);
+
+started.countDown();
+}
+
+public void waitForStarted()
+{
+if (started.getCount() == 0)
+return;
+
+boolean error = false;
+try
+{
+if (!started.await(1, TimeUnit.MINUTES))
+error = true;
+}
+catch (InterruptedException e)
+{
+Thread.currentThread().interrupt();
+error = true;
+}
+if (error)
+throw new IllegalStateException

git commit: make sure manifest's parent dirs exist before trying to write the file.

[jasobrown]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 e241319b2 - d267cf88c


make sure manifest's parent dirs exist before trying to write the file.


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d267cf88
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d267cf88
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d267cf88

Branch: refs/heads/cassandra-2.1
Commit: d267cf88c870a05efc9109a53b51b8628b4dfe48
Parents: e241319
Author: Jason Brown jasobr...@apple.com
Authored: Wed May 7 16:34:29 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed May 7 16:34:29 2014 -0700

--
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d267cf88/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 33b7303..417a5b4 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -2171,9 +2171,10 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 final JSONObject manifestJSON = new JSONObject();
 manifestJSON.put(files, filesJSONArr);
 
-
 try
 {
+if (!manifestFile.getParentFile().exists())
+manifestFile.getParentFile().mkdirs();
 PrintStream out = new PrintStream(manifestFile);
 out.println(manifestJSON.toJSONString());
 out.close();