[jira] [Commented] (CASSANDRA-12676) Message coalescing regression

2016-10-21 Thread Jeff Jirsa (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12676?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15597034#comment-15597034
 ] 

Jeff Jirsa commented on CASSANDRA-12676:


[~tjake] - make sense to go back to disabled by default for 4.0?


> Message coalescing regression
> -
>
> Key: CASSANDRA-12676
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12676
> Project: Cassandra
>  Issue Type: Bug
>Reporter: T Jake Luciani
> Fix For: 2.2.x, 3.0.x
>
>
> The default in 2.2+ was to enable TIMEHORIZON message coalescing.  After 
> reports of performance regressions after upgrading from 2.1 to 2.2/3.0 we 
> have discovered the issue to be this default.
> We need to re-test our assumptions on this feature but in the meantime we 
> should default back to disabled.
> Here is a performance run [with and without message 
> coalescing|http://cstar.datastax.com/graph?command=one_job=9a26b5f2-7f48-11e6-92e7-0256e416528f=op_rate=2_user=1_aggregates=true=0=508.86=0=91223]
>  



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Updated] (CASSANDRA-12786) Fix a bug in CASSANDRA-11005(Split consisten range movement flag)

2016-10-21 Thread Jeff Jirsa (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12786?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jeff Jirsa updated CASSANDRA-12786:
---
   Resolution: Fixed
 Reviewer: Jeff Jirsa
Fix Version/s: 3.10
   3.0.10
   2.2.9
   Status: Resolved  (was: Patch Available)

lgtm, committed as {{28713778abe29c1d9120d2127354b7fd5ee8fff1}}

> Fix a bug in CASSANDRA-11005(Split consisten range movement flag)
> -
>
> Key: CASSANDRA-12786
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12786
> Project: Cassandra
>  Issue Type: Bug
>Reporter: sankalp kohli
>Assignee: sankalp kohli
>Priority: Minor
> Fix For: 2.2.9, 3.0.10, 3.10
>
> Attachments: CASSANDRA-12786.txt
>
>
> I missed a place in the code where we need to split this flag for bootstrap



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-10-21 Thread jjirsa
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: d4a914d2166f8fa2345127bb3d86503b2921be33
Parents: 575927b 5883e43
Author: Jeff Jirsa 
Authored: Fri Oct 21 19:04:04 2016 -0700
Committer: Jeff Jirsa 
Committed: Fri Oct 21 19:04:40 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4a914d2/CHANGES.txt
--
diff --cc CHANGES.txt
index 105791b,46f27a6..b965262
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -136,11 -33,10 +136,12 @@@ Merged from 2.2
   * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
   * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
   * Decrement pending range calculator jobs counter in finally block
 -  (CASSANDRA-12554)
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
+  * Split consistent range movement flag correction (CASSANDRA-12786)
  Merged from 2.1:
 - * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
   * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
  
  

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



[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

2016-10-21 Thread jjirsa
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: d4a914d2166f8fa2345127bb3d86503b2921be33
Parents: 575927b 5883e43
Author: Jeff Jirsa 
Authored: Fri Oct 21 19:04:04 2016 -0700
Committer: Jeff Jirsa 
Committed: Fri Oct 21 19:04:40 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4a914d2/CHANGES.txt
--
diff --cc CHANGES.txt
index 105791b,46f27a6..b965262
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -136,11 -33,10 +136,12 @@@ Merged from 2.2
   * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
   * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
   * Decrement pending range calculator jobs counter in finally block
 -  (CASSANDRA-12554)
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
+  * Split consistent range movement flag correction (CASSANDRA-12786)
  Merged from 2.1:
 - * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
   * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
  
  

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



[01/10] cassandra git commit: Split consistent range movement flag correction

2016-10-21 Thread jjirsa
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 a370409c8 -> 28713778a
  refs/heads/cassandra-3.0 7976d65af -> 5883e4358
  refs/heads/cassandra-3.X 575927b1e -> d4a914d21
  refs/heads/trunk 2e15fc37f -> aedb2187a


Split consistent range movement flag correction

Patch by Sankalp Kohli; Reviewed by Jeff Jirsa for CASSANDRA-12786


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

Branch: refs/heads/cassandra-2.2
Commit: 28713778abe29c1d9120d2127354b7fd5ee8fff1
Parents: a370409
Author: Jeff Jirsa 
Authored: Fri Oct 21 19:01:27 2016 -0700
Committer: Jeff Jirsa 
Committed: Fri Oct 21 19:01:27 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/28713778/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index efd0f5c..8b61da4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
  * Fix merkle tree depth calculation (CASSANDRA-12580)
  * Make Collections deserialization more robust (CASSANDRA-12618)
  * Better handle invalid system roles table (CASSANDRA-12700)
+ * Split consistent range movement flag correction (CASSANDRA-12786)
 Merged from 2.1:
 ===
 2.1.17

http://git-wip-us.apache.org/repos/asf/cassandra/blob/28713778/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 db86294..58c2bac 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -798,7 +798,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 logger.debug("... got ring + schema info");
 
-if (useStrictConsistency &&
+if (useStrictConsistency && !allowSimultaneousMoves() &&
 (
 tokenMetadata.getBootstrapTokens().valueSet().size() > 
0 ||
 tokenMetadata.getLeavingEndpoints().size() > 0 ||



[10/10] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-21 Thread jjirsa
Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: aedb2187a3e85cfc23afe6356cf5e3f916b58ad8
Parents: 2e15fc3 d4a914d
Author: Jeff Jirsa 
Authored: Fri Oct 21 19:04:52 2016 -0700
Committer: Jeff Jirsa 
Committed: Fri Oct 21 19:05:25 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aedb2187/CHANGES.txt
--
diff --cc CHANGES.txt
index bd355ef,b965262..bb8949c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -148,7 -140,7 +148,8 @@@ Merged from 2.2
   * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
   * Fail repair on non-existing table (CASSANDRA-12279)
   * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
 + * Better handle invalid system roles table (CASSANDRA-12700)
+  * Split consistent range movement flag correction (CASSANDRA-12786)
  Merged from 2.1:
   * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
  



[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2016-10-21 Thread jjirsa
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 5883e43587a110fa21adc5e883aa62c5e3780924
Parents: 7976d65 2871377
Author: Jeff Jirsa 
Authored: Fri Oct 21 19:02:58 2016 -0700
Committer: Jeff Jirsa 
Committed: Fri Oct 21 19:03:44 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5883e435/CHANGES.txt
--
diff --cc CHANGES.txt
index f14eb22,8b61da4..46f27a6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -30,12 -5,10 +30,13 @@@ Merged from 2.2
   * Fix merkle tree depth calculation (CASSANDRA-12580)
   * Make Collections deserialization more robust (CASSANDRA-12618)
   * Better handle invalid system roles table (CASSANDRA-12700)
 + * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
 + * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
 + * Decrement pending range calculator jobs counter in finally block
 +  (CASSANDRA-12554)
+  * Split consistent range movement flag correction (CASSANDRA-12786)
  Merged from 2.1:
 -===
 -2.1.17
 + * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
   * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
  
  

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



[03/10] cassandra git commit: Split consistent range movement flag correction

2016-10-21 Thread jjirsa
Split consistent range movement flag correction

Patch by Sankalp Kohli; Reviewed by Jeff Jirsa for CASSANDRA-12786


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

Branch: refs/heads/cassandra-3.X
Commit: 28713778abe29c1d9120d2127354b7fd5ee8fff1
Parents: a370409
Author: Jeff Jirsa 
Authored: Fri Oct 21 19:01:27 2016 -0700
Committer: Jeff Jirsa 
Committed: Fri Oct 21 19:01:27 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/28713778/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index efd0f5c..8b61da4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
  * Fix merkle tree depth calculation (CASSANDRA-12580)
  * Make Collections deserialization more robust (CASSANDRA-12618)
  * Better handle invalid system roles table (CASSANDRA-12700)
+ * Split consistent range movement flag correction (CASSANDRA-12786)
 Merged from 2.1:
 ===
 2.1.17

http://git-wip-us.apache.org/repos/asf/cassandra/blob/28713778/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 db86294..58c2bac 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -798,7 +798,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 logger.debug("... got ring + schema info");
 
-if (useStrictConsistency &&
+if (useStrictConsistency && !allowSimultaneousMoves() &&
 (
 tokenMetadata.getBootstrapTokens().valueSet().size() > 
0 ||
 tokenMetadata.getLeavingEndpoints().size() > 0 ||



[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2016-10-21 Thread jjirsa
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 5883e43587a110fa21adc5e883aa62c5e3780924
Parents: 7976d65 2871377
Author: Jeff Jirsa 
Authored: Fri Oct 21 19:02:58 2016 -0700
Committer: Jeff Jirsa 
Committed: Fri Oct 21 19:03:44 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5883e435/CHANGES.txt
--
diff --cc CHANGES.txt
index f14eb22,8b61da4..46f27a6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -30,12 -5,10 +30,13 @@@ Merged from 2.2
   * Fix merkle tree depth calculation (CASSANDRA-12580)
   * Make Collections deserialization more robust (CASSANDRA-12618)
   * Better handle invalid system roles table (CASSANDRA-12700)
 + * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
 + * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
 + * Decrement pending range calculator jobs counter in finally block
 +  (CASSANDRA-12554)
+  * Split consistent range movement flag correction (CASSANDRA-12786)
  Merged from 2.1:
 -===
 -2.1.17
 + * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
   * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
  
  

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



[04/10] cassandra git commit: Split consistent range movement flag correction

2016-10-21 Thread jjirsa
Split consistent range movement flag correction

Patch by Sankalp Kohli; Reviewed by Jeff Jirsa for CASSANDRA-12786


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

Branch: refs/heads/trunk
Commit: 28713778abe29c1d9120d2127354b7fd5ee8fff1
Parents: a370409
Author: Jeff Jirsa 
Authored: Fri Oct 21 19:01:27 2016 -0700
Committer: Jeff Jirsa 
Committed: Fri Oct 21 19:01:27 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/28713778/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index efd0f5c..8b61da4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
  * Fix merkle tree depth calculation (CASSANDRA-12580)
  * Make Collections deserialization more robust (CASSANDRA-12618)
  * Better handle invalid system roles table (CASSANDRA-12700)
+ * Split consistent range movement flag correction (CASSANDRA-12786)
 Merged from 2.1:
 ===
 2.1.17

http://git-wip-us.apache.org/repos/asf/cassandra/blob/28713778/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 db86294..58c2bac 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -798,7 +798,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 logger.debug("... got ring + schema info");
 
-if (useStrictConsistency &&
+if (useStrictConsistency && !allowSimultaneousMoves() &&
 (
 tokenMetadata.getBootstrapTokens().valueSet().size() > 
0 ||
 tokenMetadata.getLeavingEndpoints().size() > 0 ||



[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2016-10-21 Thread jjirsa
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.X
Commit: 5883e43587a110fa21adc5e883aa62c5e3780924
Parents: 7976d65 2871377
Author: Jeff Jirsa 
Authored: Fri Oct 21 19:02:58 2016 -0700
Committer: Jeff Jirsa 
Committed: Fri Oct 21 19:03:44 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5883e435/CHANGES.txt
--
diff --cc CHANGES.txt
index f14eb22,8b61da4..46f27a6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -30,12 -5,10 +30,13 @@@ Merged from 2.2
   * Fix merkle tree depth calculation (CASSANDRA-12580)
   * Make Collections deserialization more robust (CASSANDRA-12618)
   * Better handle invalid system roles table (CASSANDRA-12700)
 + * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
 + * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
 + * Decrement pending range calculator jobs counter in finally block
 +  (CASSANDRA-12554)
+  * Split consistent range movement flag correction (CASSANDRA-12786)
  Merged from 2.1:
 -===
 -2.1.17
 + * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
   * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
  
  

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



[02/10] cassandra git commit: Split consistent range movement flag correction

2016-10-21 Thread jjirsa
Split consistent range movement flag correction

Patch by Sankalp Kohli; Reviewed by Jeff Jirsa for CASSANDRA-12786


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

Branch: refs/heads/cassandra-3.0
Commit: 28713778abe29c1d9120d2127354b7fd5ee8fff1
Parents: a370409
Author: Jeff Jirsa 
Authored: Fri Oct 21 19:01:27 2016 -0700
Committer: Jeff Jirsa 
Committed: Fri Oct 21 19:01:27 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/28713778/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index efd0f5c..8b61da4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
  * Fix merkle tree depth calculation (CASSANDRA-12580)
  * Make Collections deserialization more robust (CASSANDRA-12618)
  * Better handle invalid system roles table (CASSANDRA-12700)
+ * Split consistent range movement flag correction (CASSANDRA-12786)
 Merged from 2.1:
 ===
 2.1.17

http://git-wip-us.apache.org/repos/asf/cassandra/blob/28713778/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 db86294..58c2bac 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -798,7 +798,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 logger.debug("... got ring + schema info");
 
-if (useStrictConsistency &&
+if (useStrictConsistency && !allowSimultaneousMoves() &&
 (
 tokenMetadata.getBootstrapTokens().valueSet().size() > 
0 ||
 tokenMetadata.getLeavingEndpoints().size() > 0 ||



[jira] [Updated] (CASSANDRA-12816) Rebuild failing while adding new datacenter

2016-10-21 Thread Jai Bheemsen Rao Dhanwada (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12816?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jai Bheemsen Rao Dhanwada updated CASSANDRA-12816:
--
Priority: Critical  (was: Major)

> Rebuild failing while adding new datacenter
> ---
>
> Key: CASSANDRA-12816
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12816
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Jai Bheemsen Rao Dhanwada
>Priority: Critical
>
> Hello All,
> I have single datacenter with 3 C* nodes and we are trying to expand the 
> cluster to another region/DC. I am seeing the below error while doing a 
> "nodetool rebuild -- name_of_existing_data_center" .  
> {code:java}
> [user@machine ~]$ nodetool rebuild DC1
> nodetool: Unable to find sufficient sources for streaming range 
> (-402178150752044282,-396707578307430827] in keyspace system_distributed
> See 'nodetool help' or 'nodetool help '.
> [user@machine ~]$
> {code}
> {code:java}
> user@cqlsh> SELECT * from system_schema.keyspaces where 
> keyspace_name='system_distributed';
>  keyspace_name | durable_writes | replication
> ---++-
>  system_distributed |   True | {'class': 
> 'org.apache.cassandra.locator.SimpleStrategy', 'replication_factor': '3'}
> (1 rows)
> {code}
> To overcome this I have updated system_distributed keyspace to DC1:3 and 
> DC2:3 with NetworkTopologyStrategy
> C* Version - 3.0.8
> Is this a bug that is introduced in 3.0.8 version of cassandra? as I haven't 
> seen this issue with the older versions?



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (CASSANDRA-12829) DELETE query with an empty IN clause can delete more than expected

2016-10-21 Thread Jason T. Bradshaw (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12829?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15596448#comment-15596448
 ] 

Jason T. Bradshaw commented on CASSANDRA-12829:
---

Additionally, this will still happen even when the second *where* clause uses 
*=* instead of *in*:

{code}
cqlsh> delete from test where a = 'a' and b = 'c' and id in ();
cqlsh> select * from test;

 a | b | id
---+---+--
 b | c | ----
 a | b | ----

(2 rows)
{code}

> DELETE query with an empty IN clause can delete more than expected
> --
>
> Key: CASSANDRA-12829
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12829
> Project: Cassandra
>  Issue Type: Bug
>  Components: CQL
> Environment: Arch Linux x64, kernel 4.7.6, Cassandra 3.9 downloaded 
> from the website
>Reporter: Jason T. Bradshaw
>
> When deleting from a table with a certain structure and using an *in* clause 
> with an empty list, the *in* clause with an empty list can be ignored, 
> resulting in deleting more than is expected.
> *Setup:*
> {code}
> cqlsh> create table test (a text, b text, id uuid, primary key ((a, b), id));
> cqlsh> insert into test (a, b, id) values ('a', 'b', 
> ----);
> cqlsh> insert into test (a, b, id) values ('b', 'c', 
> ----);
> cqlsh> insert into test (a, b, id) values ('a', 'c', 
> ----);
> cqlsh> select * from test;
>  a | b | id
> ---+---+--
>  a | c | ----
>  b | c | ----
>  a | b | ----
> (3 rows)
> {code}
> *Expected:*
> {code}
> cqlsh> delete from test where a = 'a' and b in ('a', 'b', 'c') and id in ();
> cqlsh> select * from test;
>  a | b | id
> ---+---+--
>  a | c | ----
>  b | c | ----
>  a | b | ----
> (3 rows)
> {code}
> *Actual:*
> {code}
> cqlsh> delete from test where a = 'a' and b in ('a', 'b', 'c') and id in ();
> cqlsh> select * from test;
>  a | b | id
> ---+---+--
>  b | c | ----
> (1 rows)
> {code}
> Instead of deleting nothing, as the final empty *in* clause would imply, it 
> instead deletes everything that matches the first two clauses, acting as if 
> the following query had been issued instead:
> {code}
> cqlsh> delete from test where a = 'a' and b in ('a', 'b', 'c');
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (CASSANDRA-12786) Fix a bug in CASSANDRA-11005(Split consisten range movement flag)

2016-10-21 Thread sankalp kohli (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12786?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15596455#comment-15596455
 ] 

sankalp kohli commented on CASSANDRA-12786:
---

Yes..please commit it. 

> Fix a bug in CASSANDRA-11005(Split consisten range movement flag)
> -
>
> Key: CASSANDRA-12786
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12786
> Project: Cassandra
>  Issue Type: Bug
>Reporter: sankalp kohli
>Assignee: sankalp kohli
>Priority: Minor
> Attachments: CASSANDRA-12786.txt
>
>
> I missed a place in the code where we need to split this flag for bootstrap



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Updated] (CASSANDRA-12829) DELETE query with an empty IN clause can delete more than expected

2016-10-21 Thread Jason T. Bradshaw (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12829?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jason T. Bradshaw updated CASSANDRA-12829:
--
Description: 
When deleting from a table with a certain structure and using an *in* clause 
with an empty list, the *in* clause with an empty list can be ignored, 
resulting in deleting more than is expected.

*Setup:*
{code}
cqlsh> create table test (a text, b text, id uuid, primary key ((a, b), id));
cqlsh> insert into test (a, b, id) values ('a', 'b', 
----);
cqlsh> insert into test (a, b, id) values ('b', 'c', 
----);
cqlsh> insert into test (a, b, id) values ('a', 'c', 
----);
cqlsh> select * from test;

 a | b | id
---+---+--
 a | c | ----
 b | c | ----
 a | b | ----

(3 rows)
{code}

*Expected:*
{code}
cqlsh> delete from test where a = 'a' and b in ('a', 'b', 'c') and id in ();
cqlsh> select * from test;

 a | b | id
---+---+--
 a | c | ----
 b | c | ----
 a | b | ----

(3 rows)
{code}

*Actual:*
{code}
cqlsh> delete from test where a = 'a' and b in ('a', 'b', 'c') and id in ();
cqlsh> select * from test;

 a | b | id
---+---+--
 b | c | ----

(1 rows)
{code}

Instead of deleting nothing, as the final empty *in* clause would imply, it 
instead deletes everything that matches the first two clauses, acting as if the 
following query had been issued instead:

{code}
cqlsh> delete from test where a = 'a' and b in ('a', 'b', 'c');
{code}

This seems to be related to the presence of a tuple clustering key, as I could 
not reproduce it without one.

  was:
When deleting from a table with a certain structure and using an *in* clause 
with an empty list, the *in* clause with an empty list can be ignored, 
resulting in deleting more than is expected.

*Setup:*
{code}
cqlsh> create table test (a text, b text, id uuid, primary key ((a, b), id));
cqlsh> insert into test (a, b, id) values ('a', 'b', 
----);
cqlsh> insert into test (a, b, id) values ('b', 'c', 
----);
cqlsh> insert into test (a, b, id) values ('a', 'c', 
----);
cqlsh> select * from test;

 a | b | id
---+---+--
 a | c | ----
 b | c | ----
 a | b | ----

(3 rows)
{code}

*Expected:*
{code}
cqlsh> delete from test where a = 'a' and b in ('a', 'b', 'c') and id in ();
cqlsh> select * from test;

 a | b | id
---+---+--
 a | c | ----
 b | c | ----
 a | b | ----

(3 rows)
{code}

*Actual:*
{code}
cqlsh> delete from test where a = 'a' and b in ('a', 'b', 'c') and id in ();
cqlsh> select * from test;

 a | b | id
---+---+--
 b | c | ----

(1 rows)
{code}

Instead of deleting nothing, as the final empty *in* clause would imply, it 
instead deletes everything that matches the first two clauses, acting as if the 
following query had been issued instead:

{code}
cqlsh> delete from test where a = 'a' and b in ('a', 'b', 'c');
{code}


> DELETE query with an empty IN clause can delete more than expected
> --
>
> Key: CASSANDRA-12829
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12829
> Project: Cassandra
>  Issue Type: Bug
>  Components: CQL
> Environment: Arch Linux x64, kernel 4.7.6, Cassandra 3.9 downloaded 
> from the website
>Reporter: Jason T. Bradshaw
>
> When deleting from a table with a certain structure and using an *in* clause 
> with an empty list, the *in* clause with an empty list can be ignored, 
> resulting in deleting more than is expected.
> *Setup:*
> {code}
> cqlsh> create table test (a text, b text, id uuid, primary key ((a, b), id));
> cqlsh> insert into test (a, b, id) values ('a', 'b', 
> ----);
> cqlsh> insert into test (a, b, id) values ('b', 'c', 
> ----);
> cqlsh> insert into test (a, b, id) values ('a', 'c', 
> ----);
> cqlsh> select * from test;
>  a | b | id
> ---+---+--
>  a | c | ----
>  b | c | ----
>  a | b | 

[jira] [Comment Edited] (CASSANDRA-12829) DELETE query with an empty IN clause can delete more than expected

2016-10-21 Thread Jason T. Bradshaw (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12829?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15596448#comment-15596448
 ] 

Jason T. Bradshaw edited comment on CASSANDRA-12829 at 10/21/16 9:37 PM:
-

Additionally, this will still happen even when the second part of the *where* 
clause uses *=* instead of *in*:

{code}
cqlsh> delete from test where a = 'a' and b = 'c' and id in ();
cqlsh> select * from test;

 a | b | id
---+---+--
 b | c | ----
 a | b | ----

(2 rows)
{code}


was (Author: jasontbradshaw):
Additionally, this will still happen even when the second *where* clause uses 
*=* instead of *in*:

{code}
cqlsh> delete from test where a = 'a' and b = 'c' and id in ();
cqlsh> select * from test;

 a | b | id
---+---+--
 b | c | ----
 a | b | ----

(2 rows)
{code}

> DELETE query with an empty IN clause can delete more than expected
> --
>
> Key: CASSANDRA-12829
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12829
> Project: Cassandra
>  Issue Type: Bug
>  Components: CQL
> Environment: Arch Linux x64, kernel 4.7.6, Cassandra 3.9 downloaded 
> from the website
>Reporter: Jason T. Bradshaw
>
> When deleting from a table with a certain structure and using an *in* clause 
> with an empty list, the *in* clause with an empty list can be ignored, 
> resulting in deleting more than is expected.
> *Setup:*
> {code}
> cqlsh> create table test (a text, b text, id uuid, primary key ((a, b), id));
> cqlsh> insert into test (a, b, id) values ('a', 'b', 
> ----);
> cqlsh> insert into test (a, b, id) values ('b', 'c', 
> ----);
> cqlsh> insert into test (a, b, id) values ('a', 'c', 
> ----);
> cqlsh> select * from test;
>  a | b | id
> ---+---+--
>  a | c | ----
>  b | c | ----
>  a | b | ----
> (3 rows)
> {code}
> *Expected:*
> {code}
> cqlsh> delete from test where a = 'a' and b in ('a', 'b', 'c') and id in ();
> cqlsh> select * from test;
>  a | b | id
> ---+---+--
>  a | c | ----
>  b | c | ----
>  a | b | ----
> (3 rows)
> {code}
> *Actual:*
> {code}
> cqlsh> delete from test where a = 'a' and b in ('a', 'b', 'c') and id in ();
> cqlsh> select * from test;
>  a | b | id
> ---+---+--
>  b | c | ----
> (1 rows)
> {code}
> Instead of deleting nothing, as the final empty *in* clause would imply, it 
> instead deletes everything that matches the first two clauses, acting as if 
> the following query had been issued instead:
> {code}
> cqlsh> delete from test where a = 'a' and b in ('a', 'b', 'c');
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Created] (CASSANDRA-12829) DELETE query with an empty IN clause can delete more than expected

2016-10-21 Thread Jason T. Bradshaw (JIRA)
Jason T. Bradshaw created CASSANDRA-12829:
-

 Summary: DELETE query with an empty IN clause can delete more than 
expected
 Key: CASSANDRA-12829
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12829
 Project: Cassandra
  Issue Type: Bug
  Components: CQL
 Environment: Arch Linux x64, kernel 4.7.6, Cassandra 3.9 downloaded 
from the website
Reporter: Jason T. Bradshaw


When deleting from a table with a certain structure and using an *in* clause 
with an empty list, the *in* clause with an empty list can be ignored, 
resulting in deleting more than is expected.

*Setup:*
{code}
cqlsh> create table test (a text, b text, id uuid, primary key ((a, b), id));
cqlsh> insert into test (a, b, id) values ('a', 'b', 
----);
cqlsh> insert into test (a, b, id) values ('b', 'c', 
----);
cqlsh> insert into test (a, b, id) values ('a', 'c', 
----);
cqlsh> select * from test;

 a | b | id
---+---+--
 a | c | ----
 b | c | ----
 a | b | ----

(3 rows)
{code}

*Expected:*
{code}
cqlsh> delete from test where a = 'a' and b in ('a', 'b', 'c') and id in ();
cqlsh> select * from test;

 a | b | id
---+---+--
 a | c | ----
 b | c | ----
 a | b | ----

(3 rows)
{code}

*Actual:*
{code}
cqlsh> delete from test where a = 'a' and b in ('a', 'b', 'c') and id in ();
cqlsh> select * from test;

 a | b | id
---+---+--
 b | c | ----

(1 rows)
{code}

Instead of deleting nothing, as the final empty *in* clause would imply, it 
instead deletes everything that matches the first two clauses, acting as if the 
following query had been issued instead:

{code}
cqlsh> delete from test where a = 'a' and b in ('a', 'b', 'c');
{code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Updated] (CASSANDRA-12822) dtest failure in compaction_test.TestCompaction_with_SizeTieredCompactionStrategy.fanout_size_test

2016-10-21 Thread Philip Thompson (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12822?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Philip Thompson updated CASSANDRA-12822:

Reviewer: Philip Thompson
  Status: Patch Available  (was: Open)

I'll review on Monday. Thanks!

> dtest failure in 
> compaction_test.TestCompaction_with_SizeTieredCompactionStrategy.fanout_size_test
> --
>
> Key: CASSANDRA-12822
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12822
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: Dikang Gu
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_dtest/1403/testReport/compaction_test/TestCompaction_with_SizeTieredCompactionStrategy/fanout_size_test
> {code}
> Error Message
> 75 != 74
> {code}{code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/tools/decorators.py", line 46, in 
> wrapped
> f(obj)
>   File "/home/automaton/cassandra-dtest/compaction_test.py", line 553, in 
> fanout_size_test
> self.assertEqual(25 * len(node1.data_directories()), int(m.group(2)))
>   File "/usr/lib/python2.7/unittest/case.py", line 513, in assertEqual
> assertion_func(first, second, msg=msg)
>   File "/usr/lib/python2.7/unittest/case.py", line 506, in _baseAssertEqual
> raise self.failureException(msg)
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (CASSANDRA-12822) dtest failure in compaction_test.TestCompaction_with_SizeTieredCompactionStrategy.fanout_size_test

2016-10-21 Thread Dikang Gu (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12822?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15595860#comment-15595860
 ] 

Dikang Gu commented on CASSANDRA-12822:
---

PR: https://github.com/riptano/cassandra-dtest/pull/1367

> dtest failure in 
> compaction_test.TestCompaction_with_SizeTieredCompactionStrategy.fanout_size_test
> --
>
> Key: CASSANDRA-12822
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12822
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: Dikang Gu
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_dtest/1403/testReport/compaction_test/TestCompaction_with_SizeTieredCompactionStrategy/fanout_size_test
> {code}
> Error Message
> 75 != 74
> {code}{code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/tools/decorators.py", line 46, in 
> wrapped
> f(obj)
>   File "/home/automaton/cassandra-dtest/compaction_test.py", line 553, in 
> fanout_size_test
> self.assertEqual(25 * len(node1.data_directories()), int(m.group(2)))
>   File "/usr/lib/python2.7/unittest/case.py", line 513, in assertEqual
> assertion_func(first, second, msg=msg)
>   File "/usr/lib/python2.7/unittest/case.py", line 506, in _baseAssertEqual
> raise self.failureException(msg)
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Resolved] (CASSANDRA-12559) dtest failure in cqlsh_tests.cqlsh_copy_tests.CqlshCopyTest.test_bulk_round_trip_with_backoff

2016-10-21 Thread Philip Thompson (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12559?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Philip Thompson resolved CASSANDRA-12559.
-
Resolution: Cannot Reproduce

This has been passing for months. Closing.

> dtest failure in 
> cqlsh_tests.cqlsh_copy_tests.CqlshCopyTest.test_bulk_round_trip_with_backoff
> -
>
> Key: CASSANDRA-12559
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12559
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_offheap_dtest/385/testReport/cqlsh_tests.cqlsh_copy_tests/CqlshCopyTest/test_bulk_round_trip_with_backoff
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/dtest.py", line 1123, in wrapped
> f(obj)
>   File "/home/automaton/cassandra-dtest/tools/decorators.py", line 48, in 
> wrapped
> f(obj)
>   File "/home/automaton/cassandra-dtest/cqlsh_tests/cqlsh_copy_tests.py", 
> line 2565, in test_bulk_round_trip_with_backoff
> copy_from_options={'MAXINFLIGHTMESSAGES': 64, 'MAXPENDINGCHUNKS': 1})
>   File "/home/automaton/cassandra-dtest/cqlsh_tests/cqlsh_copy_tests.py", 
> line 2454, in _test_bulk_round_trip
> sum(1 for _ in open(tempfile2.name)))
>   File "/usr/lib/python2.7/unittest/case.py", line 513, in assertEqual
> assertion_func(first, second, msg=msg)
>   File "/usr/lib/python2.7/unittest/case.py", line 506, in _baseAssertEqual
> raise self.failureException(msg)
> "25 != 249714
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (CASSANDRA-12725) dtest failure in repair_tests.incremental_repair_test.TestIncRepair.sstable_marking_test_not_intersecting_all_ranges

2016-10-21 Thread Philip Thompson (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12725?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15595759#comment-15595759
 ] 

Philip Thompson commented on CASSANDRA-12725:
-

I have a patch for this ready, but github is down.

> dtest failure in 
> repair_tests.incremental_repair_test.TestIncRepair.sstable_marking_test_not_intersecting_all_ranges
> 
>
> Key: CASSANDRA-12725
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12725
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: Philip Thompson
>  Labels: dtest
>
> example failure:
> http://cassci.datastax.com/job/trunk_offheap_dtest/406/testReport/repair_tests.incremental_repair_test/TestIncRepair/sstable_marking_test_not_intersecting_all_ranges
> {code}
> Error Message
> Subprocess sstablemetadata on keyspace: keyspace1, column_family: None exited 
> with non-zero status; exit status: 1; 
> stdout: 
> usage: Usage: sstablemetadata [--gc_grace_seconds n] 
> Dump contents of given SSTable to standard output in JSON format.
> --gc_grace_secondsThe gc_grace_seconds to use when
>calculating droppable tombstones
> {code}
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File 
> "/home/automaton/cassandra-dtest/repair_tests/incremental_repair_test.py", 
> line 366, in sstable_marking_test_not_intersecting_all_ranges
> for out in (node.run_sstablemetadata(keyspace='keyspace1').stdout for 
> node in cluster.nodelist()):
>   File 
> "/home/automaton/cassandra-dtest/repair_tests/incremental_repair_test.py", 
> line 366, in 
> for out in (node.run_sstablemetadata(keyspace='keyspace1').stdout for 
> node in cluster.nodelist()):
>   File "/usr/local/lib/python2.7/dist-packages/ccmlib/node.py", line 1021, in 
> run_sstablemetadata
> return handle_external_tool_process(p, "sstablemetadata on keyspace: {}, 
> column_family: {}".format(keyspace, column_families))
>   File "/usr/local/lib/python2.7/dist-packages/ccmlib/node.py", line 1983, in 
> handle_external_tool_process
> raise ToolError(cmd_args, rc, out, err)
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Assigned] (CASSANDRA-12725) dtest failure in repair_tests.incremental_repair_test.TestIncRepair.sstable_marking_test_not_intersecting_all_ranges

2016-10-21 Thread Philip Thompson (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12725?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Philip Thompson reassigned CASSANDRA-12725:
---

Assignee: Philip Thompson  (was: DS Test Eng)

> dtest failure in 
> repair_tests.incremental_repair_test.TestIncRepair.sstable_marking_test_not_intersecting_all_ranges
> 
>
> Key: CASSANDRA-12725
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12725
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: Philip Thompson
>  Labels: dtest
>
> example failure:
> http://cassci.datastax.com/job/trunk_offheap_dtest/406/testReport/repair_tests.incremental_repair_test/TestIncRepair/sstable_marking_test_not_intersecting_all_ranges
> {code}
> Error Message
> Subprocess sstablemetadata on keyspace: keyspace1, column_family: None exited 
> with non-zero status; exit status: 1; 
> stdout: 
> usage: Usage: sstablemetadata [--gc_grace_seconds n] 
> Dump contents of given SSTable to standard output in JSON format.
> --gc_grace_secondsThe gc_grace_seconds to use when
>calculating droppable tombstones
> {code}
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File 
> "/home/automaton/cassandra-dtest/repair_tests/incremental_repair_test.py", 
> line 366, in sstable_marking_test_not_intersecting_all_ranges
> for out in (node.run_sstablemetadata(keyspace='keyspace1').stdout for 
> node in cluster.nodelist()):
>   File 
> "/home/automaton/cassandra-dtest/repair_tests/incremental_repair_test.py", 
> line 366, in 
> for out in (node.run_sstablemetadata(keyspace='keyspace1').stdout for 
> node in cluster.nodelist()):
>   File "/usr/local/lib/python2.7/dist-packages/ccmlib/node.py", line 1021, in 
> run_sstablemetadata
> return handle_external_tool_process(p, "sstablemetadata on keyspace: {}, 
> column_family: {}".format(keyspace, column_families))
>   File "/usr/local/lib/python2.7/dist-packages/ccmlib/node.py", line 1983, in 
> handle_external_tool_process
> raise ToolError(cmd_args, rc, out, err)
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (CASSANDRA-12822) dtest failure in compaction_test.TestCompaction_with_SizeTieredCompactionStrategy.fanout_size_test

2016-10-21 Thread Dikang Gu (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12822?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15595713#comment-15595713
 ] 

Dikang Gu commented on CASSANDRA-12822:
---

Hmm, sure, I will take a look today.

> dtest failure in 
> compaction_test.TestCompaction_with_SizeTieredCompactionStrategy.fanout_size_test
> --
>
> Key: CASSANDRA-12822
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12822
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: Dikang Gu
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_dtest/1403/testReport/compaction_test/TestCompaction_with_SizeTieredCompactionStrategy/fanout_size_test
> {code}
> Error Message
> 75 != 74
> {code}{code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/tools/decorators.py", line 46, in 
> wrapped
> f(obj)
>   File "/home/automaton/cassandra-dtest/compaction_test.py", line 553, in 
> fanout_size_test
> self.assertEqual(25 * len(node1.data_directories()), int(m.group(2)))
>   File "/usr/lib/python2.7/unittest/case.py", line 513, in assertEqual
> assertion_func(first, second, msg=msg)
>   File "/usr/lib/python2.7/unittest/case.py", line 506, in _baseAssertEqual
> raise self.failureException(msg)
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Assigned] (CASSANDRA-12822) dtest failure in compaction_test.TestCompaction_with_SizeTieredCompactionStrategy.fanout_size_test

2016-10-21 Thread Dikang Gu (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12822?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Dikang Gu reassigned CASSANDRA-12822:
-

Assignee: Dikang Gu  (was: DS Test Eng)

> dtest failure in 
> compaction_test.TestCompaction_with_SizeTieredCompactionStrategy.fanout_size_test
> --
>
> Key: CASSANDRA-12822
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12822
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: Dikang Gu
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_dtest/1403/testReport/compaction_test/TestCompaction_with_SizeTieredCompactionStrategy/fanout_size_test
> {code}
> Error Message
> 75 != 74
> {code}{code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/tools/decorators.py", line 46, in 
> wrapped
> f(obj)
>   File "/home/automaton/cassandra-dtest/compaction_test.py", line 553, in 
> fanout_size_test
> self.assertEqual(25 * len(node1.data_directories()), int(m.group(2)))
>   File "/usr/lib/python2.7/unittest/case.py", line 513, in assertEqual
> assertion_func(first, second, msg=msg)
>   File "/usr/lib/python2.7/unittest/case.py", line 506, in _baseAssertEqual
> raise self.failureException(msg)
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (CASSANDRA-12822) dtest failure in compaction_test.TestCompaction_with_SizeTieredCompactionStrategy.fanout_size_test

2016-10-21 Thread Marcus Eriksson (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12822?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15595696#comment-15595696
 ] 

Marcus Eriksson commented on CASSANDRA-12822:
-

actually [~dikanggu] wrote the test, do you have time to look?

> dtest failure in 
> compaction_test.TestCompaction_with_SizeTieredCompactionStrategy.fanout_size_test
> --
>
> Key: CASSANDRA-12822
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12822
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_dtest/1403/testReport/compaction_test/TestCompaction_with_SizeTieredCompactionStrategy/fanout_size_test
> {code}
> Error Message
> 75 != 74
> {code}{code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/tools/decorators.py", line 46, in 
> wrapped
> f(obj)
>   File "/home/automaton/cassandra-dtest/compaction_test.py", line 553, in 
> fanout_size_test
> self.assertEqual(25 * len(node1.data_directories()), int(m.group(2)))
>   File "/usr/lib/python2.7/unittest/case.py", line 513, in assertEqual
> assertion_func(first, second, msg=msg)
>   File "/usr/lib/python2.7/unittest/case.py", line 506, in _baseAssertEqual
> raise self.failureException(msg)
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Comment Edited] (CASSANDRA-12485) Always require replace_address to replace existing token

2016-10-21 Thread Christopher Licata (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12485?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15580851#comment-15580851
 ] 

Christopher Licata  edited comment on CASSANDRA-12485 at 10/21/16 4:40 PM:
---

The following patch for the trunk will, I believe, meet the requirements for 
this issue.  [~pauloricardomg], let me know what your thoughts are.  
| *patch* | *dtest* |
| [12485-trunk | https://github.com/cmlicata/cassandra/commits/12485-trunk ]| 
Coming Soon |

Additionally, could give me some tips on how write the dtests for this as well 
as how to execute them successfully?

Currently, when trying to run the replace_address_test.py dtests I am getting 
the following error:
{noformat}
Inserting 1k entries with rf=3 with stress...
ERROR
removing ccm cluster test at: 
/var/folders/qv/49qsd41n44q92frdc0sc95j0zcj6z5/T/dtest-d4G7dI
clearing ssl stores from 
[/var/folders/qv/49qsd41n44q92frdc0sc95j0zcj6z5/T/dtest-d4G7dI] directory

==
ERROR: fail_without_replace_test (replace_address_test.TestReplaceAddress)
--
Traceback (most recent call last):
  File "/Users/xle012/cstar/cassandra-dtest/tools/decorators.py", line 46, in 
wrapped
f(obj)
  File "/Users/xle012/cstar/cassandra-dtest/replace_address_test.py", line 338, 
in fail_without_replace_test
self._insert_data()
  File "/Users/xle012/cstar/cassandra-dtest/replace_address_test.py", line 127, 
in _insert_data
whitelist=whitelist)
  File "/Users/xle012/cstar/ccm/ccmlib/node.py", line 1256, in stress
return handle_external_tool_process(p, ['stress'] + stress_options)
  File "/Users/xle012/cstar/ccm/ccmlib/node.py", line 1982, in 
handle_external_tool_process
raise ToolError(cmd_args, rc, out, err)
ToolError: Subprocess ['stress', 'write', 'n=1k', 'no-warmup', '-schema', 
'replication(factor=3)'] exited with non-zero status; exit status: 1; 
stderr: Error: Could not find or load main class 
org.apache.cassandra.stress.Stress}}
{noformat}

Not sure why the test cannot see that class -- I followed the installation and 
build instructions by [~jkni] [here | 
https://github.com/riptano/cassandra-dtest/blob/master/INSTALL.md].  



was (Author: cmlicata):
The following patch for the trunk will, I believe, meet the requirements for 
this issue.  Let me know what your thoughts are.  
| *patch* | *dtest* |
| [12485-trunk | https://github.com/cmlicata/cassandra/commits/12485-trunk ]| 
Coming Soon |

Additionally, could give me some tips on how write the dtests for this as well 
as how to execute them successfully?

Currently, when trying to run the replace_address_test.py dtests I am getting 
the following error:
{noformat}
Inserting 1k entries with rf=3 with stress...
ERROR
removing ccm cluster test at: 
/var/folders/qv/49qsd41n44q92frdc0sc95j0zcj6z5/T/dtest-d4G7dI
clearing ssl stores from 
[/var/folders/qv/49qsd41n44q92frdc0sc95j0zcj6z5/T/dtest-d4G7dI] directory

==
ERROR: fail_without_replace_test (replace_address_test.TestReplaceAddress)
--
Traceback (most recent call last):
  File "/Users/xle012/cstar/cassandra-dtest/tools/decorators.py", line 46, in 
wrapped
f(obj)
  File "/Users/xle012/cstar/cassandra-dtest/replace_address_test.py", line 338, 
in fail_without_replace_test
self._insert_data()
  File "/Users/xle012/cstar/cassandra-dtest/replace_address_test.py", line 127, 
in _insert_data
whitelist=whitelist)
  File "/Users/xle012/cstar/ccm/ccmlib/node.py", line 1256, in stress
return handle_external_tool_process(p, ['stress'] + stress_options)
  File "/Users/xle012/cstar/ccm/ccmlib/node.py", line 1982, in 
handle_external_tool_process
raise ToolError(cmd_args, rc, out, err)
ToolError: Subprocess ['stress', 'write', 'n=1k', 'no-warmup', '-schema', 
'replication(factor=3)'] exited with non-zero status; exit status: 1; 
stderr: Error: Could not find or load main class 
org.apache.cassandra.stress.Stress}}
{noformat}

Not sure why the test cannot see that class -- I followed the installation and 
build instructions by [~jkni] [here | 
https://github.com/riptano/cassandra-dtest/blob/master/INSTALL.md].  


> Always require replace_address to replace existing token
> 
>
> Key: CASSANDRA-12485
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12485
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Distributed Metadata
>Reporter: Paulo Motta
>Priority: Minor
>  Labels: lhf
>
> CASSANDRA-10134 prevented replace an existing node unless 
> {{\-Dcassandra.replace_address}} or 
> 

[jira] [Commented] (CASSANDRA-12149) NullPointerException on SELECT using index with token restrictions fully overriden by other PK restrictions

2016-10-21 Thread Alex Petrov (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12149?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15595502#comment-15595502
 ] 

Alex Petrov commented on CASSANDRA-12149:
-

Thanks for the review. 

Sure, I can't see how adding this check may hurt. I've also updated comment on 
the class to make it clearer that we "fall back" to non-token restrictions when 
possible and re-triggered CI.

> NullPointerException on SELECT using index with token restrictions fully 
> overriden by other PK restrictions 
> 
>
> Key: CASSANDRA-12149
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12149
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Andrey Konstantinov
>Assignee: Alex Petrov
> Attachments: CASSANDRA-12149.txt
>
>
> If I execute the sequence of queries (see the attached file), Cassandra 
> aborts a connection reporting NPE on server side. SELECT query without token 
> range filter works, but does not work when token range filter is specified. 
> My intent was to issue multiple SELECT queries targeting the same single 
> partition, filtered by a column indexed by SASI, partitioning results by 
> different token ranges.
> Output from cqlsh on SELECT is the following:
> {code}
> cqlsh> SELECT namespace, entity, timestamp, feature1, feature2 FROM 
> mykeyspace.myrecordtable WHERE namespace = 'ns2' AND entity = 'entity2' AND 
> feature1 > 11 AND feature1 < 31  AND token(namespace, entity) <= 
> 9223372036854775807;
> ServerError:  message="java.lang.NullPointerException">
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (CASSANDRA-12813) NPE in auth for bootstrapping node

2016-10-21 Thread Alex Petrov (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12813?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15595442#comment-15595442
 ] 

Alex Petrov commented on CASSANDRA-12813:
-

You're right, this started in {{2.2}}. I've verified that same fix works 
starting from {{2.2}} and updated patches / {{CHANGES.txt}}

> NPE in auth for bootstrapping node
> --
>
> Key: CASSANDRA-12813
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12813
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Charles Mims
>Assignee: Alex Petrov
> Fix For: 4.0, 3.0.x, 3.x
>
>
> {code}
> ERROR [SharedPool-Worker-1] 2016-10-19 21:40:25,991 Message.java:617 - 
> Unexpected exception during request; channel = [id: 0x15eb017f, / omitted>:40869 => /10.0.0.254:9042]
> java.lang.NullPointerException: null
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator.doAuthenticate(PasswordAuthenticator.java:144)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator.authenticate(PasswordAuthenticator.java:86)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator.access$100(PasswordAuthenticator.java:54)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator$PlainTextSaslAuthenticator.getAuthenticatedUser(PasswordAuthenticator.java:182)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.transport.messages.AuthResponse.execute(AuthResponse.java:78)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:513)
>  [apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:407)
>  [apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> io.netty.channel.SimpleChannelInboundHandler.channelRead(SimpleChannelInboundHandler.java:105)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:333)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext.access$700(AbstractChannelHandlerContext.java:32)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext$8.run(AbstractChannelHandlerContext.java:324)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) 
> [na:1.8.0_101]
>   at 
> org.apache.cassandra.concurrent.AbstractLocalAwareExecutorService$FutureTask.run(AbstractLocalAwareExecutorService.java:164)
>  [apache-cassandra-3.0.9.jar:3.0.9]
>   at org.apache.cassandra.concurrent.SEPWorker.run(SEPWorker.java:105) 
> [apache-cassandra-3.0.9.jar:3.0.9]
>   at java.lang.Thread.run(Thread.java:745) [na:1.8.0_101]
> {code}
> I have a node that has been joining for around 24 hours.  My application is 
> configured with the IP address of the joining node in the list of nodes to 
> connect to (ruby driver), and I have been getting around 200 events of this 
> NPE per hour.  I removed the IP of the joining node from the list of nodes 
> for my app to connect to and the errors stopped.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Comment Edited] (CASSANDRA-12813) NPE in auth for bootstrapping node

2016-10-21 Thread Alex Petrov (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12813?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15595241#comment-15595241
 ] 

Alex Petrov edited comment on CASSANDRA-12813 at 10/21/16 3:33 PM:
---

It was quite simple to reproduce the issue: start fresh node first, then start 
the node upgraded from 2.1 (with legacy credentials table), wait for tables to 
settle and try to authenticate. 

Since we can not know when exactly the credentials table can be initialised, we 
can simply add a check for if the select statement is still null and initialise 
it then.

|[2.2 |https://github.com/ifesdjeen/cassandra/tree/12813-2.2] 
|[utest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-2.2-testall/]
 
|[dtest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-2.2-dtest/]
 |
|[3.0 |https://github.com/ifesdjeen/cassandra/tree/12813-3.0] 
|[utest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-3.0-testall/]
 
|[dtest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-3.0-dtest/]
 |
|[3.X |https://github.com/ifesdjeen/cassandra/tree/12813-3.X] 
|[utest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-3.X-testall/]
 
|[dtest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-3.X-dtest/]
 |
|[trunk|https://github.com/ifesdjeen/cassandra/tree/12813-trunk] 
|[utest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-trunk-testall/]
 
|[dtest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-trunk-dtest/]
 |

Please note that 3.x/trunk patch is a slightly different (had to merge names 
and method positions).


was (Author: ifesdjeen):
It was quite simple to reproduce the issue: start fresh node first, then start 
the node upgraded from 2.1 (with legacy credentials table), wait for tables to 
settle and try to authenticate. 

Since we can not know when exactly the credentials table can be initialised, we 
can simply add a check for if the select statement is still null and initialise 
it then.

|[3.0 |https://github.com/ifesdjeen/cassandra/tree/12813-3.0] 
|[utest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-3.0-testall/]
 
|[dtest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-3.0-dtest/]
 |
|[3.X |https://github.com/ifesdjeen/cassandra/tree/12813-3.X] 
|[utest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-3.X-testall/]
 
|[dtest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-3.X-dtest/]
 |
|[trunk|https://github.com/ifesdjeen/cassandra/tree/12813-trunk] 
|[utest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-trunk-testall/]
 
|[dtest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-trunk-dtest/]
 |

Please note that 3.x/trunk patch is a slightly different (had to merge names 
and method positions).

> NPE in auth for bootstrapping node
> --
>
> Key: CASSANDRA-12813
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12813
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Charles Mims
>Assignee: Alex Petrov
> Fix For: 4.0, 3.0.x, 3.x
>
>
> {code}
> ERROR [SharedPool-Worker-1] 2016-10-19 21:40:25,991 Message.java:617 - 
> Unexpected exception during request; channel = [id: 0x15eb017f, / omitted>:40869 => /10.0.0.254:9042]
> java.lang.NullPointerException: null
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator.doAuthenticate(PasswordAuthenticator.java:144)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator.authenticate(PasswordAuthenticator.java:86)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator.access$100(PasswordAuthenticator.java:54)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator$PlainTextSaslAuthenticator.getAuthenticatedUser(PasswordAuthenticator.java:182)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.transport.messages.AuthResponse.execute(AuthResponse.java:78)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:513)
>  [apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:407)
>  [apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> io.netty.channel.SimpleChannelInboundHandler.channelRead(SimpleChannelInboundHandler.java:105)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:333)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> 

[jira] [Updated] (CASSANDRA-12813) NPE in auth for bootstrapping node

2016-10-21 Thread Alex Petrov (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12813?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Alex Petrov updated CASSANDRA-12813:

 Reviewer: Sam Tunnicliffe
Fix Version/s: 3.x
   3.0.x
   4.0
   Status: Patch Available  (was: Open)

It was quite simple to reproduce the issue: start fresh node first, then start 
the node upgraded from 2.1 (with legacy credentials table), wait for tables to 
settle and try to authenticate. 

Since we can not know when exactly the credentials table can be initialised, we 
can simply add a check for if the select statement is still null and initialise 
it then.

|[3.0 |https://github.com/ifesdjeen/cassandra/tree/12813-3.0] 
|[utest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-3.0-testall/]
 
|[dtest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-3.0-dtest/]
 |
|[3.X |https://github.com/ifesdjeen/cassandra/tree/12813-3.X] 
|[utest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-3.X-testall/]
 
|[dtest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-3.X-dtest/]
 |
|[trunk|https://github.com/ifesdjeen/cassandra/tree/12813-trunk] 
|[utest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-trunk-testall/]
 
|[dtest|https://cassci.datastax.com/view/Dev/view/ifesdjeen/job/ifesdjeen-12813-trunk-dtest/]
 |

Please note that 3.x/trunk patch is a slightly different (had to merge names 
and method positions).

> NPE in auth for bootstrapping node
> --
>
> Key: CASSANDRA-12813
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12813
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Charles Mims
>Assignee: Alex Petrov
> Fix For: 4.0, 3.0.x, 3.x
>
>
> {code}
> ERROR [SharedPool-Worker-1] 2016-10-19 21:40:25,991 Message.java:617 - 
> Unexpected exception during request; channel = [id: 0x15eb017f, / omitted>:40869 => /10.0.0.254:9042]
> java.lang.NullPointerException: null
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator.doAuthenticate(PasswordAuthenticator.java:144)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator.authenticate(PasswordAuthenticator.java:86)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator.access$100(PasswordAuthenticator.java:54)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator$PlainTextSaslAuthenticator.getAuthenticatedUser(PasswordAuthenticator.java:182)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.transport.messages.AuthResponse.execute(AuthResponse.java:78)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:513)
>  [apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:407)
>  [apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> io.netty.channel.SimpleChannelInboundHandler.channelRead(SimpleChannelInboundHandler.java:105)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:333)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext.access$700(AbstractChannelHandlerContext.java:32)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext$8.run(AbstractChannelHandlerContext.java:324)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) 
> [na:1.8.0_101]
>   at 
> org.apache.cassandra.concurrent.AbstractLocalAwareExecutorService$FutureTask.run(AbstractLocalAwareExecutorService.java:164)
>  [apache-cassandra-3.0.9.jar:3.0.9]
>   at org.apache.cassandra.concurrent.SEPWorker.run(SEPWorker.java:105) 
> [apache-cassandra-3.0.9.jar:3.0.9]
>   at java.lang.Thread.run(Thread.java:745) [na:1.8.0_101]
> {code}
> I have a node that has been joining for around 24 hours.  My application is 
> configured with the IP address of the joining node in the list of nodes to 
> connect to (ruby driver), and I have been getting around 200 events of this 
> NPE per hour.  I removed the IP of the joining node from the list of nodes 
> for my app to connect to and the errors stopped.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (CASSANDRA-12813) NPE in auth for bootstrapping node

2016-10-21 Thread Jeremiah Jordan (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12813?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15595254#comment-15595254
 ] 

Jeremiah Jordan commented on CASSANDRA-12813:
-

Doesn't this start in 2.2?

> NPE in auth for bootstrapping node
> --
>
> Key: CASSANDRA-12813
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12813
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Charles Mims
>Assignee: Alex Petrov
> Fix For: 4.0, 3.0.x, 3.x
>
>
> {code}
> ERROR [SharedPool-Worker-1] 2016-10-19 21:40:25,991 Message.java:617 - 
> Unexpected exception during request; channel = [id: 0x15eb017f, / omitted>:40869 => /10.0.0.254:9042]
> java.lang.NullPointerException: null
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator.doAuthenticate(PasswordAuthenticator.java:144)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator.authenticate(PasswordAuthenticator.java:86)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator.access$100(PasswordAuthenticator.java:54)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator$PlainTextSaslAuthenticator.getAuthenticatedUser(PasswordAuthenticator.java:182)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.transport.messages.AuthResponse.execute(AuthResponse.java:78)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:513)
>  [apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:407)
>  [apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> io.netty.channel.SimpleChannelInboundHandler.channelRead(SimpleChannelInboundHandler.java:105)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:333)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext.access$700(AbstractChannelHandlerContext.java:32)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext$8.run(AbstractChannelHandlerContext.java:324)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) 
> [na:1.8.0_101]
>   at 
> org.apache.cassandra.concurrent.AbstractLocalAwareExecutorService$FutureTask.run(AbstractLocalAwareExecutorService.java:164)
>  [apache-cassandra-3.0.9.jar:3.0.9]
>   at org.apache.cassandra.concurrent.SEPWorker.run(SEPWorker.java:105) 
> [apache-cassandra-3.0.9.jar:3.0.9]
>   at java.lang.Thread.run(Thread.java:745) [na:1.8.0_101]
> {code}
> I have a node that has been joining for around 24 hours.  My application is 
> configured with the IP address of the joining node in the list of nodes to 
> connect to (ruby driver), and I have been getting around 200 events of this 
> NPE per hour.  I removed the IP of the joining node from the list of nodes 
> for my app to connect to and the errors stopped.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Updated] (CASSANDRA-12559) dtest failure in cqlsh_tests.cqlsh_copy_tests.CqlshCopyTest.test_bulk_round_trip_with_backoff

2016-10-21 Thread Philip Thompson (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12559?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Philip Thompson updated CASSANDRA-12559:

Assignee: DS Test Eng  (was: Philip Thompson)

> dtest failure in 
> cqlsh_tests.cqlsh_copy_tests.CqlshCopyTest.test_bulk_round_trip_with_backoff
> -
>
> Key: CASSANDRA-12559
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12559
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_offheap_dtest/385/testReport/cqlsh_tests.cqlsh_copy_tests/CqlshCopyTest/test_bulk_round_trip_with_backoff
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/dtest.py", line 1123, in wrapped
> f(obj)
>   File "/home/automaton/cassandra-dtest/tools/decorators.py", line 48, in 
> wrapped
> f(obj)
>   File "/home/automaton/cassandra-dtest/cqlsh_tests/cqlsh_copy_tests.py", 
> line 2565, in test_bulk_round_trip_with_backoff
> copy_from_options={'MAXINFLIGHTMESSAGES': 64, 'MAXPENDINGCHUNKS': 1})
>   File "/home/automaton/cassandra-dtest/cqlsh_tests/cqlsh_copy_tests.py", 
> line 2454, in _test_bulk_round_trip
> sum(1 for _ in open(tempfile2.name)))
>   File "/usr/lib/python2.7/unittest/case.py", line 513, in assertEqual
> assertion_func(first, second, msg=msg)
>   File "/usr/lib/python2.7/unittest/case.py", line 506, in _baseAssertEqual
> raise self.failureException(msg)
> "25 != 249714
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (CASSANDRA-12822) dtest failure in compaction_test.TestCompaction_with_SizeTieredCompactionStrategy.fanout_size_test

2016-10-21 Thread Philip Thompson (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12822?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15595182#comment-15595182
 ] 

Philip Thompson commented on CASSANDRA-12822:
-

[~jjirsa], could you take a look?

> dtest failure in 
> compaction_test.TestCompaction_with_SizeTieredCompactionStrategy.fanout_size_test
> --
>
> Key: CASSANDRA-12822
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12822
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_dtest/1403/testReport/compaction_test/TestCompaction_with_SizeTieredCompactionStrategy/fanout_size_test
> {code}
> Error Message
> 75 != 74
> {code}{code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/tools/decorators.py", line 46, in 
> wrapped
> f(obj)
>   File "/home/automaton/cassandra-dtest/compaction_test.py", line 553, in 
> fanout_size_test
> self.assertEqual(25 * len(node1.data_directories()), int(m.group(2)))
>   File "/usr/lib/python2.7/unittest/case.py", line 513, in assertEqual
> assertion_func(first, second, msg=msg)
>   File "/usr/lib/python2.7/unittest/case.py", line 506, in _baseAssertEqual
> raise self.failureException(msg)
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Updated] (CASSANDRA-12823) dtest failure in topology_test.TestTopology.crash_during_decommission_test

2016-10-21 Thread Philip Thompson (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12823?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Philip Thompson updated CASSANDRA-12823:

Issue Type: Bug  (was: Test)

> dtest failure in topology_test.TestTopology.crash_during_decommission_test
> --
>
> Key: CASSANDRA-12823
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12823
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest, test-failure
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_novnode_dtest/489/testReport/topology_test/TestTopology/crash_during_decommission_test
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 358, in run
> self.tearDown()
>   File "/home/automaton/cassandra-dtest/dtest.py", line 581, in tearDown
> raise AssertionError('Unexpected error in log, see stdout')
> "Unexpected error in log, see stdout
> {code}{code}
> Standard Output
> Unexpected error in node2 log, error: 
> ERROR [GossipStage:1] 2016-10-19 15:44:14,820 CassandraDaemon.java:229 - 
> Exception in thread Thread[GossipStage:1,5,main]
> java.lang.NullPointerException: null
>   at 
> java.util.concurrent.ConcurrentHashMap.get(ConcurrentHashMap.java:936) 
> ~[na:1.8.0_45]
>   at org.apache.cassandra.hints.HintsCatalog.get(HintsCatalog.java:89) 
> ~[main/:na]
>   at 
> org.apache.cassandra.hints.HintsService.excise(HintsService.java:313) 
> ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageService.excise(StorageService.java:2458) 
> ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageService.excise(StorageService.java:2471) 
> ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageService.handleStateLeft(StorageService.java:2375)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageService.onChange(StorageService.java:1905)
>  ~[main/:na]
>   at 
> org.apache.cassandra.gms.Gossiper.doOnChangeNotifications(Gossiper.java:1222) 
> ~[main/:na]
>   at org.apache.cassandra.gms.Gossiper.applyNewStates(Gossiper.java:1205) 
> ~[main/:na]
>   at 
> org.apache.cassandra.gms.Gossiper.applyStateLocally(Gossiper.java:1168) 
> ~[main/:na]
>   at 
> org.apache.cassandra.gms.GossipDigestAckVerbHandler.doVerb(GossipDigestAckVerbHandler.java:58)
>  ~[main/:na]
>   at 
> org.apache.cassandra.net.MessageDeliveryTask.run(MessageDeliveryTask.java:66) 
> ~[main/:na]
>   at 
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) 
> ~[na:1.8.0_45]
>   at java.util.concurrent.FutureTask.run(FutureTask.java:266) 
> ~[na:1.8.0_45]
>   at 
> java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
>  ~[na:1.8.0_45]
>   at 
> java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
>  [na:1.8.0_45]
>   at java.lang.Thread.run(Thread.java:745) [na:1.8.0_45]
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Updated] (CASSANDRA-12823) dtest failure in topology_test.TestTopology.crash_during_decommission_test

2016-10-21 Thread Philip Thompson (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12823?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Philip Thompson updated CASSANDRA-12823:

Assignee: (was: DS Test Eng)

> dtest failure in topology_test.TestTopology.crash_during_decommission_test
> --
>
> Key: CASSANDRA-12823
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12823
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>  Labels: dtest, test-failure
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_novnode_dtest/489/testReport/topology_test/TestTopology/crash_during_decommission_test
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 358, in run
> self.tearDown()
>   File "/home/automaton/cassandra-dtest/dtest.py", line 581, in tearDown
> raise AssertionError('Unexpected error in log, see stdout')
> "Unexpected error in log, see stdout
> {code}{code}
> Standard Output
> Unexpected error in node2 log, error: 
> ERROR [GossipStage:1] 2016-10-19 15:44:14,820 CassandraDaemon.java:229 - 
> Exception in thread Thread[GossipStage:1,5,main]
> java.lang.NullPointerException: null
>   at 
> java.util.concurrent.ConcurrentHashMap.get(ConcurrentHashMap.java:936) 
> ~[na:1.8.0_45]
>   at org.apache.cassandra.hints.HintsCatalog.get(HintsCatalog.java:89) 
> ~[main/:na]
>   at 
> org.apache.cassandra.hints.HintsService.excise(HintsService.java:313) 
> ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageService.excise(StorageService.java:2458) 
> ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageService.excise(StorageService.java:2471) 
> ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageService.handleStateLeft(StorageService.java:2375)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageService.onChange(StorageService.java:1905)
>  ~[main/:na]
>   at 
> org.apache.cassandra.gms.Gossiper.doOnChangeNotifications(Gossiper.java:1222) 
> ~[main/:na]
>   at org.apache.cassandra.gms.Gossiper.applyNewStates(Gossiper.java:1205) 
> ~[main/:na]
>   at 
> org.apache.cassandra.gms.Gossiper.applyStateLocally(Gossiper.java:1168) 
> ~[main/:na]
>   at 
> org.apache.cassandra.gms.GossipDigestAckVerbHandler.doVerb(GossipDigestAckVerbHandler.java:58)
>  ~[main/:na]
>   at 
> org.apache.cassandra.net.MessageDeliveryTask.run(MessageDeliveryTask.java:66) 
> ~[main/:na]
>   at 
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) 
> ~[na:1.8.0_45]
>   at java.util.concurrent.FutureTask.run(FutureTask.java:266) 
> ~[na:1.8.0_45]
>   at 
> java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
>  ~[na:1.8.0_45]
>   at 
> java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
>  [na:1.8.0_45]
>   at java.lang.Thread.run(Thread.java:745) [na:1.8.0_45]
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Updated] (CASSANDRA-12721) dtest failure in upgrade_tests.cql_tests.TestCQLNodes2RF1_Upgrade_current_2_0_x_To_indev_2_1_x.limit_multiget_test

2016-10-21 Thread Philip Thompson (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12721?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Philip Thompson updated CASSANDRA-12721:

Resolution: Fixed
Status: Resolved  (was: Patch Available)

> dtest failure in 
> upgrade_tests.cql_tests.TestCQLNodes2RF1_Upgrade_current_2_0_x_To_indev_2_1_x.limit_multiget_test
> --
>
> Key: CASSANDRA-12721
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12721
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: Philip Thompson
>  Labels: dtest
> Attachments: node1.log, node2.log
>
>
> example failure:
> http://cassci.datastax.com/job/cassandra-2.1_dtest_upgrade/10/testReport/upgrade_tests.cql_tests/TestCQLNodes2RF1_Upgrade_current_2_0_x_To_indev_2_1_x/limit_multiget_test
> {code}
> Error Message
> Expected [[48, 'http://foo.com', 42]] from SELECT * FROM clicks WHERE userid 
> IN (48, 2) LIMIT 1, but got [[2, u'http://foo.com', 42]]
> {code}
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/upgrade_tests/cql_tests.py", line 
> 359, in limit_multiget_test
> assert_one(cursor, "SELECT * FROM clicks WHERE userid IN (48, 2) LIMIT 
> 1", [48, 'http://foo.com', 42])
>   File "/home/automaton/cassandra-dtest/tools/assertions.py", line 130, in 
> assert_one
> assert list_res == [expected], "Expected {} from {}, but got 
> {}".format([expected], query, list_res)
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Assigned] (CASSANDRA-12813) NPE in auth for bootstrapping node

2016-10-21 Thread Alex Petrov (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12813?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Alex Petrov reassigned CASSANDRA-12813:
---

Assignee: Alex Petrov

> NPE in auth for bootstrapping node
> --
>
> Key: CASSANDRA-12813
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12813
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Charles Mims
>Assignee: Alex Petrov
>
> {code}
> ERROR [SharedPool-Worker-1] 2016-10-19 21:40:25,991 Message.java:617 - 
> Unexpected exception during request; channel = [id: 0x15eb017f, / omitted>:40869 => /10.0.0.254:9042]
> java.lang.NullPointerException: null
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator.doAuthenticate(PasswordAuthenticator.java:144)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator.authenticate(PasswordAuthenticator.java:86)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator.access$100(PasswordAuthenticator.java:54)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.auth.PasswordAuthenticator$PlainTextSaslAuthenticator.getAuthenticatedUser(PasswordAuthenticator.java:182)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.transport.messages.AuthResponse.execute(AuthResponse.java:78)
>  ~[apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:513)
>  [apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:407)
>  [apache-cassandra-3.0.9.jar:3.0.9]
>   at 
> io.netty.channel.SimpleChannelInboundHandler.channelRead(SimpleChannelInboundHandler.java:105)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:333)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext.access$700(AbstractChannelHandlerContext.java:32)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext$8.run(AbstractChannelHandlerContext.java:324)
>  [netty-all-4.0.23.Final.jar:4.0.23.Final]
>   at 
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) 
> [na:1.8.0_101]
>   at 
> org.apache.cassandra.concurrent.AbstractLocalAwareExecutorService$FutureTask.run(AbstractLocalAwareExecutorService.java:164)
>  [apache-cassandra-3.0.9.jar:3.0.9]
>   at org.apache.cassandra.concurrent.SEPWorker.run(SEPWorker.java:105) 
> [apache-cassandra-3.0.9.jar:3.0.9]
>   at java.lang.Thread.run(Thread.java:745) [na:1.8.0_101]
> {code}
> I have a node that has been joining for around 24 hours.  My application is 
> configured with the IP address of the joining node in the list of nodes to 
> connect to (ruby driver), and I have been getting around 200 events of this 
> NPE per hour.  I removed the IP of the joining node from the list of nodes 
> for my app to connect to and the errors stopped.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Created] (CASSANDRA-12828) testall failure in org.apache.cassandra.cql3.KeyCacheCqlTest.testKeyCacheClusteredIndexInfoOnHeap-compression

2016-10-21 Thread Sean McCarthy (JIRA)
Sean McCarthy created CASSANDRA-12828:
-

 Summary: testall failure in 
org.apache.cassandra.cql3.KeyCacheCqlTest.testKeyCacheClusteredIndexInfoOnHeap-compression
 Key: CASSANDRA-12828
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12828
 Project: Cassandra
  Issue Type: Bug
Reporter: Sean McCarthy


example failure:

http://cassci.datastax.com/job/trunk_testall/1249/testReport/junit/org.apache.cassandra.cql3/KeyCacheCqlTest/testKeyCacheClusteredIndexInfoOnHeap_compression/

{code}
Error Message

expected:<5020> but was:<5069>
{code}{code}
Stacktrace

junit.framework.AssertionFailedError: expected:<5020> but was:<5069>
at 
org.apache.cassandra.cql3.KeyCacheCqlTest.testKeyCacheClustered(KeyCacheCqlTest.java:466)
at 
org.apache.cassandra.cql3.KeyCacheCqlTest.testKeyCacheClusteredIndexInfoOnHeap(KeyCacheCqlTest.java:401)
{code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Updated] (CASSANDRA-12827) testall failure in org.apache.cassandra.cql3.KeyCacheCqlTest.testKeyCacheClusteredShallowIndexEntry-compression

2016-10-21 Thread Sean McCarthy (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12827?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Sean McCarthy updated CASSANDRA-12827:
--
Description: 
example failure:
http://cassci.datastax.com/job/trunk_testall/1245/testReport/org.apache.cassandra.cql3/KeyCacheCqlTest/testKeyCacheClusteredShallowIndexEntry_compression/

{code}
Error Message

expected:<10> but was:<11>
{code}{code}
Stacktrace

junit.framework.AssertionFailedError: expected:<10> but was:<11>
at 
org.apache.cassandra.cql3.KeyCacheCqlTest.testKeyCacheClustered(KeyCacheCqlTest.java:424)
at 
org.apache.cassandra.cql3.KeyCacheCqlTest.testKeyCacheClusteredShallowIndexEntry(KeyCacheCqlTest.java:394)
{code}

> testall failure in 
> org.apache.cassandra.cql3.KeyCacheCqlTest.testKeyCacheClusteredShallowIndexEntry-compression
> ---
>
> Key: CASSANDRA-12827
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12827
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>  Labels: test-failure
>
> example failure:
> http://cassci.datastax.com/job/trunk_testall/1245/testReport/org.apache.cassandra.cql3/KeyCacheCqlTest/testKeyCacheClusteredShallowIndexEntry_compression/
> {code}
> Error Message
> expected:<10> but was:<11>
> {code}{code}
> Stacktrace
> junit.framework.AssertionFailedError: expected:<10> but was:<11>
>   at 
> org.apache.cassandra.cql3.KeyCacheCqlTest.testKeyCacheClustered(KeyCacheCqlTest.java:424)
>   at 
> org.apache.cassandra.cql3.KeyCacheCqlTest.testKeyCacheClusteredShallowIndexEntry(KeyCacheCqlTest.java:394)
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Updated] (CASSANDRA-12827) testall failure in org.apache.cassandra.cql3.KeyCacheCqlTest.testKeyCacheClusteredShallowIndexEntry-compression

2016-10-21 Thread Sean McCarthy (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12827?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Sean McCarthy updated CASSANDRA-12827:
--
Labels: test-failure  (was: )

> testall failure in 
> org.apache.cassandra.cql3.KeyCacheCqlTest.testKeyCacheClusteredShallowIndexEntry-compression
> ---
>
> Key: CASSANDRA-12827
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12827
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>  Labels: test-failure
>
> example failure:
> http://cassci.datastax.com/job/trunk_testall/1245/testReport/org.apache.cassandra.cql3/KeyCacheCqlTest/testKeyCacheClusteredShallowIndexEntry_compression/
> {code}
> Error Message
> expected:<10> but was:<11>
> {code}{code}
> Stacktrace
> junit.framework.AssertionFailedError: expected:<10> but was:<11>
>   at 
> org.apache.cassandra.cql3.KeyCacheCqlTest.testKeyCacheClustered(KeyCacheCqlTest.java:424)
>   at 
> org.apache.cassandra.cql3.KeyCacheCqlTest.testKeyCacheClusteredShallowIndexEntry(KeyCacheCqlTest.java:394)
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (CASSANDRA-12620) Resurrected empty rows on update to 3.x

2016-10-21 Thread Benjamin Lerer (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12620?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15595123#comment-15595123
 ] 

Benjamin Lerer commented on CASSANDRA-12620:


[~mguissine], [~csauve] could you give me the original content of one of the 
expired rows that was resurrected ?

I start to wonder if the problem is not specific to some data. 

> Resurrected empty rows on update to 3.x
> ---
>
> Key: CASSANDRA-12620
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12620
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Collin Sauve
>Assignee: Benjamin Lerer
>
> We had the below table on C* 2.x (dse 4.8.4, we assume was 2.1.15.1423 
> according to documentation), and were entering TTLs at write-time using the 
> DataStax C# Driver (using the POCO mapper).
> Upon upgrade to 3.0.8.1293 (DSE 5.0.2), we are seeing a lot of rows that:
> * should have been TTL'd
> * have no non-primary-key column data
> {code}
> CREATE TABLE applicationservices.aggregate_bucket_event_v3 (
> bucket_type int,
> bucket_id text,
> date timestamp,
> aggregate_id text,
> event_type int,
> event_id text,
> entities list>>,
> identity_sid text,
> PRIMARY KEY ((bucket_type, bucket_id), date, aggregate_id, event_type, 
> event_id)
> ) WITH CLUSTERING ORDER BY (date DESC, aggregate_id ASC, event_type ASC, 
> event_id ASC)
> AND bloom_filter_fp_chance = 0.1
> AND caching = {'keys': 'ALL', 'rows_per_partition': 'NONE'}
> AND comment = ''
> AND compaction = {'class': 
> 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'}
> AND compression = {'chunk_length_in_kb': '64', 'class': 
> 'org.apache.cassandra.io.compress.LZ4Compressor'}
> AND crc_check_chance = 1.0
> AND dclocal_read_repair_chance = 0.1
> AND default_time_to_live = 0
> AND gc_grace_seconds = 864000
> AND max_index_interval = 2048
> AND memtable_flush_period_in_ms = 0
> AND min_index_interval = 128
> AND read_repair_chance = 0.0
> AND speculative_retry = '99PERCENTILE';
> {code}
> {code}
> {
> "partition" : {
>   "key" : [ "0", "26492" ],
>   "position" : 54397932
> },
> "rows" : [
>   {
> "type" : "row",
> "position" : 54397961,
> "clustering" : [ "2016-09-07 23:33Z", "3651664", "0", 
> "773665449947099136" ],
> "liveness_info" : { "tstamp" : "2016-09-07T23:34:09.758Z", "ttl" : 
> 172741, "expires_at" : "2016-09-09T23:33:10Z", "expired" : false },
> "cells" : [
>   { "name" : "identity_sid", "value" : "p_tw_zahidana" },
>   { "name" : "entities", "deletion_info" : { "marked_deleted" : 
> "2016-09-07T23:34:09.757999Z", "local_delete_time" : "2016-09-07T23:34:09Z" } 
> },
>   { "name" : "entities", "path" : [ 
> "936e17e1-7553-11e6-9b92-29a33b5827c3" ], "value" : 
> "0:https\\://www.youtube.com/watch?v=pwAJAssv6As" },
>   { "name" : "entities", "path" : [ 
> "936e17e2-7553-11e6-9b92-29a33b5827c3" ], "value" : "2:youtube" }
> ]
>   },
>   {
> "type" : "row",
>},
>   {
> "type" : "row",
> "position" : 54397177,
> "clustering" : [ "2016-08-17 10:00Z", "6387376", "0", 
> "765850666296225792" ],
> "liveness_info" : { "tstamp" : "2016-08-17T11:26:15.917001Z" },
> "cells" : [ ]
>   },
>   {
> "type" : "row",
> "position" : 54397227,
> "clustering" : [ "2016-08-17 07:00Z", "6387376", "0", 
> "765805367347601409" ],
> "liveness_info" : { "tstamp" : "2016-08-17T08:11:17.587Z" },
> "cells" : [ ]
>   },
>   {
> "type" : "row",
> "position" : 54397276,
> "clustering" : [ "2016-08-17 04:00Z", "6387376", "0", 
> "765760069858365441" ],
> "liveness_info" : { "tstamp" : "2016-08-17T05:58:11.228Z" },
> "cells" : [ ]
>   },
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Created] (CASSANDRA-12827) testall failure in org.apache.cassandra.cql3.KeyCacheCqlTest.testKeyCacheClusteredShallowIndexEntry-compression

2016-10-21 Thread Sean McCarthy (JIRA)
Sean McCarthy created CASSANDRA-12827:
-

 Summary: testall failure in 
org.apache.cassandra.cql3.KeyCacheCqlTest.testKeyCacheClusteredShallowIndexEntry-compression
 Key: CASSANDRA-12827
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12827
 Project: Cassandra
  Issue Type: Bug
Reporter: Sean McCarthy






--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Created] (CASSANDRA-12826) testall failure in org.apache.cassandra.db.compaction.CompactionsCQLTest.testTriggerMinorCompactionDTCS-compression

2016-10-21 Thread Sean McCarthy (JIRA)
Sean McCarthy created CASSANDRA-12826:
-

 Summary: testall failure in 
org.apache.cassandra.db.compaction.CompactionsCQLTest.testTriggerMinorCompactionDTCS-compression
 Key: CASSANDRA-12826
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12826
 Project: Cassandra
  Issue Type: Bug
Reporter: Sean McCarthy


example failure:
http://cassci.datastax.com/job/trunk_testall/1243/testReport/org.apache.cassandra.db.compaction/CompactionsCQLTest/testTriggerMinorCompactionDTCS_compression/

{code}
Error Message

No minor compaction triggered in 5000ms
{code}{code}
Stacktrace

junit.framework.AssertionFailedError: No minor compaction triggered in 5000ms
at 
org.apache.cassandra.db.compaction.CompactionsCQLTest.waitForMinor(CompactionsCQLTest.java:247)
at 
org.apache.cassandra.db.compaction.CompactionsCQLTest.testTriggerMinorCompactionDTCS(CompactionsCQLTest.java:72)
{code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Created] (CASSANDRA-12825) testall failure in org.apache.cassandra.db.compaction.CompactionsCQLTest.testTriggerMinorCompactionDTCS-compression

2016-10-21 Thread Sean McCarthy (JIRA)
Sean McCarthy created CASSANDRA-12825:
-

 Summary: testall failure in 
org.apache.cassandra.db.compaction.CompactionsCQLTest.testTriggerMinorCompactionDTCS-compression
 Key: CASSANDRA-12825
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12825
 Project: Cassandra
  Issue Type: Bug
Reporter: Sean McCarthy


example failure:
http://cassci.datastax.com/job/trunk_testall/1243/testReport/org.apache.cassandra.db.compaction/CompactionsCQLTest/testTriggerMinorCompactionDTCS_compression/

{code}
Error Message

No minor compaction triggered in 5000ms
{code}{code}
Stacktrace

junit.framework.AssertionFailedError: No minor compaction triggered in 5000ms
at 
org.apache.cassandra.db.compaction.CompactionsCQLTest.waitForMinor(CompactionsCQLTest.java:247)
at 
org.apache.cassandra.db.compaction.CompactionsCQLTest.testTriggerMinorCompactionDTCS(CompactionsCQLTest.java:72)
{code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Created] (CASSANDRA-12824) testall failure in org.apache.cassandra.cql3.KeyCacheCqlTest.test2iKeyCachePathsIndexInfoOnHeap

2016-10-21 Thread Sean McCarthy (JIRA)
Sean McCarthy created CASSANDRA-12824:
-

 Summary: testall failure in 
org.apache.cassandra.cql3.KeyCacheCqlTest.test2iKeyCachePathsIndexInfoOnHeap
 Key: CASSANDRA-12824
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12824
 Project: Cassandra
  Issue Type: Bug
Reporter: Sean McCarthy


example failure:
http://cassci.datastax.com/job/trunk_testall/1243/testReport/org.apache.cassandra.cql3/KeyCacheCqlTest/test2iKeyCachePathsIndexInfoOnHeap/

{code}
Error Message

expected:<0> but was:<1>
{code}{code}
Stacktrace

junit.framework.AssertionFailedError: expected:<0> but was:<1>
at 
org.apache.cassandra.cql3.KeyCacheCqlTest.test2iKeyCachePaths(KeyCacheCqlTest.java:268)
at 
org.apache.cassandra.cql3.KeyCacheCqlTest.test2iKeyCachePathsIndexInfoOnHeap(KeyCacheCqlTest.java:192)
{code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Created] (CASSANDRA-12823) dtest failure in topology_test.TestTopology.crash_during_decommission_test

2016-10-21 Thread Sean McCarthy (JIRA)
Sean McCarthy created CASSANDRA-12823:
-

 Summary: dtest failure in 
topology_test.TestTopology.crash_during_decommission_test
 Key: CASSANDRA-12823
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12823
 Project: Cassandra
  Issue Type: Test
Reporter: Sean McCarthy
Assignee: DS Test Eng
 Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log

example failure:

http://cassci.datastax.com/job/trunk_novnode_dtest/489/testReport/topology_test/TestTopology/crash_during_decommission_test

{code}
Stacktrace

  File "/usr/lib/python2.7/unittest/case.py", line 358, in run
self.tearDown()
  File "/home/automaton/cassandra-dtest/dtest.py", line 581, in tearDown
raise AssertionError('Unexpected error in log, see stdout')
"Unexpected error in log, see stdout
{code}{code}
Standard Output

Unexpected error in node2 log, error: 
ERROR [GossipStage:1] 2016-10-19 15:44:14,820 CassandraDaemon.java:229 - 
Exception in thread Thread[GossipStage:1,5,main]
java.lang.NullPointerException: null
at 
java.util.concurrent.ConcurrentHashMap.get(ConcurrentHashMap.java:936) 
~[na:1.8.0_45]
at org.apache.cassandra.hints.HintsCatalog.get(HintsCatalog.java:89) 
~[main/:na]
at 
org.apache.cassandra.hints.HintsService.excise(HintsService.java:313) 
~[main/:na]
at 
org.apache.cassandra.service.StorageService.excise(StorageService.java:2458) 
~[main/:na]
at 
org.apache.cassandra.service.StorageService.excise(StorageService.java:2471) 
~[main/:na]
at 
org.apache.cassandra.service.StorageService.handleStateLeft(StorageService.java:2375)
 ~[main/:na]
at 
org.apache.cassandra.service.StorageService.onChange(StorageService.java:1905) 
~[main/:na]
at 
org.apache.cassandra.gms.Gossiper.doOnChangeNotifications(Gossiper.java:1222) 
~[main/:na]
at org.apache.cassandra.gms.Gossiper.applyNewStates(Gossiper.java:1205) 
~[main/:na]
at 
org.apache.cassandra.gms.Gossiper.applyStateLocally(Gossiper.java:1168) 
~[main/:na]
at 
org.apache.cassandra.gms.GossipDigestAckVerbHandler.doVerb(GossipDigestAckVerbHandler.java:58)
 ~[main/:na]
at 
org.apache.cassandra.net.MessageDeliveryTask.run(MessageDeliveryTask.java:66) 
~[main/:na]
at 
java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) 
~[na:1.8.0_45]
at java.util.concurrent.FutureTask.run(FutureTask.java:266) 
~[na:1.8.0_45]
at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) 
~[na:1.8.0_45]
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) 
[na:1.8.0_45]
at java.lang.Thread.run(Thread.java:745) [na:1.8.0_45]
{code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Created] (CASSANDRA-12822) dtest failure in compaction_test.TestCompaction_with_SizeTieredCompactionStrategy.fanout_size_test

2016-10-21 Thread Sean McCarthy (JIRA)
Sean McCarthy created CASSANDRA-12822:
-

 Summary: dtest failure in 
compaction_test.TestCompaction_with_SizeTieredCompactionStrategy.fanout_size_test
 Key: CASSANDRA-12822
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12822
 Project: Cassandra
  Issue Type: Test
Reporter: Sean McCarthy
Assignee: DS Test Eng
 Attachments: node1.log, node1_debug.log, node1_gc.log

example failure:

http://cassci.datastax.com/job/trunk_dtest/1403/testReport/compaction_test/TestCompaction_with_SizeTieredCompactionStrategy/fanout_size_test

{code}
Error Message

75 != 74
{code}{code}
Stacktrace

  File "/usr/lib/python2.7/unittest/case.py", line 329, in run
testMethod()
  File "/home/automaton/cassandra-dtest/tools/decorators.py", line 46, in 
wrapped
f(obj)
  File "/home/automaton/cassandra-dtest/compaction_test.py", line 553, in 
fanout_size_test
self.assertEqual(25 * len(node1.data_directories()), int(m.group(2)))
  File "/usr/lib/python2.7/unittest/case.py", line 513, in assertEqual
assertion_func(first, second, msg=msg)
  File "/usr/lib/python2.7/unittest/case.py", line 506, in _baseAssertEqual
raise self.failureException(msg)
{code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Created] (CASSANDRA-12821) testall failure in org.apache.cassandra.service.RemoveTest.testNonmemberId

2016-10-21 Thread Sean McCarthy (JIRA)
Sean McCarthy created CASSANDRA-12821:
-

 Summary: testall failure in 
org.apache.cassandra.service.RemoveTest.testNonmemberId
 Key: CASSANDRA-12821
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12821
 Project: Cassandra
  Issue Type: Bug
Reporter: Sean McCarthy


example failure:

http://cassci.datastax.com/job/cassandra-3.X_testall/41/testReport/org.apache.cassandra.service/RemoveTest/testNonmemberId/

{code}
Stacktrace

java.lang.NullPointerException
at org.apache.cassandra.gms.Gossiper.getHostId(Gossiper.java:871)
at 
org.apache.cassandra.service.StorageService.handleStateNormal(StorageService.java:2226)
at 
org.apache.cassandra.service.StorageService.onChange(StorageService.java:1892)
at org.apache.cassandra.Util.createInitialRing(Util.java:216)
at org.apache.cassandra.service.RemoveTest.setup(RemoveTest.java:88)
{code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Created] (CASSANDRA-12820) testall failure in org.apache.cassandra.db.KeyspaceTest.testLimitSSTables-compression

2016-10-21 Thread Sean McCarthy (JIRA)
Sean McCarthy created CASSANDRA-12820:
-

 Summary: testall failure in 
org.apache.cassandra.db.KeyspaceTest.testLimitSSTables-compression
 Key: CASSANDRA-12820
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12820
 Project: Cassandra
  Issue Type: Bug
Reporter: Sean McCarthy


example failure:

http://cassci.datastax.com/job/cassandra-3.X_testall/38/testReport/org.apache.cassandra.db/KeyspaceTest/testLimitSSTables_compression/

{code}
Error Message

expected:<5.0> but was:<6.0>
{code}{code}
Stacktrace

junit.framework.AssertionFailedError: expected:<5.0> but was:<6.0>
at 
org.apache.cassandra.db.KeyspaceTest.testLimitSSTables(KeyspaceTest.java:421)
{code}{code}
Standard Output

ERROR [main] 2016-10-20 05:56:18,156 ?:? - SLF4J: stderr
INFO  [main] 2016-10-20 05:56:18,516 ?:? - Configuration location: 
file:/home/automaton/cassandra/test/conf/cassandra.yaml
DEBUG [main] 2016-10-20 05:56:18,532 ?:? - Loading settings from 
file:/home/automaton/cassandra/test/conf/cassandra.yaml
INFO  [main] 2016-10-20 05:56:19,632 ?:? - Node 
configuration:[allocate_tokens_for_keyspace=null; authenticator=null; 
authorizer=null; auto_bootstrap=true; auto_snapshot=true; 
back_pressure_enabled=f
...[truncated 453203 chars]...
ableReader(path='/home/automaton/cassandra/build/test/cassandra/data:108/system/sstable_activity-5a1ff267ace03f128563cfae6103c65e/mc-26-big-Data.db')]
 (1 sstables, 6.278KiB), biggest 6.278KiB, smallest 6.278KiB
DEBUG [MemtableFlushWriter:2] 2016-10-20 05:56:34,725 ?:? - Flushed to 
[BigTableReader(path='/home/automaton/cassandra/build/test/cassandra/data:108/system/compaction_history-b4dbb7b4dc493fb5b3bfce6e434832ca/mc-22-big-Data.db')]
 (1 sstables, 5.559KiB), biggest 5.559KiB, smallest 5.559KiB
{code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Created] (CASSANDRA-12819) testall failure in org.apache.cassandra.index.sasi.SASIIndexTest.testMultiExpressionQueriesWhereRowSplitBetweenSSTables

2016-10-21 Thread Sean McCarthy (JIRA)
Sean McCarthy created CASSANDRA-12819:
-

 Summary: testall failure in 
org.apache.cassandra.index.sasi.SASIIndexTest.testMultiExpressionQueriesWhereRowSplitBetweenSSTables
 Key: CASSANDRA-12819
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12819
 Project: Cassandra
  Issue Type: Bug
Reporter: Sean McCarthy


example failure:

http://cassci.datastax.com/job/cassandra-3.X_testall/36/testReport/org.apache.cassandra.index.sasi/SASIIndexTest/testMultiExpressionQueriesWhereRowSplitBetweenSSTables/

{code}
Error Message

Forked Java VM exited abnormally. Please note the time in the report does not 
reflect the time until the VM exit.
{code}{code}
Stacktrace

junit.framework.AssertionFailedError: Forked Java VM exited abnormally. Please 
note the time in the report does not reflect the time until the VM exit.
at java.lang.Thread.run(Thread.java:745)
{code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Created] (CASSANDRA-12818) testall failure in org.apache.cassandra.db.compaction.LongLeveledCompactionStrategyTest.testParallelLeveledCompaction

2016-10-21 Thread Sean McCarthy (JIRA)
Sean McCarthy created CASSANDRA-12818:
-

 Summary: testall failure in 
org.apache.cassandra.db.compaction.LongLeveledCompactionStrategyTest.testParallelLeveledCompaction
 Key: CASSANDRA-12818
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12818
 Project: Cassandra
  Issue Type: Bug
Reporter: Sean McCarthy


example failure:
http://cassci.datastax.com/job/cassandra-3.0_testall/710/testReport/org.apache.cassandra.db.compaction/LongLeveledCompactionStrategyTest/testParallelLeveledCompaction/

{code}
Error Message

Timeout occurred. Please note the time in the report does not reflect the time 
until the timeout.
{code}{code}
Stacktrace

junit.framework.AssertionFailedError: Timeout occurred. Please note the time in 
the report does not reflect the time until the timeout.
{code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Reopened] (CASSANDRA-12119) dtest failure in compaction_test.TestCompaction_with_DateTieredCompactionStrategy.large_compaction_warning_test

2016-10-21 Thread Sean McCarthy (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12119?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Sean McCarthy reopened CASSANDRA-12119:
---

Seeing this failure again here:
http://cassci.datastax.com/job/cassandra-3.0_dtest/837/testReport/compaction_test/TestCompaction_with_SizeTieredCompactionStrategy/large_compaction_warning_test/
http://cassci.datastax.com/job/cassandra-3.0_dtest/837/testReport/compaction_test/TestCompaction_with_DateTieredCompactionStrategy/large_compaction_warning_test/
http://cassci.datastax.com/job/cassandra-3.0_dtest/837/testReport/compaction_test/TestCompaction_with_LeveledCompactionStrategy/large_compaction_warning_test/

> dtest failure in 
> compaction_test.TestCompaction_with_DateTieredCompactionStrategy.large_compaction_warning_test
> ---
>
> Key: CASSANDRA-12119
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12119
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
>
> example failure:
> http://cassci.datastax.com/job/trunk_dtest/1290/testReport/compaction_test/TestCompaction_with_DateTieredCompactionStrategy/large_compaction_warning_test
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/compaction_test.py", line 330, in 
> large_compaction_warning_test
> node.watch_log_for('{} large partition ks/large:user \({}\)'.format(verb, 
> sizematcher), from_mark=mark, timeout=180)
>   File "/home/automaton/ccm/ccmlib/node.py", line 448, in watch_log_for
> raise TimeoutError(time.strftime("%d %b %Y %H:%M:%S", time.gmtime()) + " 
> [" + self.name + "] Missing: " + str([e.pattern for e in tofind]) + ":\n" + 
> reads[:50] + ".\nSee {} for remainder".format(filename))
> "28 Jun 2016 15:16:51 [node1] Missing: ['Writing large partition 
> ks/large:user (d+ bytes)']:\nINFO  [Native-Transport-Requests-5] 
> 2016-06-28 15:.\nSee system.log for remainder
> {code}
> Related failures:
> http://cassci.datastax.com/job/trunk_dtest/1290/testReport/compaction_test/TestCompaction_with_LeveledCompactionStrategy/large_compaction_warning_test/
> http://cassci.datastax.com/job/trunk_dtest/1290/testReport/compaction_test/TestCompaction_with_SizeTieredCompactionStrategy/large_compaction_warning_test/
> Failed on CassCI build trunk_dtest #1290



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Created] (CASSANDRA-12817) testall failure in org.apache.cassandra.cql3.validation.entities.UFTest.testAllNativeTypes

2016-10-21 Thread Sean McCarthy (JIRA)
Sean McCarthy created CASSANDRA-12817:
-

 Summary: testall failure in 
org.apache.cassandra.cql3.validation.entities.UFTest.testAllNativeTypes
 Key: CASSANDRA-12817
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12817
 Project: Cassandra
  Issue Type: Bug
Reporter: Sean McCarthy


example failure:

http://cassci.datastax.com/job/cassandra-2.2_testall/595/testReport/org.apache.cassandra.cql3.validation.entities/UFTest/testAllNativeTypes/

{code}
Error Message

Timeout occurred. Please note the time in the report does not reflect the time 
until the timeout.
{code}
{code}
Stacktrace

junit.framework.AssertionFailedError: Timeout occurred. Please note the time in 
the report does not reflect the time until the timeout.
at java.lang.Thread.run(Thread.java:745)
{code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (CASSANDRA-12781) dtest failure in pushed_notifications_test.TestPushedNotifications.restart_node_test

2016-10-21 Thread Stefania (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12781?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15594740#comment-15594740
 ] 

Stefania commented on CASSANDRA-12781:
--

The 3.0 vanilla multiplex 
[run|http://cassci.datastax.com/view/Dev/view/stef1927/job/stef1927-dtest-multiplex/74/]
 did not produce any failures, neither did the 
[one|http://cassci.datastax.com/view/Dev/view/stef1927/job/stef1927-dtest-multiplex/75/]
 with a tentative [patch|https://github.com/stef1927/cassandra/tree/12781-3.0].

I will try one more run of each next week.

> dtest failure in 
> pushed_notifications_test.TestPushedNotifications.restart_node_test
> 
>
> Key: CASSANDRA-12781
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12781
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>Assignee: Stefania
>  Labels: dtest
> Fix For: 3.x
>
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/cassandra-3.X_dtest/4/testReport/pushed_notifications_test/TestPushedNotifications/restart_node_test
> {code}
> Error Message
> [{'change_type': u'DOWN', 'address': ('127.0.0.2', 9042)}, {'change_type': 
> u'UP', 'address': ('127.0.0.2', 9042)}, {'change_type': u'DOWN', 'address': 
> ('127.0.0.2', 9042)}]
> {code}
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/pushed_notifications_test.py", line 
> 181, in restart_node_test
> self.assertEquals(expected_notifications, len(notifications), 
> notifications)
>   File "/usr/lib/python2.7/unittest/case.py", line 513, in assertEqual
> assertion_func(first, second, msg=msg)
>   File "/usr/lib/python2.7/unittest/case.py", line 506, in _baseAssertEqual
> raise self.failureException(msg)
> {code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (CASSANDRA-12802) RecoveryManagerTruncateTest fails in 2.1

2016-10-21 Thread Stefania (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12802?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15594723#comment-15594723
 ] 

Stefania commented on CASSANDRA-12802:
--

I've reproduced at least one timeout failure with stack traces 
[here|http://cassci.datastax.com/job/stef1927-testall-multiplex-2/7/testReport/junit/org.apache.cassandra.db/RecoveryManagerTruncateTest_41/testTruncatePointInTimeReplayList/].
 I'm still analyzing it, but I think I need some of the commits of 
CASSANDRA-8308, the ones made by [~snazy] in order to fix the unit tests.

There are also different failures, sample 
[here|http://cassci.datastax.com/job/stef1927-testall-multiplex-2/7/testReport/org.apache.cassandra.db/RecoveryManagerTruncateTest_139/testTruncatePointInTimeReplayList/],
 with NPEs in {{CommitLogSegmentManager.allocate}} and file not found errors, 
although these may be a consequence of the interrupted exceptions injected by 
the junit timeouts.

> RecoveryManagerTruncateTest fails in 2.1
> 
>
> Key: CASSANDRA-12802
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12802
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Stefania
>Assignee: Stefania
> Fix For: 2.1.x
>
>
> Example failure:
> http://cassci.datastax.com/view/cassandra-2.1/job/cassandra-2.1_testall/388/testReport/junit/org.apache.cassandra.db/RecoveryManagerTruncateTest/testTruncatePointInTime/



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (CASSANDRA-12802) RecoveryManagerTruncateTest fails in 2.1

2016-10-21 Thread Stefania (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12802?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15594345#comment-15594345
 ] 

Stefania commented on CASSANDRA-12802:
--

This multiplexed run 
[here|https://cassci.datastax.com/job/stef1927-testall-multiplex-2/7/] should 
print all thread's stack traces if a test is still running after 2 minutes.

> RecoveryManagerTruncateTest fails in 2.1
> 
>
> Key: CASSANDRA-12802
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12802
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Stefania
>Assignee: Stefania
> Fix For: 2.1.x
>
>
> Example failure:
> http://cassci.datastax.com/view/cassandra-2.1/job/cassandra-2.1_testall/388/testReport/junit/org.apache.cassandra.db/RecoveryManagerTruncateTest/testTruncatePointInTime/



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Updated] (CASSANDRA-12765) SSTable ignored incorrectly with partition level tombstone

2016-10-21 Thread Marcus Eriksson (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12765?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Marcus Eriksson updated CASSANDRA-12765:

   Resolution: Fixed
Fix Version/s: 4.0
   3.10
   3.0.10
   2.2.9
   2.1.17
Reproduced In: 2.1.15, 2.0.17, 3.x  (was: 2.0.17, 2.1.15, 3.x)
   Status: Resolved  (was: Patch Available)

Committed, thanks for the patch

> SSTable ignored incorrectly with partition level tombstone
> --
>
> Key: CASSANDRA-12765
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12765
> Project: Cassandra
>  Issue Type: Bug
>  Components: Local Write-Read Paths
>Reporter: Cameron Zemek
>Assignee: Cameron Zemek
> Fix For: 2.1.17, 2.2.9, 3.0.10, 3.10, 4.0
>
> Attachments: 12765.patch
>
>
> {noformat}
> CREATE TABLE test.payload(
>   bucket_id TEXT,
>   name TEXT,
>   data TEXT,
>   PRIMARY KEY (bucket_id, name)
> );
> insert into test.payload (bucket_id, name, data) values 
> ('8772618c9009cf8f5a5e0c18', 'test', 'hello');
> {noformat}
> Flush nodes (nodetool flush)
> {noformat}
> insert into test.payload (bucket_id, name, data) values 
> ('8772618c9009cf8f5a5e0c19', 'test2', 'hello');
> delete from test.payload where bucket_id = '8772618c9009cf8f5a5e0c18';
> {noformat}
> Flush nodes (nodetool flush)
> {noformat}
> select * from test.payload where bucket_id = '8772618c9009cf8f5a5e0c18' and 
> name = 'test';
> {noformat}
> Expected 0 rows but get 1 row back.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[12/18] cassandra git commit: Merge branch 'cameron/12765-2.1' into cameron/12765-2.2

2016-10-21 Thread marcuse
Merge branch 'cameron/12765-2.1' into cameron/12765-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: a370409c802edfbce6a1682083df5cb5f376a34b
Parents: 4eed687 f7ded1c
Author: Marcus Eriksson 
Authored: Fri Oct 21 08:40:20 2016 +0200
Committer: Marcus Eriksson 
Committed: Fri Oct 21 08:40:20 2016 +0200

--
 CHANGES.txt |  8 +++-
 .../cassandra/db/CollationController.java   | 10 ++---
 .../db/CollationControllerCQLTest.java  | 46 
 3 files changed, 55 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a370409c/CHANGES.txt
--
diff --cc CHANGES.txt
index 41e3f94,e922635..efd0f5c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,14 +1,50 @@@
 +2.2.9
 + * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
 + * Limit colUpdateTimeDelta histogram updates to reasonable deltas 
(CASSANDRA-7)
 + * Fix leak errors and execution rejected exceptions when draining 
(CASSANDRA-12457)
 + * Fix merkle tree depth calculation (CASSANDRA-12580)
 + * Make Collections deserialization more robust (CASSANDRA-12618)
 + * Better handle invalid system roles table (CASSANDRA-12700)
-  
-  
++Merged from 2.1:
++===
+ 2.1.17
+  * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
+ 
+ 
 -2.1.16
 - * Avoid infinitely looping result set when paging SELECT queries with
 -   an IN clause with duplicate keys by treating the IN values as a set instead
 -   of a list (CASSANDRA-12420)
 +2.2.8
 + * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
 + * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
 + * Decrement pending range calculator jobs counter in finally block
 +  (CASSANDRA-12554)
 + * Add local address entry in PropertyFileSnitch (CASSANDRA-11332)
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * cqlsh copy: fix missing counter values (CASSANDRA-12476)
 + * Move migration tasks to non-periodic queue, assure flush executor shutdown 
after non-periodic executor (CASSANDRA-12251)
 + * cqlsh copy: fixed possible race in initializing feeding thread 
(CASSANDRA-11701)
 + * Only set broadcast_rpc_address on Ec2MultiRegionSnitch if it's not set 
(CASSANDRA-11357)
 + * Update StorageProxy range metrics for timeouts, failures and unavailables 
(CASSANDRA-9507)
 + * Add Sigar to classes included in clientutil.jar (CASSANDRA-11635)
 + * Add decay to histograms and timers used for metrics (CASSANDRA-11752)
 + * Fix hanging stream session (CASSANDRA-10992)
 + * Add byteman support for testing (CASSANDRA-12377)
 + * Fix INSERT JSON, fromJson() support of smallint, tinyint types 
(CASSANDRA-12371)
 + * Restore JVM metric export for metric reporters (CASSANDRA-12312)
 + * Release sstables of failed stream sessions only when outgoing transfers 
are finished (CASSANDRA-11345)
 + * Revert CASSANDRA-11427 (CASSANDRA-12351)
 + * Wait for tracing events before returning response and query at same 
consistency level client side (CASSANDRA-11465)
 + * cqlsh copyutil should get host metadata by connected address 
(CASSANDRA-11979)
 + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
 + * Synchronize ThriftServer::stop() (CASSANDRA-12105)
 + * Use dedicated thread for JMX notifications (CASSANDRA-12146)
 + * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143)
 + * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
 + * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
 + * Don't write shadowed range tombstone (CASSANDRA-12030)
 +Merged from 2.1:
   * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
 - * Include column family parameter when -st and -et are provided 
(CASSANDRA-11866)
 - * Fix queries with empty ByteBuffer values in clustering column restrictions 
(CASSANDRA-12127) 
   * Disable passing control to post-flush after flush failure to prevent data 
loss (CASSANDRA-11828)
   * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
   * cannot 

[03/18] cassandra git commit: ninja fix to remove double param in logging msg from merge

2016-10-21 Thread marcuse
ninja fix to remove double param in logging msg from merge


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

Branch: refs/heads/trunk
Commit: f51ee61f9dfef4288381f2133f6859c6a57a0693
Parents: ddb3e6a
Author: Nate McCall 
Authored: Fri Oct 21 15:34:40 2016 +1300
Committer: Nate McCall 
Committed: Fri Oct 21 15:34:40 2016 +1300

--
 .../org/apache/cassandra/io/sstable/format/big/BigTableWriter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f51ee61f/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
--
diff --git 
a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java 
b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
index 110106c..19e29a8 100644
--- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
@@ -208,7 +208,7 @@ public class BigTableWriter extends SSTableWriter
 if (rowSize > 
DatabaseDescriptor.getCompactionLargePartitionWarningThreshold())
 {
 String keyString = 
metadata.getKeyValidator().getString(key.getKey());
-logger.warn("Writing large partition {}/{}:{} ({}) to sstable {}", 
metadata.ksName, metadata.cfName, keyString, rowSize, 
FBUtilities.prettyPrintMemory(rowSize), getFilename());
+logger.warn("Writing large partition {}/{}:{} ({}) to sstable {}", 
metadata.ksName, metadata.cfName, keyString, 
FBUtilities.prettyPrintMemory(rowSize), getFilename());
 }
 }
 



[14/18] cassandra git commit: Merge branch 'cameron/12765-2.2' into cameron/12765-3.0

2016-10-21 Thread marcuse
Merge branch 'cameron/12765-2.2' into cameron/12765-3.0


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

Branch: refs/heads/cassandra-3.X
Commit: 7976d65af230b8322a54a4462f2ea37bbe185a71
Parents: 8b04ec9 a370409
Author: Marcus Eriksson 
Authored: Fri Oct 21 08:55:20 2016 +0200
Committer: Marcus Eriksson 
Committed: Fri Oct 21 08:55:20 2016 +0200

--
 CHANGES.txt |  1 +
 .../db/SinglePartitionReadCommand.java  |  6 +--
 .../io/sstable/format/SSTableReader.java|  8 
 .../db/SinglePartitionReadCommandCQLTest.java   | 41 
 4 files changed, 53 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7976d65a/CHANGES.txt
--
diff --cc CHANGES.txt
index b309e96,efd0f5c..f14eb22
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -34,64 -16,6 +34,65 @@@ Merged from 2.2
   * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
   * Decrement pending range calculator jobs counter in finally block
(CASSANDRA-12554)
 +Merged from 2.1:
 + * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
++ * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
 +
 +
 +3.0.9
 + * Handle composite prefixes with final EOC=0 as in 2.x and refactor 
LegacyLayout.decodeBound (CASSANDRA-12423)
 + * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195)
 + * select_distinct_with_deletions_test failing on non-vnode environments 
(CASSANDRA-11126)
 + * Stack Overflow returned to queries while upgrading (CASSANDRA-12527)
 + * Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565)
 + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata 
(CASSANDRA-12208)
 + * Fix file system race condition that may cause LogAwareFileLister to fail 
to classify files (CASSANDRA-11889)
 + * Fix file handle leaks due to simultaneous compaction/repair and
 +   listing snapshots, calculating snapshot sizes, or making schema
 +   changes (CASSANDRA-11594)
 + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508)
 + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
 + * Calculate last compacted key on startup (CASSANDRA-6216)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names 

[04/18] cassandra git commit: Don't skip sstables based on maxLocalDeletionTime

2016-10-21 Thread marcuse
Don't skip sstables based on maxLocalDeletionTime

Patch by Cameron Zemek; reviewed by marcuse for CASSANDRA-12765


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

Branch: refs/heads/cassandra-2.2
Commit: f7ded1c59287f309f7cd89d576b684c8473bb632
Parents: 83ae5f3
Author: Cameron Zemek 
Authored: Tue Oct 18 11:09:23 2016 +0200
Committer: Marcus Eriksson 
Committed: Fri Oct 21 08:38:40 2016 +0200

--
 CHANGES.txt |  4 ++
 .../cassandra/db/CollationController.java   | 10 ++---
 .../db/CollationControllerCQLTest.java  | 46 
 3 files changed, 53 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7ded1c5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b778444..e922635 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.1.17
+ * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
+
+
 2.1.16
  * Avoid infinitely looping result set when paging SELECT queries with
an IN clause with duplicate keys by treating the IN values as a set instead

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7ded1c5/src/java/org/apache/cassandra/db/CollationController.java
--
diff --git a/src/java/org/apache/cassandra/db/CollationController.java 
b/src/java/org/apache/cassandra/db/CollationController.java
index 8a966bc..0f2674e 100644
--- a/src/java/org/apache/cassandra/db/CollationController.java
+++ b/src/java/org/apache/cassandra/db/CollationController.java
@@ -258,13 +258,9 @@ public class CollationController
 if (!filter.shouldInclude(sstable))
 {
 nonIntersectingSSTables++;
-// sstable contains no tombstone if maxLocalDeletionTime 
== Integer.MAX_VALUE, so we can safely skip those entirely
-if (sstable.getSSTableMetadata().maxLocalDeletionTime != 
Integer.MAX_VALUE)
-{
-if (skippedSSTables == null)
-skippedSSTables = new ArrayList<>();
-skippedSSTables.add(sstable);
-}
+if (skippedSSTables == null)
+skippedSSTables = new ArrayList<>();
+skippedSSTables.add(sstable);
 continue;
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7ded1c5/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java 
b/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java
new file mode 100644
index 000..376678a
--- /dev/null
+++ b/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java
@@ -0,0 +1,46 @@
+/*
+ * 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.db;
+
+import org.junit.Test;
+
+import org.apache.cassandra.cql3.CQLTester;
+import org.apache.cassandra.cql3.UntypedResultSet;
+import static org.junit.Assert.assertTrue;
+
+public class CollationControllerCQLTest extends CQLTester
+{
+@Test
+public void partitionLevelDeletionTest() throws Throwable
+{
+createTable("CREATE TABLE %s (bucket_id TEXT,name TEXT,data 
TEXT,PRIMARY KEY (bucket_id, name))");
+execute("insert into %s (bucket_id, name, data) values 
('8772618c9009cf8f5a5e0c18', 'test', 'hello')");
+getCurrentColumnFamilyStore().forceBlockingFlush();
+execute("insert into %s (bucket_id, name, data) values 
('8772618c9009cf8f5a5e0c19', 'test2', 'hello');");
+execute("delete from 

[02/18] cassandra git commit: Include SSTable path in compacting large row message

2016-10-21 Thread marcuse
Include SSTable path in compacting large row message

Patch by Sankalp Kohli; Reviewed by Nate McCall for CASSANDRA-12384


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

Branch: refs/heads/trunk
Commit: 8b04ec908854f8301533107b81e7508de993b671
Parents: 4ba91cd
Author: Nate McCall 
Authored: Fri Oct 21 15:00:50 2016 +1300
Committer: Nate McCall 
Committed: Fri Oct 21 15:00:50 2016 +1300

--
 CHANGES.txt| 1 +
 .../org/apache/cassandra/io/sstable/format/big/BigTableWriter.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b04ec90/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 82348d5..b309e96 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.10
+ * Include SSTable filename in compacting large row message (CASSANDRA-12384)
  * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
  * Fix ViewTest.testCompaction (CASSANDRA-12789)
  * Improve avg aggregate functions (CASSANDRA-12417)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b04ec90/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
--
diff --git 
a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java 
b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
index d3630d7..0d500c1 100644
--- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
@@ -168,7 +168,7 @@ public class BigTableWriter extends SSTableWriter
 if (rowSize > 
DatabaseDescriptor.getCompactionLargePartitionWarningThreshold())
 {
 String keyString = 
metadata.getKeyValidator().getString(key.getKey());
-logger.warn("Writing large partition {}/{}:{} ({} bytes)", 
metadata.ksName, metadata.cfName, keyString, rowSize);
+logger.warn("Writing large partition {}/{}:{} ({} bytes to sstable 
{}) ", metadata.ksName, metadata.cfName, keyString, rowSize, getFilename());
 }
 }
 



[10/18] cassandra git commit: Merge branch 'cameron/12765-2.1' into cameron/12765-2.2

2016-10-21 Thread marcuse
Merge branch 'cameron/12765-2.1' into cameron/12765-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: a370409c802edfbce6a1682083df5cb5f376a34b
Parents: 4eed687 f7ded1c
Author: Marcus Eriksson 
Authored: Fri Oct 21 08:40:20 2016 +0200
Committer: Marcus Eriksson 
Committed: Fri Oct 21 08:40:20 2016 +0200

--
 CHANGES.txt |  8 +++-
 .../cassandra/db/CollationController.java   | 10 ++---
 .../db/CollationControllerCQLTest.java  | 46 
 3 files changed, 55 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a370409c/CHANGES.txt
--
diff --cc CHANGES.txt
index 41e3f94,e922635..efd0f5c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,14 +1,50 @@@
 +2.2.9
 + * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
 + * Limit colUpdateTimeDelta histogram updates to reasonable deltas 
(CASSANDRA-7)
 + * Fix leak errors and execution rejected exceptions when draining 
(CASSANDRA-12457)
 + * Fix merkle tree depth calculation (CASSANDRA-12580)
 + * Make Collections deserialization more robust (CASSANDRA-12618)
 + * Better handle invalid system roles table (CASSANDRA-12700)
-  
-  
++Merged from 2.1:
++===
+ 2.1.17
+  * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
+ 
+ 
 -2.1.16
 - * Avoid infinitely looping result set when paging SELECT queries with
 -   an IN clause with duplicate keys by treating the IN values as a set instead
 -   of a list (CASSANDRA-12420)
 +2.2.8
 + * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
 + * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
 + * Decrement pending range calculator jobs counter in finally block
 +  (CASSANDRA-12554)
 + * Add local address entry in PropertyFileSnitch (CASSANDRA-11332)
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * cqlsh copy: fix missing counter values (CASSANDRA-12476)
 + * Move migration tasks to non-periodic queue, assure flush executor shutdown 
after non-periodic executor (CASSANDRA-12251)
 + * cqlsh copy: fixed possible race in initializing feeding thread 
(CASSANDRA-11701)
 + * Only set broadcast_rpc_address on Ec2MultiRegionSnitch if it's not set 
(CASSANDRA-11357)
 + * Update StorageProxy range metrics for timeouts, failures and unavailables 
(CASSANDRA-9507)
 + * Add Sigar to classes included in clientutil.jar (CASSANDRA-11635)
 + * Add decay to histograms and timers used for metrics (CASSANDRA-11752)
 + * Fix hanging stream session (CASSANDRA-10992)
 + * Add byteman support for testing (CASSANDRA-12377)
 + * Fix INSERT JSON, fromJson() support of smallint, tinyint types 
(CASSANDRA-12371)
 + * Restore JVM metric export for metric reporters (CASSANDRA-12312)
 + * Release sstables of failed stream sessions only when outgoing transfers 
are finished (CASSANDRA-11345)
 + * Revert CASSANDRA-11427 (CASSANDRA-12351)
 + * Wait for tracing events before returning response and query at same 
consistency level client side (CASSANDRA-11465)
 + * cqlsh copyutil should get host metadata by connected address 
(CASSANDRA-11979)
 + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
 + * Synchronize ThriftServer::stop() (CASSANDRA-12105)
 + * Use dedicated thread for JMX notifications (CASSANDRA-12146)
 + * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143)
 + * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
 + * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
 + * Don't write shadowed range tombstone (CASSANDRA-12030)
 +Merged from 2.1:
   * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
 - * Include column family parameter when -st and -et are provided 
(CASSANDRA-11866)
 - * Fix queries with empty ByteBuffer values in clustering column restrictions 
(CASSANDRA-12127) 
   * Disable passing control to post-flush after flush failure to prevent data 
loss (CASSANDRA-11828)
   * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
   * cannot 

[11/18] cassandra git commit: Merge branch 'cameron/12765-2.1' into cameron/12765-2.2

2016-10-21 Thread marcuse
Merge branch 'cameron/12765-2.1' into cameron/12765-2.2


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

Branch: refs/heads/cassandra-3.X
Commit: a370409c802edfbce6a1682083df5cb5f376a34b
Parents: 4eed687 f7ded1c
Author: Marcus Eriksson 
Authored: Fri Oct 21 08:40:20 2016 +0200
Committer: Marcus Eriksson 
Committed: Fri Oct 21 08:40:20 2016 +0200

--
 CHANGES.txt |  8 +++-
 .../cassandra/db/CollationController.java   | 10 ++---
 .../db/CollationControllerCQLTest.java  | 46 
 3 files changed, 55 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a370409c/CHANGES.txt
--
diff --cc CHANGES.txt
index 41e3f94,e922635..efd0f5c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,14 +1,50 @@@
 +2.2.9
 + * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
 + * Limit colUpdateTimeDelta histogram updates to reasonable deltas 
(CASSANDRA-7)
 + * Fix leak errors and execution rejected exceptions when draining 
(CASSANDRA-12457)
 + * Fix merkle tree depth calculation (CASSANDRA-12580)
 + * Make Collections deserialization more robust (CASSANDRA-12618)
 + * Better handle invalid system roles table (CASSANDRA-12700)
-  
-  
++Merged from 2.1:
++===
+ 2.1.17
+  * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
+ 
+ 
 -2.1.16
 - * Avoid infinitely looping result set when paging SELECT queries with
 -   an IN clause with duplicate keys by treating the IN values as a set instead
 -   of a list (CASSANDRA-12420)
 +2.2.8
 + * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
 + * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
 + * Decrement pending range calculator jobs counter in finally block
 +  (CASSANDRA-12554)
 + * Add local address entry in PropertyFileSnitch (CASSANDRA-11332)
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * cqlsh copy: fix missing counter values (CASSANDRA-12476)
 + * Move migration tasks to non-periodic queue, assure flush executor shutdown 
after non-periodic executor (CASSANDRA-12251)
 + * cqlsh copy: fixed possible race in initializing feeding thread 
(CASSANDRA-11701)
 + * Only set broadcast_rpc_address on Ec2MultiRegionSnitch if it's not set 
(CASSANDRA-11357)
 + * Update StorageProxy range metrics for timeouts, failures and unavailables 
(CASSANDRA-9507)
 + * Add Sigar to classes included in clientutil.jar (CASSANDRA-11635)
 + * Add decay to histograms and timers used for metrics (CASSANDRA-11752)
 + * Fix hanging stream session (CASSANDRA-10992)
 + * Add byteman support for testing (CASSANDRA-12377)
 + * Fix INSERT JSON, fromJson() support of smallint, tinyint types 
(CASSANDRA-12371)
 + * Restore JVM metric export for metric reporters (CASSANDRA-12312)
 + * Release sstables of failed stream sessions only when outgoing transfers 
are finished (CASSANDRA-11345)
 + * Revert CASSANDRA-11427 (CASSANDRA-12351)
 + * Wait for tracing events before returning response and query at same 
consistency level client side (CASSANDRA-11465)
 + * cqlsh copyutil should get host metadata by connected address 
(CASSANDRA-11979)
 + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
 + * Synchronize ThriftServer::stop() (CASSANDRA-12105)
 + * Use dedicated thread for JMX notifications (CASSANDRA-12146)
 + * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143)
 + * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
 + * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
 + * Don't write shadowed range tombstone (CASSANDRA-12030)
 +Merged from 2.1:
   * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
 - * Include column family parameter when -st and -et are provided 
(CASSANDRA-11866)
 - * Fix queries with empty ByteBuffer values in clustering column restrictions 
(CASSANDRA-12127) 
   * Disable passing control to post-flush after flush failure to prevent data 
loss (CASSANDRA-11828)
   * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
   * cannot 

[08/18] cassandra git commit: Don't skip sstables based on maxLocalDeletionTime

2016-10-21 Thread marcuse
Don't skip sstables based on maxLocalDeletionTime

Patch by Cameron Zemek; reviewed by marcuse for CASSANDRA-12765


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

Branch: refs/heads/trunk
Commit: f7ded1c59287f309f7cd89d576b684c8473bb632
Parents: 83ae5f3
Author: Cameron Zemek 
Authored: Tue Oct 18 11:09:23 2016 +0200
Committer: Marcus Eriksson 
Committed: Fri Oct 21 08:38:40 2016 +0200

--
 CHANGES.txt |  4 ++
 .../cassandra/db/CollationController.java   | 10 ++---
 .../db/CollationControllerCQLTest.java  | 46 
 3 files changed, 53 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7ded1c5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b778444..e922635 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.1.17
+ * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
+
+
 2.1.16
  * Avoid infinitely looping result set when paging SELECT queries with
an IN clause with duplicate keys by treating the IN values as a set instead

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7ded1c5/src/java/org/apache/cassandra/db/CollationController.java
--
diff --git a/src/java/org/apache/cassandra/db/CollationController.java 
b/src/java/org/apache/cassandra/db/CollationController.java
index 8a966bc..0f2674e 100644
--- a/src/java/org/apache/cassandra/db/CollationController.java
+++ b/src/java/org/apache/cassandra/db/CollationController.java
@@ -258,13 +258,9 @@ public class CollationController
 if (!filter.shouldInclude(sstable))
 {
 nonIntersectingSSTables++;
-// sstable contains no tombstone if maxLocalDeletionTime 
== Integer.MAX_VALUE, so we can safely skip those entirely
-if (sstable.getSSTableMetadata().maxLocalDeletionTime != 
Integer.MAX_VALUE)
-{
-if (skippedSSTables == null)
-skippedSSTables = new ArrayList<>();
-skippedSSTables.add(sstable);
-}
+if (skippedSSTables == null)
+skippedSSTables = new ArrayList<>();
+skippedSSTables.add(sstable);
 continue;
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7ded1c5/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java 
b/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java
new file mode 100644
index 000..376678a
--- /dev/null
+++ b/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java
@@ -0,0 +1,46 @@
+/*
+ * 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.db;
+
+import org.junit.Test;
+
+import org.apache.cassandra.cql3.CQLTester;
+import org.apache.cassandra.cql3.UntypedResultSet;
+import static org.junit.Assert.assertTrue;
+
+public class CollationControllerCQLTest extends CQLTester
+{
+@Test
+public void partitionLevelDeletionTest() throws Throwable
+{
+createTable("CREATE TABLE %s (bucket_id TEXT,name TEXT,data 
TEXT,PRIMARY KEY (bucket_id, name))");
+execute("insert into %s (bucket_id, name, data) values 
('8772618c9009cf8f5a5e0c18', 'test', 'hello')");
+getCurrentColumnFamilyStore().forceBlockingFlush();
+execute("insert into %s (bucket_id, name, data) values 
('8772618c9009cf8f5a5e0c19', 'test2', 'hello');");
+execute("delete from %s where 

[17/18] cassandra git commit: Merge branch 'cameron/12765-3.0' into cameron/12765-3.X

2016-10-21 Thread marcuse
Merge branch 'cameron/12765-3.0' into cameron/12765-3.X


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

Branch: refs/heads/trunk
Commit: 575927b1e6ea9a718d62b7b6b72628753b08e59a
Parents: f51ee61 7976d65
Author: Marcus Eriksson 
Authored: Fri Oct 21 09:03:31 2016 +0200
Committer: Marcus Eriksson 
Committed: Fri Oct 21 09:03:31 2016 +0200

--
 CHANGES.txt |  2 +
 .../db/SinglePartitionReadCommand.java  |  3 +-
 .../io/sstable/format/SSTableReader.java|  2 +-
 .../db/SinglePartitionReadCommandCQLTest.java   | 41 
 4 files changed, 46 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/575927b1/CHANGES.txt
--
diff --cc CHANGES.txt
index 13653b7,f14eb22..105791b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -136,52 -33,34 +136,54 @@@ Merged from 2.2
   * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
   * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
   * Decrement pending range calculator jobs counter in finally block
 -  (CASSANDRA-12554)
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
+ Merged from 2.1:
 - * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
+  * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
  
  
 -3.0.9
 - * Handle composite prefixes with final EOC=0 as in 2.x and refactor 
LegacyLayout.decodeBound (CASSANDRA-12423)
 +3.8, 3.9
 + * Fix value skipping with counter columns (CASSANDRA-11726)
 + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool 
(CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" 
session (CASSANDRA-11425)
 + * Add repaired percentage metric (CASSANDRA-11503)
 + * Add Change-Data-Capture (CASSANDRA-8844)
 +Merged from 3.0:
   * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195)
 - * select_distinct_with_deletions_test failing on non-vnode environments 
(CASSANDRA-11126)
 - * Stack Overflow returned to queries while upgrading 

[18/18] cassandra git commit: Merge branch 'cameron/12765-3.X' into cameron/12765-trunk

2016-10-21 Thread marcuse
Merge branch 'cameron/12765-3.X' into cameron/12765-trunk


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

Branch: refs/heads/trunk
Commit: 2e15fc37ff47f404afbbefc8be9a9109ca0a2492
Parents: 456c028 575927b
Author: Marcus Eriksson 
Authored: Fri Oct 21 09:10:14 2016 +0200
Committer: Marcus Eriksson 
Committed: Fri Oct 21 09:10:14 2016 +0200

--
 CHANGES.txt |  2 +
 .../db/SinglePartitionReadCommand.java  |  3 +-
 .../io/sstable/format/SSTableReader.java|  2 +-
 .../db/SinglePartitionReadCommandCQLTest.java   | 41 
 4 files changed, 46 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e15fc37/CHANGES.txt
--
diff --cc CHANGES.txt
index 1e9bc7d,105791b..bd355ef
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -148,7 -140,8 +148,9 @@@ Merged from 2.2
   * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
   * Fail repair on non-existing table (CASSANDRA-12279)
   * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
 + * Better handle invalid system roles table (CASSANDRA-12700)
+ Merged from 2.1:
+  * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
  
  
  3.8, 3.9

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e15fc37/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
--



[15/18] cassandra git commit: Merge branch 'cameron/12765-2.2' into cameron/12765-3.0

2016-10-21 Thread marcuse
Merge branch 'cameron/12765-2.2' into cameron/12765-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 7976d65af230b8322a54a4462f2ea37bbe185a71
Parents: 8b04ec9 a370409
Author: Marcus Eriksson 
Authored: Fri Oct 21 08:55:20 2016 +0200
Committer: Marcus Eriksson 
Committed: Fri Oct 21 08:55:20 2016 +0200

--
 CHANGES.txt |  1 +
 .../db/SinglePartitionReadCommand.java  |  6 +--
 .../io/sstable/format/SSTableReader.java|  8 
 .../db/SinglePartitionReadCommandCQLTest.java   | 41 
 4 files changed, 53 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7976d65a/CHANGES.txt
--
diff --cc CHANGES.txt
index b309e96,efd0f5c..f14eb22
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -34,64 -16,6 +34,65 @@@ Merged from 2.2
   * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
   * Decrement pending range calculator jobs counter in finally block
(CASSANDRA-12554)
 +Merged from 2.1:
 + * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
++ * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
 +
 +
 +3.0.9
 + * Handle composite prefixes with final EOC=0 as in 2.x and refactor 
LegacyLayout.decodeBound (CASSANDRA-12423)
 + * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195)
 + * select_distinct_with_deletions_test failing on non-vnode environments 
(CASSANDRA-11126)
 + * Stack Overflow returned to queries while upgrading (CASSANDRA-12527)
 + * Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565)
 + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata 
(CASSANDRA-12208)
 + * Fix file system race condition that may cause LogAwareFileLister to fail 
to classify files (CASSANDRA-11889)
 + * Fix file handle leaks due to simultaneous compaction/repair and
 +   listing snapshots, calculating snapshot sizes, or making schema
 +   changes (CASSANDRA-11594)
 + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508)
 + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
 + * Calculate last compacted key on startup (CASSANDRA-6216)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names 

[16/18] cassandra git commit: Merge branch 'cameron/12765-3.0' into cameron/12765-3.X

2016-10-21 Thread marcuse
Merge branch 'cameron/12765-3.0' into cameron/12765-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 575927b1e6ea9a718d62b7b6b72628753b08e59a
Parents: f51ee61 7976d65
Author: Marcus Eriksson 
Authored: Fri Oct 21 09:03:31 2016 +0200
Committer: Marcus Eriksson 
Committed: Fri Oct 21 09:03:31 2016 +0200

--
 CHANGES.txt |  2 +
 .../db/SinglePartitionReadCommand.java  |  3 +-
 .../io/sstable/format/SSTableReader.java|  2 +-
 .../db/SinglePartitionReadCommandCQLTest.java   | 41 
 4 files changed, 46 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/575927b1/CHANGES.txt
--
diff --cc CHANGES.txt
index 13653b7,f14eb22..105791b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -136,52 -33,34 +136,54 @@@ Merged from 2.2
   * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
   * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
   * Decrement pending range calculator jobs counter in finally block
 -  (CASSANDRA-12554)
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
+ Merged from 2.1:
 - * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
+  * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
  
  
 -3.0.9
 - * Handle composite prefixes with final EOC=0 as in 2.x and refactor 
LegacyLayout.decodeBound (CASSANDRA-12423)
 +3.8, 3.9
 + * Fix value skipping with counter columns (CASSANDRA-11726)
 + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool 
(CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" 
session (CASSANDRA-11425)
 + * Add repaired percentage metric (CASSANDRA-11503)
 + * Add Change-Data-Capture (CASSANDRA-8844)
 +Merged from 3.0:
   * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195)
 - * select_distinct_with_deletions_test failing on non-vnode environments 
(CASSANDRA-11126)
 - * Stack Overflow returned to queries while 

[01/18] cassandra git commit: Include SSTable path in compacting large row message

2016-10-21 Thread marcuse
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 83ae5f339 -> f7ded1c59
  refs/heads/cassandra-2.2 4eed687d3 -> a370409c8
  refs/heads/cassandra-3.0 8b04ec908 -> 7976d65af
  refs/heads/cassandra-3.X f51ee61f9 -> 575927b1e
  refs/heads/trunk 456c0280e -> 2e15fc37f


Include SSTable path in compacting large row message

Patch by Sankalp Kohli; Reviewed by Nate McCall for CASSANDRA-12384


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

Branch: refs/heads/cassandra-3.X
Commit: 8b04ec908854f8301533107b81e7508de993b671
Parents: 4ba91cd
Author: Nate McCall 
Authored: Fri Oct 21 15:00:50 2016 +1300
Committer: Nate McCall 
Committed: Fri Oct 21 15:00:50 2016 +1300

--
 CHANGES.txt| 1 +
 .../org/apache/cassandra/io/sstable/format/big/BigTableWriter.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b04ec90/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 82348d5..b309e96 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.10
+ * Include SSTable filename in compacting large row message (CASSANDRA-12384)
  * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
  * Fix ViewTest.testCompaction (CASSANDRA-12789)
  * Improve avg aggregate functions (CASSANDRA-12417)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b04ec90/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
--
diff --git 
a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java 
b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
index d3630d7..0d500c1 100644
--- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
@@ -168,7 +168,7 @@ public class BigTableWriter extends SSTableWriter
 if (rowSize > 
DatabaseDescriptor.getCompactionLargePartitionWarningThreshold())
 {
 String keyString = 
metadata.getKeyValidator().getString(key.getKey());
-logger.warn("Writing large partition {}/{}:{} ({} bytes)", 
metadata.ksName, metadata.cfName, keyString, rowSize);
+logger.warn("Writing large partition {}/{}:{} ({} bytes to sstable 
{}) ", metadata.ksName, metadata.cfName, keyString, rowSize, getFilename());
 }
 }
 



[09/18] cassandra git commit: Merge branch 'cameron/12765-2.1' into cameron/12765-2.2

2016-10-21 Thread marcuse
Merge branch 'cameron/12765-2.1' into cameron/12765-2.2


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

Branch: refs/heads/trunk
Commit: a370409c802edfbce6a1682083df5cb5f376a34b
Parents: 4eed687 f7ded1c
Author: Marcus Eriksson 
Authored: Fri Oct 21 08:40:20 2016 +0200
Committer: Marcus Eriksson 
Committed: Fri Oct 21 08:40:20 2016 +0200

--
 CHANGES.txt |  8 +++-
 .../cassandra/db/CollationController.java   | 10 ++---
 .../db/CollationControllerCQLTest.java  | 46 
 3 files changed, 55 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a370409c/CHANGES.txt
--
diff --cc CHANGES.txt
index 41e3f94,e922635..efd0f5c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,14 +1,50 @@@
 +2.2.9
 + * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
 + * Limit colUpdateTimeDelta histogram updates to reasonable deltas 
(CASSANDRA-7)
 + * Fix leak errors and execution rejected exceptions when draining 
(CASSANDRA-12457)
 + * Fix merkle tree depth calculation (CASSANDRA-12580)
 + * Make Collections deserialization more robust (CASSANDRA-12618)
 + * Better handle invalid system roles table (CASSANDRA-12700)
-  
-  
++Merged from 2.1:
++===
+ 2.1.17
+  * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
+ 
+ 
 -2.1.16
 - * Avoid infinitely looping result set when paging SELECT queries with
 -   an IN clause with duplicate keys by treating the IN values as a set instead
 -   of a list (CASSANDRA-12420)
 +2.2.8
 + * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
 + * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
 + * Decrement pending range calculator jobs counter in finally block
 +  (CASSANDRA-12554)
 + * Add local address entry in PropertyFileSnitch (CASSANDRA-11332)
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * cqlsh copy: fix missing counter values (CASSANDRA-12476)
 + * Move migration tasks to non-periodic queue, assure flush executor shutdown 
after non-periodic executor (CASSANDRA-12251)
 + * cqlsh copy: fixed possible race in initializing feeding thread 
(CASSANDRA-11701)
 + * Only set broadcast_rpc_address on Ec2MultiRegionSnitch if it's not set 
(CASSANDRA-11357)
 + * Update StorageProxy range metrics for timeouts, failures and unavailables 
(CASSANDRA-9507)
 + * Add Sigar to classes included in clientutil.jar (CASSANDRA-11635)
 + * Add decay to histograms and timers used for metrics (CASSANDRA-11752)
 + * Fix hanging stream session (CASSANDRA-10992)
 + * Add byteman support for testing (CASSANDRA-12377)
 + * Fix INSERT JSON, fromJson() support of smallint, tinyint types 
(CASSANDRA-12371)
 + * Restore JVM metric export for metric reporters (CASSANDRA-12312)
 + * Release sstables of failed stream sessions only when outgoing transfers 
are finished (CASSANDRA-11345)
 + * Revert CASSANDRA-11427 (CASSANDRA-12351)
 + * Wait for tracing events before returning response and query at same 
consistency level client side (CASSANDRA-11465)
 + * cqlsh copyutil should get host metadata by connected address 
(CASSANDRA-11979)
 + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
 + * Synchronize ThriftServer::stop() (CASSANDRA-12105)
 + * Use dedicated thread for JMX notifications (CASSANDRA-12146)
 + * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143)
 + * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
 + * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
 + * Don't write shadowed range tombstone (CASSANDRA-12030)
 +Merged from 2.1:
   * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
 - * Include column family parameter when -st and -et are provided 
(CASSANDRA-11866)
 - * Fix queries with empty ByteBuffer values in clustering column restrictions 
(CASSANDRA-12127) 
   * Disable passing control to post-flush after flush failure to prevent data 
loss (CASSANDRA-11828)
   * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
   * cannot use cql 

[07/18] cassandra git commit: Don't skip sstables based on maxLocalDeletionTime

2016-10-21 Thread marcuse
Don't skip sstables based on maxLocalDeletionTime

Patch by Cameron Zemek; reviewed by marcuse for CASSANDRA-12765


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

Branch: refs/heads/cassandra-2.1
Commit: f7ded1c59287f309f7cd89d576b684c8473bb632
Parents: 83ae5f3
Author: Cameron Zemek 
Authored: Tue Oct 18 11:09:23 2016 +0200
Committer: Marcus Eriksson 
Committed: Fri Oct 21 08:38:40 2016 +0200

--
 CHANGES.txt |  4 ++
 .../cassandra/db/CollationController.java   | 10 ++---
 .../db/CollationControllerCQLTest.java  | 46 
 3 files changed, 53 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7ded1c5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b778444..e922635 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.1.17
+ * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
+
+
 2.1.16
  * Avoid infinitely looping result set when paging SELECT queries with
an IN clause with duplicate keys by treating the IN values as a set instead

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7ded1c5/src/java/org/apache/cassandra/db/CollationController.java
--
diff --git a/src/java/org/apache/cassandra/db/CollationController.java 
b/src/java/org/apache/cassandra/db/CollationController.java
index 8a966bc..0f2674e 100644
--- a/src/java/org/apache/cassandra/db/CollationController.java
+++ b/src/java/org/apache/cassandra/db/CollationController.java
@@ -258,13 +258,9 @@ public class CollationController
 if (!filter.shouldInclude(sstable))
 {
 nonIntersectingSSTables++;
-// sstable contains no tombstone if maxLocalDeletionTime 
== Integer.MAX_VALUE, so we can safely skip those entirely
-if (sstable.getSSTableMetadata().maxLocalDeletionTime != 
Integer.MAX_VALUE)
-{
-if (skippedSSTables == null)
-skippedSSTables = new ArrayList<>();
-skippedSSTables.add(sstable);
-}
+if (skippedSSTables == null)
+skippedSSTables = new ArrayList<>();
+skippedSSTables.add(sstable);
 continue;
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7ded1c5/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java 
b/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java
new file mode 100644
index 000..376678a
--- /dev/null
+++ b/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java
@@ -0,0 +1,46 @@
+/*
+ * 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.db;
+
+import org.junit.Test;
+
+import org.apache.cassandra.cql3.CQLTester;
+import org.apache.cassandra.cql3.UntypedResultSet;
+import static org.junit.Assert.assertTrue;
+
+public class CollationControllerCQLTest extends CQLTester
+{
+@Test
+public void partitionLevelDeletionTest() throws Throwable
+{
+createTable("CREATE TABLE %s (bucket_id TEXT,name TEXT,data 
TEXT,PRIMARY KEY (bucket_id, name))");
+execute("insert into %s (bucket_id, name, data) values 
('8772618c9009cf8f5a5e0c18', 'test', 'hello')");
+getCurrentColumnFamilyStore().forceBlockingFlush();
+execute("insert into %s (bucket_id, name, data) values 
('8772618c9009cf8f5a5e0c19', 'test2', 'hello');");
+execute("delete from 

[13/18] cassandra git commit: Merge branch 'cameron/12765-2.2' into cameron/12765-3.0

2016-10-21 Thread marcuse
Merge branch 'cameron/12765-2.2' into cameron/12765-3.0


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

Branch: refs/heads/trunk
Commit: 7976d65af230b8322a54a4462f2ea37bbe185a71
Parents: 8b04ec9 a370409
Author: Marcus Eriksson 
Authored: Fri Oct 21 08:55:20 2016 +0200
Committer: Marcus Eriksson 
Committed: Fri Oct 21 08:55:20 2016 +0200

--
 CHANGES.txt |  1 +
 .../db/SinglePartitionReadCommand.java  |  6 +--
 .../io/sstable/format/SSTableReader.java|  8 
 .../db/SinglePartitionReadCommandCQLTest.java   | 41 
 4 files changed, 53 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7976d65a/CHANGES.txt
--
diff --cc CHANGES.txt
index b309e96,efd0f5c..f14eb22
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -34,64 -16,6 +34,65 @@@ Merged from 2.2
   * Fix authentication problem when invoking cqlsh copy from a SOURCE command 
(CASSANDRA-12642)
   * Decrement pending range calculator jobs counter in finally block
(CASSANDRA-12554)
 +Merged from 2.1:
 + * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
++ * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
 +
 +
 +3.0.9
 + * Handle composite prefixes with final EOC=0 as in 2.x and refactor 
LegacyLayout.decodeBound (CASSANDRA-12423)
 + * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195)
 + * select_distinct_with_deletions_test failing on non-vnode environments 
(CASSANDRA-11126)
 + * Stack Overflow returned to queries while upgrading (CASSANDRA-12527)
 + * Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565)
 + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata 
(CASSANDRA-12208)
 + * Fix file system race condition that may cause LogAwareFileLister to fail 
to classify files (CASSANDRA-11889)
 + * Fix file handle leaks due to simultaneous compaction/repair and
 +   listing snapshots, calculating snapshot sizes, or making schema
 +   changes (CASSANDRA-11594)
 + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508)
 + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
 + * Calculate last compacted key on startup (CASSANDRA-6216)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with 

[05/18] cassandra git commit: Don't skip sstables based on maxLocalDeletionTime

2016-10-21 Thread marcuse
Don't skip sstables based on maxLocalDeletionTime

Patch by Cameron Zemek; reviewed by marcuse for CASSANDRA-12765


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

Branch: refs/heads/cassandra-3.0
Commit: f7ded1c59287f309f7cd89d576b684c8473bb632
Parents: 83ae5f3
Author: Cameron Zemek 
Authored: Tue Oct 18 11:09:23 2016 +0200
Committer: Marcus Eriksson 
Committed: Fri Oct 21 08:38:40 2016 +0200

--
 CHANGES.txt |  4 ++
 .../cassandra/db/CollationController.java   | 10 ++---
 .../db/CollationControllerCQLTest.java  | 46 
 3 files changed, 53 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7ded1c5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b778444..e922635 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.1.17
+ * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
+
+
 2.1.16
  * Avoid infinitely looping result set when paging SELECT queries with
an IN clause with duplicate keys by treating the IN values as a set instead

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7ded1c5/src/java/org/apache/cassandra/db/CollationController.java
--
diff --git a/src/java/org/apache/cassandra/db/CollationController.java 
b/src/java/org/apache/cassandra/db/CollationController.java
index 8a966bc..0f2674e 100644
--- a/src/java/org/apache/cassandra/db/CollationController.java
+++ b/src/java/org/apache/cassandra/db/CollationController.java
@@ -258,13 +258,9 @@ public class CollationController
 if (!filter.shouldInclude(sstable))
 {
 nonIntersectingSSTables++;
-// sstable contains no tombstone if maxLocalDeletionTime 
== Integer.MAX_VALUE, so we can safely skip those entirely
-if (sstable.getSSTableMetadata().maxLocalDeletionTime != 
Integer.MAX_VALUE)
-{
-if (skippedSSTables == null)
-skippedSSTables = new ArrayList<>();
-skippedSSTables.add(sstable);
-}
+if (skippedSSTables == null)
+skippedSSTables = new ArrayList<>();
+skippedSSTables.add(sstable);
 continue;
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7ded1c5/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java 
b/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java
new file mode 100644
index 000..376678a
--- /dev/null
+++ b/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java
@@ -0,0 +1,46 @@
+/*
+ * 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.db;
+
+import org.junit.Test;
+
+import org.apache.cassandra.cql3.CQLTester;
+import org.apache.cassandra.cql3.UntypedResultSet;
+import static org.junit.Assert.assertTrue;
+
+public class CollationControllerCQLTest extends CQLTester
+{
+@Test
+public void partitionLevelDeletionTest() throws Throwable
+{
+createTable("CREATE TABLE %s (bucket_id TEXT,name TEXT,data 
TEXT,PRIMARY KEY (bucket_id, name))");
+execute("insert into %s (bucket_id, name, data) values 
('8772618c9009cf8f5a5e0c18', 'test', 'hello')");
+getCurrentColumnFamilyStore().forceBlockingFlush();
+execute("insert into %s (bucket_id, name, data) values 
('8772618c9009cf8f5a5e0c19', 'test2', 'hello');");
+execute("delete from 

[06/18] cassandra git commit: Don't skip sstables based on maxLocalDeletionTime

2016-10-21 Thread marcuse
Don't skip sstables based on maxLocalDeletionTime

Patch by Cameron Zemek; reviewed by marcuse for CASSANDRA-12765


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

Branch: refs/heads/cassandra-3.X
Commit: f7ded1c59287f309f7cd89d576b684c8473bb632
Parents: 83ae5f3
Author: Cameron Zemek 
Authored: Tue Oct 18 11:09:23 2016 +0200
Committer: Marcus Eriksson 
Committed: Fri Oct 21 08:38:40 2016 +0200

--
 CHANGES.txt |  4 ++
 .../cassandra/db/CollationController.java   | 10 ++---
 .../db/CollationControllerCQLTest.java  | 46 
 3 files changed, 53 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7ded1c5/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b778444..e922635 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.1.17
+ * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
+
+
 2.1.16
  * Avoid infinitely looping result set when paging SELECT queries with
an IN clause with duplicate keys by treating the IN values as a set instead

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7ded1c5/src/java/org/apache/cassandra/db/CollationController.java
--
diff --git a/src/java/org/apache/cassandra/db/CollationController.java 
b/src/java/org/apache/cassandra/db/CollationController.java
index 8a966bc..0f2674e 100644
--- a/src/java/org/apache/cassandra/db/CollationController.java
+++ b/src/java/org/apache/cassandra/db/CollationController.java
@@ -258,13 +258,9 @@ public class CollationController
 if (!filter.shouldInclude(sstable))
 {
 nonIntersectingSSTables++;
-// sstable contains no tombstone if maxLocalDeletionTime 
== Integer.MAX_VALUE, so we can safely skip those entirely
-if (sstable.getSSTableMetadata().maxLocalDeletionTime != 
Integer.MAX_VALUE)
-{
-if (skippedSSTables == null)
-skippedSSTables = new ArrayList<>();
-skippedSSTables.add(sstable);
-}
+if (skippedSSTables == null)
+skippedSSTables = new ArrayList<>();
+skippedSSTables.add(sstable);
 continue;
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7ded1c5/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java 
b/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java
new file mode 100644
index 000..376678a
--- /dev/null
+++ b/test/unit/org/apache/cassandra/db/CollationControllerCQLTest.java
@@ -0,0 +1,46 @@
+/*
+ * 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.db;
+
+import org.junit.Test;
+
+import org.apache.cassandra.cql3.CQLTester;
+import org.apache.cassandra.cql3.UntypedResultSet;
+import static org.junit.Assert.assertTrue;
+
+public class CollationControllerCQLTest extends CQLTester
+{
+@Test
+public void partitionLevelDeletionTest() throws Throwable
+{
+createTable("CREATE TABLE %s (bucket_id TEXT,name TEXT,data 
TEXT,PRIMARY KEY (bucket_id, name))");
+execute("insert into %s (bucket_id, name, data) values 
('8772618c9009cf8f5a5e0c18', 'test', 'hello')");
+getCurrentColumnFamilyStore().forceBlockingFlush();
+execute("insert into %s (bucket_id, name, data) values 
('8772618c9009cf8f5a5e0c19', 'test2', 'hello');");
+execute("delete from 

[jira] [Updated] (CASSANDRA-12765) SSTable ignored incorrectly with partition level tombstone

2016-10-21 Thread Marcus Eriksson (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-12765?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Marcus Eriksson updated CASSANDRA-12765:

Summary: SSTable ignored incorrectly with partition level tombstone  (was: 
SSTable ignored incorrectly with row level tombstone)

> SSTable ignored incorrectly with partition level tombstone
> --
>
> Key: CASSANDRA-12765
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12765
> Project: Cassandra
>  Issue Type: Bug
>  Components: Local Write-Read Paths
>Reporter: Cameron Zemek
>Assignee: Cameron Zemek
> Attachments: 12765.patch
>
>
> {noformat}
> CREATE TABLE test.payload(
>   bucket_id TEXT,
>   name TEXT,
>   data TEXT,
>   PRIMARY KEY (bucket_id, name)
> );
> insert into test.payload (bucket_id, name, data) values 
> ('8772618c9009cf8f5a5e0c18', 'test', 'hello');
> {noformat}
> Flush nodes (nodetool flush)
> {noformat}
> insert into test.payload (bucket_id, name, data) values 
> ('8772618c9009cf8f5a5e0c19', 'test2', 'hello');
> delete from test.payload where bucket_id = '8772618c9009cf8f5a5e0c18';
> {noformat}
> Flush nodes (nodetool flush)
> {noformat}
> select * from test.payload where bucket_id = '8772618c9009cf8f5a5e0c18' and 
> name = 'test';
> {noformat}
> Expected 0 rows but get 1 row back.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (CASSANDRA-12802) RecoveryManagerTruncateTest fails in 2.1

2016-10-21 Thread Stefania (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12802?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15594215#comment-15594215
 ] 

Stefania commented on CASSANDRA-12802:
--

Unfortunately there were 2 timeouts in the multiplexed run above. Given that 
each test normally completes in about 8 seconds, I'm guessing these were two 
deadlocks. I need to find a way to extract a stack trace from Jenkins to debug 
further.

> RecoveryManagerTruncateTest fails in 2.1
> 
>
> Key: CASSANDRA-12802
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12802
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Stefania
>Assignee: Stefania
> Fix For: 2.1.x
>
>
> Example failure:
> http://cassci.datastax.com/view/cassandra-2.1/job/cassandra-2.1_testall/388/testReport/junit/org.apache.cassandra.db/RecoveryManagerTruncateTest/testTruncatePointInTime/



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)


[jira] [Commented] (CASSANDRA-12490) Add sequence distribution type to cassandra stress

2016-10-21 Thread Stefania (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-12490?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15594193#comment-15594193
 ] 

Stefania commented on CASSANDRA-12490:
--

Thank you for the update, it LGTM.

I've launched the CI jobs here:

||3.X||trunk||
|[patch|https://github.com/stef1927/cassandra/tree/12490-3.X]|[patch|https://github.com/stef1927/cassandra/tree/12490]|
|[testall|http://cassci.datastax.com/view/Dev/view/stef1927/job/stef1927-12490-3.X-testall/]|[testall|http://cassci.datastax.com/view/Dev/view/stef1927/job/stef1927-12490-testall/]|
|[dtest|http://cassci.datastax.com/view/Dev/view/stef1927/job/stef1927-12490-3.X-dtest/]|[dtest|http://cassci.datastax.com/view/Dev/view/stef1927/job/stef1927-12490-dtest/]|


> Add sequence distribution type to cassandra stress
> --
>
> Key: CASSANDRA-12490
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12490
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Tools
>Reporter: Ben Slater
>Assignee: Ben Slater
>Priority: Minor
> Fix For: 3.10
>
> Attachments: 12490-trunk.patch, 12490.yaml, 
> 12490updatev2-trunk.patch, cqlstress-seq-example.yaml
>
>
> When using the write command, cassandra stress sequentially generates seeds. 
> This ensures generated values don't overlap (unless the sequence wraps) 
> providing more predictable number of inserted records (and generating a base 
> set of data without wasted writes).
> When using a yaml stress spec there is no sequenced distribution available. 
> It think it would be useful to have this for doing initial load of data for 
> testing 



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)