cassandra git commit: prep 3.2.1 release

[jake]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.2.1 159049db7 -> 2ac95bd6c


prep 3.2.1 release


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

Branch: refs/heads/cassandra-3.2.1
Commit: 2ac95bd6c5699a605e6f4256cb17b016c99e6dda
Parents: 159049d
Author: T Jake Luciani 
Authored: Thu Jan 14 10:19:07 2016 -0500
Committer: T Jake Luciani 
Committed: Thu Jan 14 10:19:07 2016 -0500

--
 NEWS.txt | 10 ++
 build.xml|  2 +-
 debian/changelog |  6 ++
 3 files changed, 17 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ac95bd6/NEWS.txt
--
diff --git a/NEWS.txt b/NEWS.txt
index c995d89..ab73f2f 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,6 +13,16 @@ restore snapshots created with the previous major version 
using the
 'sstableloader' tool. You can upgrade the file format of your snapshots
 using the provided 'sstableupgrade' tool.
 
+
+3.2.1
+=
+
+Upgrading
+-
+- Nothing specific to this release, but please see 3.2 if you are upgrading
+  from a previous version.
+
+
 3.2
 ===
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ac95bd6/build.xml
--
diff --git a/build.xml b/build.xml
index 51589bb..00fa07f 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
 
 
 
-
+
 
 
 http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ac95bd6/debian/changelog
--
diff --git a/debian/changelog b/debian/changelog
index 7e455ac..803a50b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (3.2.1) unstable; urgency=medium
+
+  * New release
+
+ -- Jake Luciani   Thu, 14 Jan 2016 10:18:26 -0500
+
 cassandra (3.2) unstable; urgency=medium
 
   * New release

[jira] [Updated] (CASSANDRA-10947) Remained files in the hints folder

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko updated CASSANDRA-10947:
--
Component/s: Local Write-Read Paths
 Coordination

> Remained files in the hints folder
> --
>
> Key: CASSANDRA-10947
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10947
> Project: Cassandra
>  Issue Type: Bug
>  Components: Coordination, Local Write-Read Paths
> Environment: Cassandra 3.0.0, CentOS 7.2 x64
>Reporter: Gábor Auth
>Assignee: Aleksey Yeschenko
> Fix For: 3.0.x, 3.x
>
>
> I've found a lot of (over 2 million) .crc32 files in the hints folder:
> {code}
> [data]# du --max-depth=1
> 7800./saved_caches
> 271420  ./data
> 175776  ./commitlog
> 9219368 ./hints
> 9674368 .
> [data]# ls -1 hints/ | wc -l
> 2250624
> [data]# du hints/
> 9220336 hints/
> {code}



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

[jira] [Commented] (CASSANDRA-10947) Remained files in the hints folder

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko commented on CASSANDRA-10947:
---

||branch||testall||dtest||
|[10947-3.0|https://github.com/iamaleksey/cassandra/tree/10947-3.0]|[testall|http://cassci.datastax.com/view/Dev/view/iamaleksey/job/iamaleksey-10947-3.0-testall]|[dtest|http://cassci.datastax.com/view/Dev/view/iamaleksey/job/iamaleksey-10947-3.0-dtest]|
|[10947-3.3|https://github.com/iamaleksey/cassandra/tree/10947-3.3]|[testall|http://cassci.datastax.com/view/Dev/view/iamaleksey/job/iamaleksey-10947-3.3-testall]|[dtest|http://cassci.datastax.com/view/Dev/view/iamaleksey/job/iamaleksey-10947-3.3-dtest]|

> Remained files in the hints folder
> --
>
> Key: CASSANDRA-10947
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10947
> Project: Cassandra
>  Issue Type: Bug
>  Components: Coordination, Local Write-Read Paths
> Environment: Cassandra 3.0.0, CentOS 7.2 x64
>Reporter: Gábor Auth
>Assignee: Aleksey Yeschenko
> Fix For: 3.0.x, 3.x
>
>
> I've found a lot of (over 2 million) .crc32 files in the hints folder:
> {code}
> [data]# du --max-depth=1
> 7800./saved_caches
> 271420  ./data
> 175776  ./commitlog
> 9219368 ./hints
> 9674368 .
> [data]# ls -1 hints/ | wc -l
> 2250624
> [data]# du hints/
> 9220336 hints/
> {code}



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

[jira] [Commented] (CASSANDRA-10997) cqlsh_copy_tests failing en mass when vnodes are disabled

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko commented on CASSANDRA-10997:
---

[~Stefania] Can you clarify merge requirements here?

What branches can be merge automatically, and where should I apply the delta 
from the branches you provided, or else risk issues?

My understanding here is that 2.1 and 2.2 patches are different, but the merge 
into 3.0 -> 3.3 -> trunk should be clean, and the code is identical?

If so, can you provide an actual patch for 2.2? As a text file, or a 2.2 based 
branch without a merge commit?

Thanks.

> cqlsh_copy_tests failing en mass when vnodes are disabled
> -
>
> Key: CASSANDRA-10997
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10997
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Philip Thompson
>Assignee: Stefania
>  Labels: dtest
> Fix For: 2.1.x, 2.2.x, 3.0.x, 3.x
>
>
> Check out [an example cassci 
> failure|http://cassci.datastax.com/job/cassandra-2.1_novnode_dtest/186/testReport/cqlsh_tests.cqlsh_copy_tests/CqlshCopyTest/test_list_data/]
>  as well as the [full novnode report 
> page|http://cassci.datastax.com/userContent/cstar_report/index.html?jobs=cassandra-2.1_novnode_dtest,cassandra-3.0_novnode_dtest,cassandra-2.2_novnode_dtest_known=true].
> Many COPY TO tests are failing when the cluster only has one token. The 
> message {{Found no ranges to query, check begin and end tokens: None - None}} 
> is printed, and it appears to be coming from cqlsh, specfically in 
> pylib/cqlshlib/copyutil.py



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

[jira] [Updated] (CASSANDRA-10980) nodetool scrub NPEs when keyspace isn't specified

[Yuki Morishita (JIRA)]

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

Yuki Morishita updated CASSANDRA-10980:
---
Component/s: Compaction

> nodetool scrub NPEs when keyspace isn't specified
> -
>
> Key: CASSANDRA-10980
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10980
> Project: Cassandra
>  Issue Type: Bug
>  Components: Compaction, Tools
> Environment: Cassandra (and nodetool) version 3.1
>Reporter: Will Hayworth
>Assignee: Yuki Morishita
>Priority: Trivial
>  Labels: lhf
> Fix For: 2.2.5, 3.0.3, 3.3
>
> Attachments: nodetool_scrub_npe.txt
>
>
> I've attached logs of what I saw. Running nodetool scrub without anything 
> else specified resulted in the NPE. Running with the keyspace specified saw 
> successful termination.



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

[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 97474ee36adcd960db4916cd33b533c086228f70
Parents: dbf6e62 26dc07b
Author: Aleksey Yeschenko 
Authored: Thu Jan 14 15:49:16 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 15:49:16 2016 +

--

--

[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/162edc26
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/162edc26
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/162edc26

Branch: refs/heads/cassandra-3.3
Commit: 162edc26eba31607ccacf430460139f3e48ae6d8
Parents: 06960d7 97474ee
Author: Aleksey Yeschenko 
Authored: Thu Jan 14 15:49:49 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 15:49:49 2016 +

--

--

[02/15] cassandra git commit: (cqlsh) fix formatting bytearray values

[aleksey]

(cqlsh) fix formatting bytearray values

patch by Stefania Alborghetti; reviewed by Jim Witschey for
CASSANDRA-10839


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

Branch: refs/heads/cassandra-2.2
Commit: 26dc07b7db6334fd7d7f54ba0f4e8359117e60e9
Parents: c0747d2
Author: Stefania Alborghetti 
Authored: Tue Dec 22 14:18:26 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 15:48:10 2016 +

--
 CHANGES.txt  | 1 +
 pylib/cqlshlib/formatting.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26dc07b7/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 552aca2..9c73adf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.13
+ * (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
  * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
  * Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
  * If CompactionMetadata is not in stats file, use index summary instead 
(CASSANDRA-10676)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26dc07b7/pylib/cqlshlib/formatting.py
--
diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py
index c88ffaf..abb4896 100644
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@ -126,7 +126,7 @@ def formatter_for(typname):
 
 @formatter_for('bytearray')
 def format_value_blob(val, colormap, **_):
-bval = '0x' + binascii.hexlify(val)
+bval = '0x' + binascii.hexlify(str(val))
 return colorme(bval, colormap, 'blob')
 formatter_for('buffer')(format_value_blob)
 

[15/15] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

[aleksey]

Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: ef4d4506ea01e9770cbeea9554b217fff4a1a526
Parents: efc7d1b 09364e0
Author: Aleksey Yeschenko 
Authored: Thu Jan 14 15:50:19 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 15:50:19 2016 +

--

--

[05/15] cassandra git commit: (cqlsh) fix formatting bytearray values

[aleksey]

(cqlsh) fix formatting bytearray values

patch by Stefania Alborghetti; reviewed by Jim Witschey for
CASSANDRA-10839


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

Branch: refs/heads/cassandra-3.3
Commit: 26dc07b7db6334fd7d7f54ba0f4e8359117e60e9
Parents: c0747d2
Author: Stefania Alborghetti 
Authored: Tue Dec 22 14:18:26 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 15:48:10 2016 +

--
 CHANGES.txt  | 1 +
 pylib/cqlshlib/formatting.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26dc07b7/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 552aca2..9c73adf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.13
+ * (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
  * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
  * Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
  * If CompactionMetadata is not in stats file, use index summary instead 
(CASSANDRA-10676)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26dc07b7/pylib/cqlshlib/formatting.py
--
diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py
index c88ffaf..abb4896 100644
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@ -126,7 +126,7 @@ def formatter_for(typname):
 
 @formatter_for('bytearray')
 def format_value_blob(val, colormap, **_):
-bval = '0x' + binascii.hexlify(val)
+bval = '0x' + binascii.hexlify(str(val))
 return colorme(bval, colormap, 'blob')
 formatter_for('buffer')(format_value_blob)
 

[13/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.3


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

Branch: refs/heads/cassandra-3.3
Commit: 09364e03efc9b68e08d2aa36de8ee93f026543b0
Parents: e1938e2 162edc2
Author: Aleksey Yeschenko 
Authored: Thu Jan 14 15:50:12 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 15:50:12 2016 +

--

--

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

[aleksey]

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/162edc26
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/162edc26
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/162edc26

Branch: refs/heads/trunk
Commit: 162edc26eba31607ccacf430460139f3e48ae6d8
Parents: 06960d7 97474ee
Author: Aleksey Yeschenko 
Authored: Thu Jan 14 15:49:49 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 15:49:49 2016 +

--

--

[12/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/162edc26
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/162edc26
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/162edc26

Branch: refs/heads/cassandra-3.0
Commit: 162edc26eba31607ccacf430460139f3e48ae6d8
Parents: 06960d7 97474ee
Author: Aleksey Yeschenko 
Authored: Thu Jan 14 15:49:49 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 15:49:49 2016 +

--

--

[09/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.3
Commit: 97474ee36adcd960db4916cd33b533c086228f70
Parents: dbf6e62 26dc07b
Author: Aleksey Yeschenko 
Authored: Thu Jan 14 15:49:16 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 15:49:16 2016 +

--

--

[08/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: 97474ee36adcd960db4916cd33b533c086228f70
Parents: dbf6e62 26dc07b
Author: Aleksey Yeschenko 
Authored: Thu Jan 14 15:49:16 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 15:49:16 2016 +

--

--

[01/15] cassandra git commit: (cqlsh) fix formatting bytearray values

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 c0747d285 -> 26dc07b7d
  refs/heads/cassandra-2.2 dbf6e62c3 -> 97474ee36
  refs/heads/cassandra-3.0 06960d752 -> 162edc26e
  refs/heads/cassandra-3.3 e1938e2e7 -> 09364e03e
  refs/heads/trunk efc7d1b9a -> ef4d4506e


(cqlsh) fix formatting bytearray values

patch by Stefania Alborghetti; reviewed by Jim Witschey for
CASSANDRA-10839


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

Branch: refs/heads/cassandra-2.1
Commit: 26dc07b7db6334fd7d7f54ba0f4e8359117e60e9
Parents: c0747d2
Author: Stefania Alborghetti 
Authored: Tue Dec 22 14:18:26 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 15:48:10 2016 +

--
 CHANGES.txt  | 1 +
 pylib/cqlshlib/formatting.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26dc07b7/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 552aca2..9c73adf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.13
+ * (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
  * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
  * Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
  * If CompactionMetadata is not in stats file, use index summary instead 
(CASSANDRA-10676)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26dc07b7/pylib/cqlshlib/formatting.py
--
diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py
index c88ffaf..abb4896 100644
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@ -126,7 +126,7 @@ def formatter_for(typname):
 
 @formatter_for('bytearray')
 def format_value_blob(val, colormap, **_):
-bval = '0x' + binascii.hexlify(val)
+bval = '0x' + binascii.hexlify(str(val))
 return colorme(bval, colormap, 'blob')
 formatter_for('buffer')(format_value_blob)
 

[04/15] cassandra git commit: (cqlsh) fix formatting bytearray values

[aleksey]

(cqlsh) fix formatting bytearray values

patch by Stefania Alborghetti; reviewed by Jim Witschey for
CASSANDRA-10839


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

Branch: refs/heads/cassandra-3.0
Commit: 26dc07b7db6334fd7d7f54ba0f4e8359117e60e9
Parents: c0747d2
Author: Stefania Alborghetti 
Authored: Tue Dec 22 14:18:26 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 15:48:10 2016 +

--
 CHANGES.txt  | 1 +
 pylib/cqlshlib/formatting.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26dc07b7/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 552aca2..9c73adf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.13
+ * (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
  * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
  * Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
  * If CompactionMetadata is not in stats file, use index summary instead 
(CASSANDRA-10676)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26dc07b7/pylib/cqlshlib/formatting.py
--
diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py
index c88ffaf..abb4896 100644
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@ -126,7 +126,7 @@ def formatter_for(typname):
 
 @formatter_for('bytearray')
 def format_value_blob(val, colormap, **_):
-bval = '0x' + binascii.hexlify(val)
+bval = '0x' + binascii.hexlify(str(val))
 return colorme(bval, colormap, 'blob')
 formatter_for('buffer')(format_value_blob)
 

[07/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: 97474ee36adcd960db4916cd33b533c086228f70
Parents: dbf6e62 26dc07b
Author: Aleksey Yeschenko 
Authored: Thu Jan 14 15:49:16 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 15:49:16 2016 +

--

--

[03/15] cassandra git commit: (cqlsh) fix formatting bytearray values

[aleksey]

(cqlsh) fix formatting bytearray values

patch by Stefania Alborghetti; reviewed by Jim Witschey for
CASSANDRA-10839


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

Branch: refs/heads/trunk
Commit: 26dc07b7db6334fd7d7f54ba0f4e8359117e60e9
Parents: c0747d2
Author: Stefania Alborghetti 
Authored: Tue Dec 22 14:18:26 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 15:48:10 2016 +

--
 CHANGES.txt  | 1 +
 pylib/cqlshlib/formatting.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26dc07b7/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 552aca2..9c73adf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.13
+ * (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
  * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
  * Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
  * If CompactionMetadata is not in stats file, use index summary instead 
(CASSANDRA-10676)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26dc07b7/pylib/cqlshlib/formatting.py
--
diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py
index c88ffaf..abb4896 100644
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@ -126,7 +126,7 @@ def formatter_for(typname):
 
 @formatter_for('bytearray')
 def format_value_blob(val, colormap, **_):
-bval = '0x' + binascii.hexlify(val)
+bval = '0x' + binascii.hexlify(str(val))
 return colorme(bval, colormap, 'blob')
 formatter_for('buffer')(format_value_blob)
 

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.3


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

Branch: refs/heads/trunk
Commit: 09364e03efc9b68e08d2aa36de8ee93f026543b0
Parents: e1938e2 162edc2
Author: Aleksey Yeschenko 
Authored: Thu Jan 14 15:50:12 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 15:50:12 2016 +

--

--

[jira] [Updated] (CASSANDRA-11010) Bootstrap hangs on 3.2

[T Jake Luciani (JIRA)]

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

T Jake Luciani updated CASSANDRA-11010:
---
Labels: fallout  (was: )

> Bootstrap hangs on 3.2
> --
>
> Key: CASSANDRA-11010
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11010
> Project: Cassandra
>  Issue Type: Bug
>Reporter: T Jake Luciani
>Assignee: Paulo Motta
>Priority: Blocker
>  Labels: fallout
> Fix For: 3.3, 3.2.1
>
>
> Doing some testing I've noticed with 3.2 nodes can hang when bootstrapping. 
> below is the snippet from the log of a hung node.
> {quote}
> INFO  [main] 2016-01-14 02:53:25,537 StorageService.java:1281 - JOINING: 
> Starting to bootstrap...
> INFO  [main] 2016-01-14 02:53:25,564 StreamResultFuture.java:88 - [Stream 
> #fb512640-ba69-11e5-8f71-f38b96ae2156] Executing streaming plan for Bootstrap
> DEBUG [main] 2016-01-14 02:53:25,564 StreamCoordinator.java:144 - Connecting 
> next session fb512640-ba69-11e5-8f71-f38b96ae2156 with 172.31.4.27.
> INFO  [StreamConnectionEstablisher:1] 2016-01-14 02:53:25,565 
> StreamSession.java:238 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Starting streaming to /172.31.4.27
> DEBUG [StreamConnectionEstablisher:1] 2016-01-14 02:53:25,566 
> ConnectionHandler.java:82 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Sending stream init for incoming stream
> DEBUG [StreamConnectionEstablisher:1] 2016-01-14 02:53:25,568 
> ConnectionHandler.java:87 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Sending stream init for outgoing stream
> INFO  [StreamConnectionEstablisher:1] 2016-01-14 02:53:25,574 
> StreamCoordinator.java:266 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156, 
> ID#0] Beginning stream session with /172.31.4.27
> DEBUG [STREAM-OUT-/172.31.4.27] 2016-01-14 02:53:25,574 
> ConnectionHandler.java:334 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Sending Prepare (2 requests,  0 files}
> DEBUG [STREAM-IN-/172.31.4.27] 2016-01-14 02:53:25,597 
> ConnectionHandler.java:262 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Received Prepare (0 requests,  0 files}
> DEBUG [STREAM-OUT-/172.31.4.27] 2016-01-14 02:53:25,597 
> ConnectionHandler.java:334 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Sending Complete
> DEBUG [STREAM-IN-/172.31.4.27] 2016-01-14 02:53:25,597 
> ConnectionHandler.java:262 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Received Complete
> DEBUG [STREAM-IN-/172.31.4.27] 2016-01-14 02:53:25,598 
> ConnectionHandler.java:110 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Closing stream connection handler on /172.31.4.27
> INFO  [STREAM-IN-/172.31.4.27] 2016-01-14 02:53:25,598 
> StreamResultFuture.java:185 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Session with /172.31.4.27 is complete
> {quote}
> Vs the log of a successful bootstrap.
> {quote}
> INFO  [main] 2016-01-14 03:54:13,068 StreamResultFuture.java:88 - [Stream 
> #7963f460-ba72-11e5-b8d5-834198444b31] Executing streaming plan for Bootstrap
> INFO  [StreamConnectionEstablisher:1] 2016-01-14 03:54:13,070 
> StreamSession.java:238 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31] 
> Starting streaming to /172.31.18.61
> INFO  [StreamConnectionEstablisher:1] 2016-01-14 03:54:13,086 
> StreamCoordinator.java:266 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31, 
> ID#0] Beginning stream session with /172.31.18.61
> INFO  [STREAM-IN-/172.31.18.61] 2016-01-14 03:54:13,198 
> StreamResultFuture.java:171 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31 
> ID#0] Prepare completed. Receiving 1 files(102 bytes), sending 0 files(0 
> bytes)
> INFO  [StreamConnectionEstablisher:2] 2016-01-14 03:54:13,206 
> StreamSession.java:238 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31] 
> Starting streaming to /172.31.21.58
> INFO  [StreamConnectionEstablisher:2] 2016-01-14 03:54:13,209 
> StreamCoordinator.java:266 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31, 
> ID#0] Beginning stream session with /172.31.21.58
> INFO  [STREAM-IN-/172.31.21.58] 2016-01-14 03:54:13,255 
> StreamResultFuture.java:185 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31] 
> Session with /172.31.21.58 is complete
> INFO  [StreamReceiveTask:1] 2016-01-14 03:54:13,590 
> StreamResultFuture.java:185 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31] 
> Session with /172.31.18.61 is complete
> INFO  [StreamReceiveTask:1] 2016-01-14 03:54:13,594 
> StreamResultFuture.java:217 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31] 
> All sessions completed
> INFO  [StreamReceiveTask:1] 2016-01-14 03:54:13,597 StorageService.java:1234 
> - Bootstrap completed! for the tokens [3074457345618258602]
> INFO  [main] 2016-01-14 03:54:14,424 StorageService.java:1924 - Node 
> /172.31.29.26 state jump to NORMAL
> {quote}
> The jstack of the bad bootstrap shows it waiting for 

[jira] [Comment Edited] (CASSANDRA-10980) nodetool scrub NPEs when keyspace isn't specified

[Yuki Morishita (JIRA)]

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

Yuki Morishita edited comment on CASSANDRA-10980 at 1/14/16 4:09 PM:
-

Since 2.2, {{ColumnFamilyStore#markAllCompacting}} can return {{null}}, so in 
compaction manager we need to handle that case.

||branch||testall||dtest||
|[10980-2.2|https://github.com/yukim/cassandra/tree/10980-2.2]|[testall|http://cassci.datastax.com/view/Dev/view/yukim/job/yukim-10980-2.2-testall/lastCompletedBuild/testReport/]|[dtest|http://cassci.datastax.com/view/Dev/view/yukim/job/yukim-10980-2.2-dtest/lastCompletedBuild/testReport/]|
|[10980-3.0|https://github.com/yukim/cassandra/tree/10980-3.0]|[testall|http://cassci.datastax.com/view/Dev/view/yukim/job/yukim-10980-3.0-testall/lastCompletedBuild/testReport/]|[dtest|http://cassci.datastax.com/view/Dev/view/yukim/job/yukim-10980-3.0-dtest/lastCompletedBuild/testReport/]|
|[10980-3.3|https://github.com/yukim/cassandra/tree/10980-3.3]|[testall|http://cassci.datastax.com/view/Dev/view/yukim/job/yukim-10980-3.3-testall/lastCompletedBuild/testReport/]|[dtest|http://cassci.datastax.com/view/Dev/view/yukim/job/yukim-10980-3.3-dtest/lastCompletedBuild/testReport/]|



was (Author: yukim):
Since 2.2, {{ColumnFamilyStore#markAllCompacting}} can return {{null}}, so in 
compaction manager we need to handle that case.

||branch||testall||dtest||
|[10980-2.2|https://github.com/yukim/cassandra/tree/10980-2.2]|[testall|http://cassci.datastax.com/view/Dev/view/yukim/job/yukim-10980-2.2-testall/lastCompletedBuild/testReport/]|[dtest|http://cassci.datastax.com/view/Dev/view/yukim/job/yukim-10980-2.2-dtest/lastCompletedBuild/testReport/]|
|[10980-3.0|https://github.com/yukim/cassandra/tree/10980-3.0]|[testall|http://cassci.datastax.com/view/Dev/view/yukim/job/yukim-10980-3.0-testall/lastCompletedBuild/testReport/]|[dtest|http://cassci.datastax.com/view/Dev/view/yukim/job/yukim-10980-3.0-dtest/lastCompletedBuild/testReport/]|
|[10908-3.3|https://github.com/yukim/cassandra/tree/10908-3.3]|[testall|http://cassci.datastax.com/view/Dev/view/yukim/job/yukim-10908-3.3-testall/lastCompletedBuild/testReport/]|[dtest|http://cassci.datastax.com/view/Dev/view/yukim/job/yukim-10908-3.3-dtest/lastCompletedBuild/testReport/]|


> nodetool scrub NPEs when keyspace isn't specified
> -
>
> Key: CASSANDRA-10980
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10980
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
> Environment: Cassandra (and nodetool) version 3.1
>Reporter: Will Hayworth
>Assignee: Yuki Morishita
>Priority: Trivial
>  Labels: lhf
> Fix For: 2.2.5, 3.0.3, 3.3
>
> Attachments: nodetool_scrub_npe.txt
>
>
> I've attached logs of what I saw. Running nodetool scrub without anything 
> else specified resulted in the NPE. Running with the keyspace specified saw 
> successful termination.



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

[jira] [Commented] (CASSANDRA-10979) LCS doesn't do L0 STC on new tables while an L0->L1 compaction is in progress

[Jeff Ferland (JIRA)]

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

Jeff Ferland commented on CASSANDRA-10979:
--

[~sebastian.este...@datastax.com]: Can you cut a build of DSE 4.8.4 with this 
patch added? I'll try my best to test within a week.

> LCS doesn't do L0 STC on new tables while an L0->L1 compaction is in progress
> -
>
> Key: CASSANDRA-10979
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10979
> Project: Cassandra
>  Issue Type: Bug
>  Components: Compaction
> Environment: 2.1.11 / 4.8.3 DSE.
>Reporter: Jeff Ferland
>Assignee: Carl Yeksigian
>  Labels: compaction, leveled
> Fix For: 3.x
>
> Attachments: 10979-2.1.txt
>
>
> Reading code from 
> https://github.com/apache/cassandra/blob/cassandra-2.1/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
>  and comparing with behavior shown in 
> https://gist.github.com/autocracy/c95aca6b00e42215daaf, the following happens:
> Score for L1,L2,and L3 is all < 1 (paste shows 20/10 and 200/100, due to 
> incremental repair).
> Relevant code from here is
> if (Sets.intersection(l1overlapping, compacting).size() > 0)
> return Collections.emptyList();
> Since there will be overlap between what is compacting and L1 (in my case, 
> pushing over 1,000 tables in to L1 from L0 SCTS), I get a pile up of 1,000 
> smaller tables in L0 while awaiting the transition from L0 to L1 and destroy 
> my performance.
> Requested outcome is to continue to perform SCTS on non-compacting L0 tables.



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

[jira] [Assigned] (CASSANDRA-11007) Exception when running nodetool info during bootstrap

[Yuki Morishita (JIRA)]

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

Yuki Morishita reassigned CASSANDRA-11007:
--

Assignee: Yuki Morishita

> Exception when running nodetool info during bootstrap
> -
>
> Key: CASSANDRA-11007
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11007
> Project: Cassandra
>  Issue Type: Bug
>Reporter: T Jake Luciani
>Assignee: Yuki Morishita
>Priority: Minor
>  Labels: fallout
> Fix For: 3.0.x
>
>
> {code}
> automaton@ip-172-31-26-150:~$ nodetool info
> ID : 7d9aa832-de94-43ab-9548-b2e710418301
> Gossip active  : true
> Thrift active  : false
> Native Transport active: false
> Load   : 114.52 KB
> Generation No  : 1452721596
> Uptime (seconds)   : 1396
> Heap Memory (MB)   : 71.80 / 1842.00
> Off Heap Memory (MB)   : 0.00
> Data Center: datacenter1
> Rack   : rack1
> Exceptions : 0
> Key Cache  : entries 11, size 888 bytes, capacity 92 MB, 180 
> hits, 212 requests, 0.849 recent hit rate, 14400 save period in seconds
> Row Cache  : entries 0, size 0 bytes, capacity 0 bytes, 0 hits, 0 
> requests, NaN recent hit rate, 0 save period in seconds
> Counter Cache  : entries 0, size 0 bytes, capacity 46 MB, 0 hits, 0 
> requests, NaN recent hit rate, 7200 save period in seconds
> error: null
> -- StackTrace --
> java.lang.AssertionError
>   at 
> org.apache.cassandra.locator.TokenMetadata.getTokens(TokenMetadata.java:488)
>   at 
> org.apache.cassandra.service.StorageService.getTokens(StorageService.java:2561)
>   at 
> org.apache.cassandra.service.StorageService.getTokens(StorageService.java:2550)
>   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>   at 
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
>   at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:497)
>   at sun.reflect.misc.Trampoline.invoke(MethodUtil.java:71)
>   at sun.reflect.GeneratedMethodAccessor3.invoke(Unknown Source)
>   at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:497)
>   at sun.reflect.misc.MethodUtil.invoke(MethodUtil.java:275)
>   at 
> com.sun.jmx.mbeanserver.StandardMBeanIntrospector.invokeM2(StandardMBeanIntrospector.java:112)
>   at 
> com.sun.jmx.mbeanserver.StandardMBeanIntrospector.invokeM2(StandardMBeanIntrospector.java:46)
>   at 
> com.sun.jmx.mbeanserver.MBeanIntrospector.invokeM(MBeanIntrospector.java:237)
>   at 
> com.sun.jmx.mbeanserver.PerInterface.getAttribute(PerInterface.java:83)
>   at 
> com.sun.jmx.mbeanserver.MBeanSupport.getAttribute(MBeanSupport.java:206)
>   at 
> com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.getAttribute(DefaultMBeanServerInterceptor.java:647)
>   at 
> com.sun.jmx.mbeanserver.JmxMBeanServer.getAttribute(JmxMBeanServer.java:678)
>   at 
> javax.management.remote.rmi.RMIConnectionImpl.doOperation(RMIConnectionImpl.java:1443)
>   at 
> javax.management.remote.rmi.RMIConnectionImpl.access$300(RMIConnectionImpl.java:76)
>   at 
> javax.management.remote.rmi.RMIConnectionImpl$PrivilegedOperation.run(RMIConnectionImpl.java:1307)
>   at 
> javax.management.remote.rmi.RMIConnectionImpl.doPrivilegedOperation(RMIConnectionImpl.java:1399)
>   at 
> javax.management.remote.rmi.RMIConnectionImpl.getAttribute(RMIConnectionImpl.java:637)
>   at sun.reflect.GeneratedMethodAccessor6.invoke(Unknown Source)
>   at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:497)
>   at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:323)
>   at sun.rmi.transport.Transport$1.run(Transport.java:200)
>   at sun.rmi.transport.Transport$1.run(Transport.java:197)
>   at java.security.AccessController.doPrivileged(Native Method)
>   at sun.rmi.transport.Transport.serviceCall(Transport.java:196)
>   at 
> sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:568)
>   at 
> sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:826)
>   at 
> sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$94(TCPTransport.java:683)
>   at 
> sun.rmi.transport.tcp.TCPTransport$ConnectionHandler$$Lambda$179/2070569218.run(Unknown
>  Source)
>   at java.security.AccessController.doPrivileged(Native Method)
>   at 
> 

[jira] [Commented] (CASSANDRA-10997) cqlsh_copy_tests failing en mass when vnodes are disabled

[Stefania (JIRA)]

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

Stefania commented on CASSANDRA-10997:
--

The only conflict I had was CHANGES.txt from 2.1 to 2.2, the rest should apply 
automatically.

All patches are linked above, I repeat here 2.1 and 2.2:

||2.1||2.2|
|[patch|https://github.com/stef1927/cassandra/commits/10997-2.1]|[patch|https://github.com/stef1927/cassandra/commits/10997-2.2]|


> cqlsh_copy_tests failing en mass when vnodes are disabled
> -
>
> Key: CASSANDRA-10997
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10997
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Philip Thompson
>Assignee: Stefania
>  Labels: dtest
> Fix For: 2.1.x, 2.2.x, 3.0.x, 3.x
>
>
> Check out [an example cassci 
> failure|http://cassci.datastax.com/job/cassandra-2.1_novnode_dtest/186/testReport/cqlsh_tests.cqlsh_copy_tests/CqlshCopyTest/test_list_data/]
>  as well as the [full novnode report 
> page|http://cassci.datastax.com/userContent/cstar_report/index.html?jobs=cassandra-2.1_novnode_dtest,cassandra-3.0_novnode_dtest,cassandra-2.2_novnode_dtest_known=true].
> Many COPY TO tests are failing when the cluster only has one token. The 
> message {{Found no ranges to query, check begin and end tokens: None - None}} 
> is printed, and it appears to be coming from cqlsh, specfically in 
> pylib/cqlshlib/copyutil.py



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

[jira] [Commented] (CASSANDRA-10371) Decommissioned nodes can remain in gossip

[Brandon Williams (JIRA)]

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

Brandon Williams commented on CASSANDRA-10371:
--

I wish I could tell you, but while I have certainly seen this issue (in 2.0), I 
haven't be able to repro so I honestly don't know what the status is on 2.1. :(

> Decommissioned nodes can remain in gossip
> -
>
> Key: CASSANDRA-10371
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10371
> Project: Cassandra
>  Issue Type: Bug
>  Components: Distributed Metadata
>Reporter: Brandon Williams
>Assignee: Stefania
>Priority: Minor
>
> This may apply to other dead states as well.  Dead states should be expired 
> after 3 days.  In the case of decom we attach a timestamp to let the other 
> nodes know when it should be expired.  It has been observed that sometimes a 
> subset of nodes in the cluster never expire the state, and through heap 
> analysis of these nodes it is revealed that the epstate.isAlive check returns 
> true when it should return false, which would allow the state to be evicted.  
> This may have been affected by CASSANDRA-8336.



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

[jira] [Commented] (CASSANDRA-10829) cleanup + repair generates a lot of logs

[Marcus Eriksson (JIRA)]

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

Marcus Eriksson commented on CASSANDRA-10829:
-

pushed a fix and reran tests

> cleanup + repair generates a lot of logs
> 
>
> Key: CASSANDRA-10829
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10829
> Project: Cassandra
>  Issue Type: Bug
> Environment: 5 nodes on Cassandra 2.1.11 (on Debian)
>Reporter: Fabien Rousseau
>Assignee: Marcus Eriksson
> Fix For: 2.1.x
>
>
> One of our node generates a lot of cassandra logs (int the 10 MB/s) and CPU 
> usage has increased (by a factor 2-3).
> This was most probably triggered by a "nodetool snapshot" while a cleanup was 
> already running on this node.
> An example of those logs:
> 2015-12-08 09:15:17,794 INFO  
> [ValidationExecutor:689]ColumnFamilyStore.java:1923 Spinning trying to 
> capture released readers [...]
> 2015-12-08 09:15:17,794 INFO  
> [ValidationExecutor:689]ColumnFamilyStore.java:1924 Spinning trying to 
> capture all readers [...]
> 2015-12-08 09:15:17,795 INFO  
> [ValidationExecutor:689]ColumnFamilyStore.java:1923 Spinning trying to 
> capture released readers [...]
> 2015-12-08 09:15:17,795 INFO  
> [ValidationExecutor:689]ColumnFamilyStore.java:1924 Spinning trying to 
> capture all readers [...]
> (I removed SSTableReader information because it's rather long... I can share 
> it privately if needed)
> Note that the date has not been changed (only 1ms between logs)
> It should not generate that gigantic amount of logs :)
> This is probably linked to: 
> https://issues.apache.org/jira/browse/CASSANDRA-9637



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

[jira] [Commented] (CASSANDRA-11010) Bootstrap hangs on 3.2

[Paulo Motta (JIRA)]

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

Paulo Motta commented on CASSANDRA-11010:
-

As [~yukim] noticed, the problem was caused by CASSANDRA-6992 and only happens 
in case one of the nodes involved in a boostrap stream has no data to stream, 
so the prepare step is skipped in favor of complete. Created 
[dtest|https://github.com/riptano/cassandra-dtest/pull/743] to reproduce the 
issue and trivial 3.3 patch to connect to next node in case a session with the 
previous node is completed.


||3.3||trunk||dtest||
|[branch|https://github.com/apache/cassandra/compare/cassandra-3.3...pauloricardomg:3.3-11010]|[branch|https://github.com/apache/cassandra/compare/trunk...pauloricardomg:trunk-11010]|[branch|https://github.com/riptano/cassandra-dtest/compare/master...pauloricardomg:11010]|
|[testall|http://cassci.datastax.com/view/Dev/view/paulomotta/job/pauloricardomg-3.3-11010-testall/lastCompletedBuild/testReport/]|[testall|http://cassci.datastax.com/view/Dev/view/paulomotta/job/pauloricardomg-trunk-11010-testall/lastCompletedBuild/testReport/]|
|[dtest|http://cassci.datastax.com/view/Dev/view/paulomotta/job/pauloricardomg-3.3-11010-dtest/lastCompletedBuild/testReport/]|[dtest|http://cassci.datastax.com/view/Dev/view/paulomotta/job/pauloricardomg-trunk-11010-dtest/lastCompletedBuild/testReport/]|


> Bootstrap hangs on 3.2
> --
>
> Key: CASSANDRA-11010
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11010
> Project: Cassandra
>  Issue Type: Bug
>Reporter: T Jake Luciani
>Assignee: Paulo Motta
>Priority: Blocker
> Fix For: 3.x
>
>
> Doing some testing I've noticed with 3.2 nodes can hang when bootstrapping. 
> below is the snippet from the log of a hung node.
> {quote}
> INFO  [main] 2016-01-14 02:53:25,537 StorageService.java:1281 - JOINING: 
> Starting to bootstrap...
> INFO  [main] 2016-01-14 02:53:25,564 StreamResultFuture.java:88 - [Stream 
> #fb512640-ba69-11e5-8f71-f38b96ae2156] Executing streaming plan for Bootstrap
> DEBUG [main] 2016-01-14 02:53:25,564 StreamCoordinator.java:144 - Connecting 
> next session fb512640-ba69-11e5-8f71-f38b96ae2156 with 172.31.4.27.
> INFO  [StreamConnectionEstablisher:1] 2016-01-14 02:53:25,565 
> StreamSession.java:238 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Starting streaming to /172.31.4.27
> DEBUG [StreamConnectionEstablisher:1] 2016-01-14 02:53:25,566 
> ConnectionHandler.java:82 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Sending stream init for incoming stream
> DEBUG [StreamConnectionEstablisher:1] 2016-01-14 02:53:25,568 
> ConnectionHandler.java:87 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Sending stream init for outgoing stream
> INFO  [StreamConnectionEstablisher:1] 2016-01-14 02:53:25,574 
> StreamCoordinator.java:266 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156, 
> ID#0] Beginning stream session with /172.31.4.27
> DEBUG [STREAM-OUT-/172.31.4.27] 2016-01-14 02:53:25,574 
> ConnectionHandler.java:334 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Sending Prepare (2 requests,  0 files}
> DEBUG [STREAM-IN-/172.31.4.27] 2016-01-14 02:53:25,597 
> ConnectionHandler.java:262 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Received Prepare (0 requests,  0 files}
> DEBUG [STREAM-OUT-/172.31.4.27] 2016-01-14 02:53:25,597 
> ConnectionHandler.java:334 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Sending Complete
> DEBUG [STREAM-IN-/172.31.4.27] 2016-01-14 02:53:25,597 
> ConnectionHandler.java:262 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Received Complete
> DEBUG [STREAM-IN-/172.31.4.27] 2016-01-14 02:53:25,598 
> ConnectionHandler.java:110 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Closing stream connection handler on /172.31.4.27
> INFO  [STREAM-IN-/172.31.4.27] 2016-01-14 02:53:25,598 
> StreamResultFuture.java:185 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Session with /172.31.4.27 is complete
> {quote}
> Vs the log of a successful bootstrap.
> {quote}
> INFO  [main] 2016-01-14 03:54:13,068 StreamResultFuture.java:88 - [Stream 
> #7963f460-ba72-11e5-b8d5-834198444b31] Executing streaming plan for Bootstrap
> INFO  [StreamConnectionEstablisher:1] 2016-01-14 03:54:13,070 
> StreamSession.java:238 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31] 
> Starting streaming to /172.31.18.61
> INFO  [StreamConnectionEstablisher:1] 2016-01-14 03:54:13,086 
> StreamCoordinator.java:266 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31, 
> ID#0] Beginning stream session with /172.31.18.61
> INFO  [STREAM-IN-/172.31.18.61] 2016-01-14 03:54:13,198 
> StreamResultFuture.java:171 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31 
> ID#0] Prepare completed. Receiving 1 files(102 bytes), sending 0 files(0 
> bytes)
> INFO  

cassandra git commit: Remove maybeUpdateRowCache in favor of the equivalent invalidateCachedPartition

[slebresne]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 5090afc7a -> 367dfd505


Remove maybeUpdateRowCache in favor of the equivalent invalidateCachedPartition

patch by slebresne; reviewed by jbellis for CASSANDRA-10396


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

Branch: refs/heads/trunk
Commit: 367dfd50558d2c5d09e778e3c2b2ba247302f707
Parents: 5090afc
Author: Sylvain Lebresne 
Authored: Wed Jan 13 15:41:02 2016 +0100
Committer: Sylvain Lebresne 
Committed: Thu Jan 14 11:49:53 2016 +0100

--
 CHANGES.txt  |  1 +
 .../org/apache/cassandra/db/ColumnFamilyStore.java   | 15 +++
 2 files changed, 4 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/367dfd50/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5acd12e..b2df9f7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.4
+ * Simplify row cache invalidation code (CASSANDRA-10396)
  * Support user-defined compaction through nodetool (CASSANDRA-10660)
  * Stripe view locks by key and table ID to reduce contention (CASSANDRA-10981)
  * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/367dfd50/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 6eefb5f..af36164 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1201,15 +1201,6 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 return String.format("%.2f/%.2f", onHeap, offHeap);
 }
 
-public void maybeUpdateRowCache(DecoratedKey key)
-{
-if (!isRowCacheEnabled())
-return;
-
-RowCacheKey cacheKey = new RowCacheKey(metadata.ksAndCFName, key);
-invalidateCachedPartition(cacheKey);
-}
-
 /**
  * Insert/Update the column family for this key.
  * Caller is responsible for acquiring Keyspace.switchLock
@@ -1224,7 +1215,7 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 Memtable mt = data.getMemtableFor(opGroup, replayPosition);
 long timeDelta = mt.put(update, indexer, opGroup);
 DecoratedKey key = update.partitionKey();
-maybeUpdateRowCache(key);
+invalidateCachedPartition(key);
 metric.samplers.get(Sampler.WRITES).addSample(key.getKey(), 
key.hashCode(), 1);
 metric.writeLatency.addNano(System.nanoTime() - start);
 if(timeDelta < Long.MAX_VALUE)
@@ -1875,8 +1866,8 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 
 public void invalidateCachedPartition(DecoratedKey key)
 {
-if (!Schema.instance.hasCF(metadata.ksAndCFName))
-return; //2i don't cache rows
+if (!isRowCacheEnabled())
+return;
 
 invalidateCachedPartition(new RowCacheKey(metadata.ksAndCFName, key));
 }

[jira] [Commented] (CASSANDRA-10383) Disable auto snapshot on selected tables.

[Tommy Stendahl (JIRA)]

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

Tommy Stendahl commented on CASSANDRA-10383:


Is there a jira created for the new schema-change protocol? I did search for it 
but I couldn't find any.

> Disable auto snapshot on selected tables.
> -
>
> Key: CASSANDRA-10383
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10383
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Tommy Stendahl
>Assignee: Tommy Stendahl
>  Labels: doc-impacting, messaging-service-bump-required
> Attachments: 10383.txt
>
>
> I have a use case where I would like to turn off auto snapshot for selected 
> tables, I don't want to turn it off completely since its a good feature. 
> Looking at the code I think it would be relatively easy to fix.
> My plan is to create a new table property named something like 
> "disable_auto_snapshot". If set to false it will prevent auto snapshot on the 
> table, if set to true auto snapshot will be controlled by the "auto_snapshot" 
> property in the cassandra.yaml. Default would be true.



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

[jira] [Updated] (CASSANDRA-11013) Stale entries not purged from CompositesIndex

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-11013:
-
Reviewer: Benedict

> Stale entries not purged from CompositesIndex
> -
>
> Key: CASSANDRA-11013
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11013
> Project: Cassandra
>  Issue Type: Bug
>  Components: Local Write-Read Paths
>Reporter: Sam Tunnicliffe
>Assignee: Sam Tunnicliffe
> Fix For: 3.0.x, 3.x
>
>
> Since CASSANDRA-9975, the cleanup of stale index entries at read time has 
> been broken for {{CompositesIndex}} instances ({{KeysIndex}} is not 
> affected). 
> The issue is that the call to {{deleteAllEntries}} is made in the {{onClose}} 
> method of the anonymous {{Transformation}}, where it should be in 
> {{onPartitionClose}}. This wasn't caught by the existing unit test 
> ({{o.a.c.db.SecondaryIndexTest::testDeleteOfInconsistentValuesInKeysIndex}} 
> as it only checks that the stale entries are filtered from the returned 
> results, not that they are actually purged from the index tables. 



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

[jira] [Commented] (CASSANDRA-9472) Reintroduce off heap memtables

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne commented on CASSANDRA-9472:
-

[~benedict] Can you have a look at Stefania's changes?

> Reintroduce off heap memtables
> --
>
> Key: CASSANDRA-9472
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9472
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Benedict
>Assignee: Stefania
> Fix For: 3.x
>
>
> CASSANDRA-8099 removes off heap memtables. We should reintroduce them ASAP.



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

[jira] [Created] (CASSANDRA-11015) CommitLogUpgradeTestMaker creates broken commit logs for > 3.0

[Jason Brown (JIRA)]

Jason Brown created CASSANDRA-11015:
---

 Summary: CommitLogUpgradeTestMaker creates broken commit logs for 
> 3.0
 Key: CASSANDRA-11015
 URL: https://issues.apache.org/jira/browse/CASSANDRA-11015
 Project: Cassandra
  Issue Type: Bug
  Components: Testing
Reporter: Jason Brown
Assignee: Jason Brown
Priority: Minor


Creating commit logs for the {{CommitLogUpgradeTest}} via 
{{CommitLogUpgradeTestMaker}} outputs files that fail for versions >= 3.0. This 
happens for all commit log types: normal, compressed, and encrypted.

Creating the commit log files via {{CommitLogUpgradeTestMaker}} is successful, 
but fail when being executes by tests with this exception:

{noformat}
java.lang.RuntimeException: Unknown column val0 during deserialization

at 
org.apache.cassandra.db.Columns$Serializer.deserialize(Columns.java:433)
at 
org.apache.cassandra.db.SerializationHeader$Serializer.deserializeForMessaging(SerializationHeader.java:422)
at 
org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer.deserializeHeader(UnfilteredRowIteratorSerializer.java:192)
at 
org.apache.cassandra.db.partitions.PartitionUpdate$PartitionUpdateSerializer.deserialize30(PartitionUpdate.java:657)
at 
org.apache.cassandra.db.partitions.PartitionUpdate$PartitionUpdateSerializer.deserialize(PartitionUpdate.java:631)
at 
org.apache.cassandra.db.Mutation$MutationSerializer.deserialize(Mutation.java:310)
at 
org.apache.cassandra.db.commitlog.CommitLogTestReplayer.replayMutation(CommitLogTestReplayer.java:68)
at 
org.apache.cassandra.db.commitlog.CommitLogReplayer.replaySyncSection(CommitLogReplayer.java:510)
at 
org.apache.cassandra.db.commitlog.CommitLogReplayer.recover(CommitLogReplayer.java:396)
at 
org.apache.cassandra.db.commitlog.CommitLogReplayer.recover(CommitLogReplayer.java:224)
at 
org.apache.cassandra.db.commitlog.CommitLogUpgradeTest.testRestore(CommitLogUpgradeTest.java:216)
at 
org.apache.cassandra.db.commitlog.CommitLogUpgradeTest.test34(CommitLogUpgradeTest.java:175)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:497)
at 
org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:44)
at 
org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
at 
org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:41)
at 
org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20)
at 
org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28)
at 
org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:31)
at 
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70)
at 
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:44)
at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:180)
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:41)
at org.junit.runners.ParentRunner$1.evaluate(ParentRunner.java:173)
at 
org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28)
at 
org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:31)
at org.junit.runners.ParentRunner.run(ParentRunner.java:220)
at org.junit.runner.JUnitCore.run(JUnitCore.java:159)
at 
com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:117)
at 
com.intellij.rt.execution.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:234)
at 
com.intellij.rt.execution.junit.JUnitStarter.main(JUnitStarter.java:74)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:497)
at com.intellij.rt.execution.application.AppMain.main(AppMain.java:144)
{noformat}



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

[jira] [Commented] (CASSANDRA-8103) Secondary Indices for Static Columns

[Sam Tunnicliffe (JIRA)]

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

Sam Tunnicliffe commented on CASSANDRA-8103:


bq. Any feedback here?

Yes, apologies for the delay, the patch looks pretty good, thanks! 
I had intended to post the review sooner, but in reviewing it discovered an 
earlier regression which I ended up digging into (CASSANDRA-11013).

I have a couple of concerns about the new implementation of 
{{CompositesSearcher::filterStaleEntries}}. Firstly, when an index entry for a 
static column is stale the iterator returned includes the actual static row 
retrieved from the base table. This means that that static row is unnecessarily 
included in all local and remote read responses adding serialization and 
network overhead. As we've identified that the index entry is no longer valid 
for the partition it points to, the returned iter be completely empty (i.e. it 
should include {{Rows.EMPTY_STATIC_ROW}}). 
I'm also not overly fond of moving the call to {{deleteStaleEntries}} into 
{{filterStaleEntries}} itself. In the static case this is fair enough as we're 
going to simply return an empty iterator, but for non-statics I'd prefer to 
keep it as something which happens on close of the results iterator (modulo 
CASSANDRA-11013). There are a few other minor things with this method, so for 
simplicity I've pushed a commit 
[here|https://github.com/beobal/cassandra/commit/b4df631b945cfc87d8ee86016e6d61790513bf64]
 to fix it up, let me know if you agree with those changes. Also, I haven't 
added it, but a test to verify the stale entry cleanup behaviour would be 
useful (see 
{{o.a.c.db.SecondaryIndexTest::testDeleteOfInconsistentValuesFromCompositeIndex}}).
 

One additional thing I'm not wild about is that due to the way we convert a row 
in the index table to an {{IndexEntry}} in the {{CassandraIndex::decodeEntry}} 
implementations, we lose the fact that the indexed value is static. At write 
time the clustering value, which is always {{Clustering.STATIC_CLUSTERING}}, is 
correctly used to build the index entry. However, at query time the 
{{decodeEntry}} implementations are not aware of the static nature and so 
attempt to build a regular clustering from the index table row. The difference 
here is minor; {{STATIC_CLUSTERING}} consists of an empty array of values, 
whereas the one that gets reconstructed is of variable size (depending on the 
number of clustering columns in the base table), but all its values will be 
null. This doesn't actually break anything (yet) as 
{{IndexEntry.indexedClustering}} is unused in the static case thanks to the 
short circuit in {{CompositesSearcher}} but it is a bit messy, so if you 
wouldn't mind I think we should fix the decoding in {{RegularColumnIndex}}, 
{{CollectionValueIndex}} & {{CollectionKeyIndexBase}}. 

Contrary to the commit comment in the patch, non-regular static columns are 
supported by this solution (given the test covering static collections, I 
assume you know this though and the comment is simply out of date). In 
addition, *frozen* static collections and UDTs can also be indexed just fine - 
these work in the same way as their non-static counterparts by being processed 
as regular columns (which they are really, being just opaque blobs at the 
storage engine level). There aren't any tests covering static frozen types 
here, so adding some would be good.

So I think the things to address here are:

* Adding tests for static frozen columns, covering collections and UDTs if 
possible
* Review {{CompositesSearcher::filterStaleEntries}} as noted above
* Fix the decoding of index entries such that they have {{indexedClustering}} 
set to {{STATIC_CLUSTERING}}
* The new {{SinglePartitionReadCommand}} in {{CompositesSearcher}} could re-use 
{{command.columnFilter()}} as the existing one does. Right now, this is 
equivalent to what the patch currently does, as CQL queries need to read all 
columns, but changing this has been mooted before (see CASSANDRA-6588 & 
CASSANDRA-7055) and it would be easy to overlook this if it does happen at some 
point.
* Remove the {{println}} from {{CompositesSearcher}} (line #136)

At some point I'd like to take a run a reorganising the various index related 
tests as at the moment, they're spread over a number of different 
classes/packages. Consolidating them, at least into a single package, would 
make it easier to identify relevant tests. I'm not suggesting we do that here 
though, I'll leave that to a separate ticket.


> Secondary Indices for Static Columns
> 
>
> Key: CASSANDRA-8103
> URL: https://issues.apache.org/jira/browse/CASSANDRA-8103
> Project: Cassandra
>  Issue Type: New Feature
>  Components: CQL
>Reporter: Ron Cohen
> Fix For: 3.x
>
> 

[jira] [Updated] (CASSANDRA-8103) Secondary Indices for Static Columns

[Sam Tunnicliffe (JIRA)]

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

Sam Tunnicliffe updated CASSANDRA-8103:
---
Assignee: Taiyuan Zhang

> Secondary Indices for Static Columns
> 
>
> Key: CASSANDRA-8103
> URL: https://issues.apache.org/jira/browse/CASSANDRA-8103
> Project: Cassandra
>  Issue Type: New Feature
>  Components: CQL
>Reporter: Ron Cohen
>Assignee: Taiyuan Zhang
> Fix For: 3.x
>
> Attachments: 8103.patch, in_progress.patch, smoke-test.cql
>
>
> We should add secondary index support for static columns.  



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

[jira] [Updated] (CASSANDRA-10958) Range query with filtering interacts badly with static columns

[Sam Tunnicliffe (JIRA)]

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

Sam Tunnicliffe updated CASSANDRA-10958:

Assignee: Taiyuan Zhang

> Range query with filtering interacts badly with static columns
> --
>
> Key: CASSANDRA-10958
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10958
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Taiyuan Zhang
>Assignee: Taiyuan Zhang
>Priority: Minor
> Attachments: 10958.patch
>
>
>  I'm playing with Cassandra 3. I added a secondary index on a column of 
> integer, then I want to do a range query. First it threw an error:
> {code}
> InvalidRequest: code=2200 [Invalid query] message="No supported secondary 
> index found for the non primary key columns restrictions"
> {code}
> So I added 'Allow Filtering'
> {code}
> cqlsh:mykeyspace> SELECT * FROM test ;
> id | id2 | age | extra
> +-+-+---
>   1 |   1 |   1 | 1
>   2 |   2 |   2 | 2
> (2 rows)
> cqlsh:mykeyspace > CREATE INDEX test_age on test (extra) ;
> cqlsh:mykeyspace > select * FROM test WHERE extra < 2 ALLOW FILTERING ;
>  id | id2  | age | extra
> +--+-+---
>   1 |1 |   1 | 1
>   2 | null |   2 |  null
> (2 rows)
> {code}
> My schema is:
> {code}
> CREATE TABLE mykeyspace.test (
> id int,
> id2 int,
> age int static,
> extra int,
> PRIMARY KEY (id, id2)
> ) 
> {code}
> I don't know if this is by design or not, but it really does look like a BUG 
> to me.



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

[jira] [Created] (CASSANDRA-11013) Stale entries not purged from CompositesIndex

[Sam Tunnicliffe (JIRA)]

Sam Tunnicliffe created CASSANDRA-11013:
---

 Summary: Stale entries not purged from CompositesIndex
 Key: CASSANDRA-11013
 URL: https://issues.apache.org/jira/browse/CASSANDRA-11013
 Project: Cassandra
  Issue Type: Bug
  Components: Local Write-Read Paths
Reporter: Sam Tunnicliffe
Assignee: Sam Tunnicliffe
 Fix For: 3.0.x, 3.x


Since CASSANDRA-9975, the cleanup of stale index entries at read time has been 
broken for {{CompositesIndex}} instances ({{KeysIndex}} is not affected). 
The issue is that the call to {{deleteAllEntries}} is made in the {{onClose}} 
method of the anonymous {{Transformation}}, where it should be in 
{{onPartitionClose}}. This wasn't caught by the existing unit test 
({{o.a.c.db.SecondaryIndexTest::testDeleteOfInconsistentValuesInKeysIndex}} as 
it only checks that the stale entries are filtered from the returned results, 
not that they are actually purged from the index tables. 




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

[jira] [Commented] (CASSANDRA-11013) Stale entries not purged from CompositesIndex

[Benedict (JIRA)]

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

Benedict commented on CASSANDRA-11013:
--

+1

> Stale entries not purged from CompositesIndex
> -
>
> Key: CASSANDRA-11013
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11013
> Project: Cassandra
>  Issue Type: Bug
>  Components: Local Write-Read Paths
>Reporter: Sam Tunnicliffe
>Assignee: Sam Tunnicliffe
> Fix For: 3.0.x, 3.x
>
>
> Since CASSANDRA-9975, the cleanup of stale index entries at read time has 
> been broken for {{CompositesIndex}} instances ({{KeysIndex}} is not 
> affected). 
> The issue is that the call to {{deleteAllEntries}} is made in the {{onClose}} 
> method of the anonymous {{Transformation}}, where it should be in 
> {{onPartitionClose}}. This wasn't caught by the existing unit test 
> ({{o.a.c.db.SecondaryIndexTest::testDeleteOfInconsistentValuesInKeysIndex}} 
> as it only checks that the stale entries are filtered from the returned 
> results, not that they are actually purged from the index tables. 



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

[jira] [Commented] (CASSANDRA-7019) Improve tombstone compactions

[Branimir Lambov (JIRA)]

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

Branimir Lambov commented on CASSANDRA-7019:


bq. Perhaps we could apply it to the higher (L3+?) levels in leveled compaction?

This makes sense. Better still, we can probably exclude older tables altogether 
(as they can't have newer tombstones) which should avoid bringing higher-level 
tables on a lower-level compaction.

bq. do we drop overwritten data as well?

No. I was hoping the table iterators could deserialize just a row header, which 
after reading the code more closely doesn't appear to be the case. I'll do some 
performance evaluations next and experiment with different variations (e.g. 
slicing to reach the row within partition instead of iterating as well as 
looking within the row).

> Improve tombstone compactions
> -
>
> Key: CASSANDRA-7019
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7019
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Compaction
>Reporter: Marcus Eriksson
>Assignee: Branimir Lambov
>  Labels: compaction
> Fix For: 3.x
>
>
> When there are no other compactions to do, we trigger a single-sstable 
> compaction if there is more than X% droppable tombstones in the sstable.
> In this ticket we should try to include overlapping sstables in those 
> compactions to be able to actually drop the tombstones. Might only be doable 
> with LCS (with STCS we would probably end up including all sstables)



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

[jira] [Created] (CASSANDRA-11014) Repair fails with "not enough bytes"

[Christian Schjolberg (JIRA)]

Christian Schjolberg created CASSANDRA-11014:


 Summary: Repair fails with "not enough bytes"
 Key: CASSANDRA-11014
 URL: https://issues.apache.org/jira/browse/CASSANDRA-11014
 Project: Cassandra
  Issue Type: Bug
 Environment: 3 node cluster, debian jessie, cassandra 2.2.4
Reporter: Christian Schjolberg
Priority: Blocker
 Attachments: scrub-output.txt

After upgrading to 2.2.4, nodetool repair fails every time with the error 
message "Not enough bytes". It appears no data is being repaired at all. Here's 
some output:

-@cas01:~$ nodetool repair
[2016-01-14 12:00:16,590] Starting repair command #1, repairing keyspace 
adsquare with repair options (parallelism: parallel, primary range: false, 
incremental: true, job threads: 1, ColumnFamilies: [], dataCenters: [], hosts: 
[], # of ranges: 768)
[2016-01-14 12:00:21,935] Repair session 61174f80-bab6-11e5-9fa9-11175757c857 
for range (-3942884673882176939,-3929110923969659376] failed with error [repair 
#61174f80-bab6-11e5-9fa9-11175757c857 on adsquare/device_lookup, 
(-3942884673882176939,-3929110923969659376]] Validation failed in /10.10.100.61 
(progress: 0%)

The system.log on the host in question shows 
ERROR [ValidationExecutor:2] 2016-01-14 09:58:19,935 CassandraDaemon.java:185 - 
Exception in thread Thread[ValidationExecutor:2,1,main]
java.lang.IllegalArgumentException: Not enough bytes
at 
org.apache.cassandra.db.composites.AbstractCType.checkRemaining(AbstractCType.java:362)
 ~[apache-cassandra-2.2.4.jar:2.2.4]
at 
org.apache.cassandra.db.composites.AbstractCompoundCellNameType.fromByteBuffer(AbstractCompoundCellNameType.java:98)
 ~[apache-cassandra-2.2.4.jar:2.2.4]
at 
org.apache.cassandra.db.composites.AbstractCType$Serializer.deserialize(AbstractCType.java:381)
 ~[apache-cassandra-2.2.4.jar:2.2.4]
at 
org.apache.cassandra.db.composites.AbstractCType$Serializer.deserialize(AbstractCType.java:365)
 ~[apache-cassandra-2.2.4.jar:2.2.4]
at 
org.apache.cassandra.db.OnDiskAtom$Serializer.deserializeFromSSTable(OnDiskAtom.java:75)
 ~[apache-cassandra-2.2.4.jar:2.2.4]
at 
org.apache.cassandra.db.AbstractCell$1.computeNext(AbstractCell.java:52) 
~[apache-cassandra-2.2.4.jar:2.2.4]
at 
org.apache.cassandra.db.AbstractCell$1.computeNext(AbstractCell.java:46) 
~[apache-cassandra-2.2.4.jar:2.2.4]
at 
com.google.common.collect.AbstractIterator.tryToComputeNext(AbstractIterator.java:143)
 ~[guava-16.0.jar:na]
at 
com.google.common.collect.AbstractIterator.hasNext(AbstractIterator.java:138) 
~[guava-16.0.jar:na]
at 
org.apache.cassandra.io.sstable.SSTableIdentityIterator.hasNext(SSTableIdentityIterator.java:169)
 ~[apache-cassandra-2.2.4.jar:2.2.4]
at 
org.apache.cassandra.utils.MergeIterator$OneToOne.computeNext(MergeIterator.java:202)
 ~[apache-cassandra-2.2.4.jar:2.2.4]
at 
com.google.common.collect.AbstractIterator.tryToComputeNext(AbstractIterator.java:143)
 ~[guava-16.0.jar:na]
at 
com.google.common.collect.AbstractIterator.hasNext(AbstractIterator.java:138) 
~[guava-16.0.jar:na]
at 
com.google.common.collect.Iterators$7.computeNext(Iterators.java:645) 
~[guava-16.0.jar:na]
at 
com.google.common.collect.AbstractIterator.tryToComputeNext(AbstractIterator.java:143)
 ~[guava-16.0.jar:na]
at 
com.google.common.collect.AbstractIterator.hasNext(AbstractIterator.java:138) 
~[guava-16.0.jar:na]
at 
org.apache.cassandra.db.compaction.LazilyCompactedRow.update(LazilyCompactedRow.java:172)
 ~[apache-cassandra-2.2.4.jar:2.2.4]
at org.apache.cassandra.repair.Validator.rowHash(Validator.java:194) 
~[apache-cassandra-2.2.4.jar:2.2.4]
at org.apache.cassandra.repair.Validator.add(Validator.java:143) 
~[apache-cassandra-2.2.4.jar:2.2.4]
at 
org.apache.cassandra.db.compaction.CompactionManager.doValidationCompaction(CompactionManager.java:1118)
 ~[apache-cassandra-2.2.4.jar:2.2.4]
at 
org.apache.cassandra.db.compaction.CompactionManager.access$700(CompactionManager.java:73)
 ~[apache-cassandra-2.2.4.jar:2.2.4]
at 
org.apache.cassandra.db.compaction.CompactionManager$10.call(CompactionManager.java:671)
 ~[apache-cassandra-2.2.4.jar:2.2.4]
at java.util.concurrent.FutureTask.run(FutureTask.java:266) 
~[na:1.8.0_66]
at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) 
~[na:1.8.0_66]
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) 
[na:1.8.0_66]

Thinking that there might be some corruption I ran nodetool scrub, which fills 
the log with statements like the one in the attachment.





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

[jira] [Commented] (CASSANDRA-6018) Add option to encrypt commitlog

[Jason Brown (JIRA)]

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

Jason Brown commented on CASSANDRA-6018:


Pushed the few updates 
[here|https://github.com/jasobrown/cassandra/commit/25b80c868b4e29f916bbdeed1fc5a9663f0fe447],
 which include:

- renamed {{encrypt}} to {{encryptAndWrite}}
- rebased to trunk

I tried to create a new test for {{CommitLogUpgradeTest}} by using 
{{CommitLogUpgradeTestMaker}}, but there's something broken with the Maker when 
creating commit logs for > 3.0 (broken for all commit log types: normal, 
compressed, and encrypted). I will create a follow up ticket to resolve that, 
and will add encryption tests as part of that commit.

> Add option to encrypt commitlog 
> 
>
> Key: CASSANDRA-6018
> URL: https://issues.apache.org/jira/browse/CASSANDRA-6018
> Project: Cassandra
>  Issue Type: New Feature
>Reporter: Jason Brown
>Assignee: Jason Brown
>  Labels: commit_log, encryption, security
> Fix For: 3.x
>
>
> We are going to start using cassandra for a billing system, and while I can 
> encrypt sstables at rest (via Datastax Enterprise), commit logs are more or 
> less plain text. Thus, an attacker would be able to easily read, for example, 
> credit card numbers in the clear text commit log (if the calling app does not 
> encrypt the data itself before sending it to cassandra).
> I want to allow the option of encrypting the commit logs, most likely 
> controlled by a property in the yaml.



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

[jira] [Comment Edited] (CASSANDRA-6018) Add option to encrypt commitlog

[Jason Brown (JIRA)]

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

Jason Brown edited comment on CASSANDRA-6018 at 1/14/16 1:16 PM:
-

Pushed the few updates 
[here|https://github.com/jasobrown/cassandra/commit/25b80c868b4e29f916bbdeed1fc5a9663f0fe447],
 which include:

- renamed {{encrypt}} to {{encryptAndWrite}}
- rebased to trunk

I tried to create a new test for {{CommitLogUpgradeTest}} by using 
{{CommitLogUpgradeTestMaker}}, but there's something broken with the Maker when 
creating commit logs for > 3.0 (broken for all commit log types: normal, 
compressed, and encrypted). I will create a follow up ticket (EDIT: 
CASSANDRA-11015) to resolve that, and will add encryption tests as part of that 
commit.


was (Author: jasobrown):
Pushed the few updates 
[here|https://github.com/jasobrown/cassandra/commit/25b80c868b4e29f916bbdeed1fc5a9663f0fe447],
 which include:

- renamed {{encrypt}} to {{encryptAndWrite}}
- rebased to trunk

I tried to create a new test for {{CommitLogUpgradeTest}} by using 
{{CommitLogUpgradeTestMaker}}, but there's something broken with the Maker when 
creating commit logs for > 3.0 (broken for all commit log types: normal, 
compressed, and encrypted). I will create a follow up ticket to resolve that, 
and will add encryption tests as part of that commit.

> Add option to encrypt commitlog 
> 
>
> Key: CASSANDRA-6018
> URL: https://issues.apache.org/jira/browse/CASSANDRA-6018
> Project: Cassandra
>  Issue Type: New Feature
>Reporter: Jason Brown
>Assignee: Jason Brown
>  Labels: commit_log, encryption, security
> Fix For: 3.x
>
>
> We are going to start using cassandra for a billing system, and while I can 
> encrypt sstables at rest (via Datastax Enterprise), commit logs are more or 
> less plain text. Thus, an attacker would be able to easily read, for example, 
> credit card numbers in the clear text commit log (if the calling app does not 
> encrypt the data itself before sending it to cassandra).
> I want to allow the option of encrypting the commit logs, most likely 
> controlled by a property in the yaml.



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

[jira] [Commented] (CASSANDRA-10371) Decommissioned nodes can remain in gossip

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne commented on CASSANDRA-10371:
--

ping [~brandon.williams] (regarding [~Stefania]'s questions above).

> Decommissioned nodes can remain in gossip
> -
>
> Key: CASSANDRA-10371
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10371
> Project: Cassandra
>  Issue Type: Bug
>  Components: Distributed Metadata
>Reporter: Brandon Williams
>Assignee: Stefania
>Priority: Minor
>
> This may apply to other dead states as well.  Dead states should be expired 
> after 3 days.  In the case of decom we attach a timestamp to let the other 
> nodes know when it should be expired.  It has been observed that sometimes a 
> subset of nodes in the cluster never expire the state, and through heap 
> analysis of these nodes it is revealed that the epstate.isAlive check returns 
> true when it should return false, which would allow the state to be evicted.  
> This may have been affected by CASSANDRA-8336.



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

[jira] [Commented] (CASSANDRA-10938) test_bulk_round_trip_blogposts is failing occasionally

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne commented on CASSANDRA-10938:
--

I'll note that I'm fine on the change from NBHM to CHM, the patch looks 
obviously correct, but I'd rather wait on seeing if we can understand the CI 
failure first.

> test_bulk_round_trip_blogposts is failing occasionally
> --
>
> Key: CASSANDRA-10938
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10938
> Project: Cassandra
>  Issue Type: Sub-task
>  Components: Tools
>Reporter: Stefania
>Assignee: Stefania
> Fix For: 2.1.x
>
> Attachments: 6452.nps, 6452.png, 7300.nps, 7300a.png, 7300b.png, 
> node1_debug.log, node2_debug.log, node3_debug.log, recording_127.0.0.1.jfr
>
>
> We get timeouts occasionally that cause the number of records to be incorrect:
> http://cassci.datastax.com/job/trunk_dtest/858/testReport/cqlsh_tests.cqlsh_copy_tests/CqlshCopyTest/test_bulk_round_trip_blogposts/



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

[jira] [Commented] (CASSANDRA-11015) CommitLogUpgradeTestMaker creates broken commit logs for > 3.0

[Branimir Lambov (JIRA)]

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

Branimir Lambov commented on CASSANDRA-11015:
-

The problem is that the maker and tester schemas have gone out of sync. Pushed 
patch [here|https://github.com/blambov/cassandra/tree/11051].

> CommitLogUpgradeTestMaker creates broken commit logs for > 3.0
> --
>
> Key: CASSANDRA-11015
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11015
> Project: Cassandra
>  Issue Type: Bug
>  Components: Testing
>Reporter: Jason Brown
>Assignee: Jason Brown
>Priority: Minor
>  Labels: tests
>
> Creating commit logs for the {{CommitLogUpgradeTest}} via 
> {{CommitLogUpgradeTestMaker}} outputs files that fail for versions >= 3.0. 
> This happens for all commit log types: normal, compressed, and encrypted.
> Creating the commit log files via {{CommitLogUpgradeTestMaker}} is 
> successful, but fail when being executes by tests with this exception:
> {noformat}
> java.lang.RuntimeException: Unknown column val0 during deserialization
>   at 
> org.apache.cassandra.db.Columns$Serializer.deserialize(Columns.java:433)
>   at 
> org.apache.cassandra.db.SerializationHeader$Serializer.deserializeForMessaging(SerializationHeader.java:422)
>   at 
> org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer.deserializeHeader(UnfilteredRowIteratorSerializer.java:192)
>   at 
> org.apache.cassandra.db.partitions.PartitionUpdate$PartitionUpdateSerializer.deserialize30(PartitionUpdate.java:657)
>   at 
> org.apache.cassandra.db.partitions.PartitionUpdate$PartitionUpdateSerializer.deserialize(PartitionUpdate.java:631)
>   at 
> org.apache.cassandra.db.Mutation$MutationSerializer.deserialize(Mutation.java:310)
>   at 
> org.apache.cassandra.db.commitlog.CommitLogTestReplayer.replayMutation(CommitLogTestReplayer.java:68)
>   at 
> org.apache.cassandra.db.commitlog.CommitLogReplayer.replaySyncSection(CommitLogReplayer.java:510)
>   at 
> org.apache.cassandra.db.commitlog.CommitLogReplayer.recover(CommitLogReplayer.java:396)
>   at 
> org.apache.cassandra.db.commitlog.CommitLogReplayer.recover(CommitLogReplayer.java:224)
>   at 
> org.apache.cassandra.db.commitlog.CommitLogUpgradeTest.testRestore(CommitLogUpgradeTest.java:216)
>   at 
> org.apache.cassandra.db.commitlog.CommitLogUpgradeTest.test34(CommitLogUpgradeTest.java:175)
>   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>   at 
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
>   at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:497)
>   at 
> org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:44)
>   at 
> org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
>   at 
> org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:41)
>   at 
> org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20)
>   at 
> org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28)
>   at 
> org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:31)
>   at 
> org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70)
>   at 
> org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:44)
>   at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:180)
>   at org.junit.runners.ParentRunner.access$000(ParentRunner.java:41)
>   at org.junit.runners.ParentRunner$1.evaluate(ParentRunner.java:173)
>   at 
> org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28)
>   at 
> org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:31)
>   at org.junit.runners.ParentRunner.run(ParentRunner.java:220)
>   at org.junit.runner.JUnitCore.run(JUnitCore.java:159)
>   at 
> com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:117)
>   at 
> com.intellij.rt.execution.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:234)
>   at 
> com.intellij.rt.execution.junit.JUnitStarter.main(JUnitStarter.java:74)
>   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>   at 
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
>   at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:497)
>   at com.intellij.rt.execution.application.AppMain.main(AppMain.java:144)
> 

[jira] [Commented] (CASSANDRA-10476) Fix upgrade paging dtest failures on 2.2->3.0 path

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne commented on CASSANDRA-10476:
--

[~mambocab] Could you summarize which of the tests from this issue are still 
failing now that we've bump the instances used for testing?

bq. 
http://cassci.datastax.com/view/cassandra-3.0/job/cassandra-3.0_dtest/420/testReport/upgrade_tests.paging_test/TestPagingWithDeletionsNodes3RF3/test_failure_threshold_deletions/history/

Regarding that one test, it's almost surely a simple test problem. When it 
fails, it fails with
{noformat}

{noformat}
which suggest the test is doing a truncate when one of the node may not be up 
(or at least not known as such by some other node). Should be easy to fix and 
[~mambocab], can you have a quick look?

> Fix upgrade paging dtest failures on 2.2->3.0 path
> --
>
> Key: CASSANDRA-10476
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10476
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Benjamin Lerer
> Fix For: 3.0.x
>
>
> EDIT: this list of failures is no longer current; see comments for current 
> failures.
> The following upgrade tests for paging features fail or flap on the upgrade 
> path from 2.2 to 3.0:
> - {{upgrade_tests/paging_test.py:TestPagingData.static_columns_paging_test}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingSize.test_undefined_page_size_default}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingSize.test_with_more_results_than_page_size}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_multiple_cell_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_cell_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_row_deletions}}
> - 
> {{upgrade_tests/paging_test.py:TestPagingDatasetChanges.test_cell_TTL_expiry_during_paging/}}
> I've grouped them all together because I don't know how to tell if they're 
> related; once someone triages them, it may be appropriate to break this out 
> into multiple tickets.
> The failures can be found here:
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingData/static_columns_paging_test/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingSize/test_undefined_page_size_default/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/42/testReport/upgrade_tests.paging_test/TestPagingSize/test_with_more_results_than_page_size/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_failure_threshold_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_multiple_cell_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_single_cell_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_single_row_deletions/history/
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-22_tarball-30_HEAD/44/testReport/upgrade_tests.paging_test/TestPagingDatasetChanges/test_cell_TTL_expiry_during_paging/
> Once [this dtest PR|https://github.com/riptano/cassandra-dtest/pull/586] is 
> merged, these tests should also run with this upgrade path on normal 3.0 
> jobs. Until then, you can run them with the following command:
> {code}
> SKIP=false CASSANDRA_VERSION=binary:2.2.0 UPGRADE_TO=git:cassandra-3.0 
> nosetests 
> upgrade_tests/paging_test.py:TestPagingData.static_columns_paging_test 
> upgrade_tests/paging_test.py:TestPagingSize.test_undefined_page_size_default 
> upgrade_tests/paging_test.py:TestPagingSize.test_with_more_results_than_page_size
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_multiple_cell_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_cell_deletions
>  
> upgrade_tests/paging_test.py:TestPagingWithDeletions.test_single_row_deletions
> upgrade_tests/paging_test.py:TestPagingDatasetChanges.test_cell_TTL_expiry_during_paging

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3

[samt]

Merge branch 'cassandra-3.0' into cassandra-3.3


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

Branch: refs/heads/trunk
Commit: 10207793da3f8bfaa1348c70f21be744724bd54a
Parents: 93f6529 06960d7
Author: Sam Tunnicliffe 
Authored: Thu Jan 14 14:13:23 2016 +
Committer: Sam Tunnicliffe 
Committed: Thu Jan 14 14:13:23 2016 +

--
 CHANGES.txt |  1 +
 .../internal/composites/CompositesSearcher.java |  2 +-
 test/unit/org/apache/cassandra/Util.java| 32 
 .../apache/cassandra/db/SecondaryIndexTest.java | 18 +++
 .../org/apache/cassandra/index/StubIndex.java   | 27 ++---
 5 files changed, 54 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/10207793/CHANGES.txt
--
diff --cc CHANGES.txt
index 85bc100,143ed2d..447b857
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.3
 +3.3
 +Merged from 3.0:
+  * Ensure stale index entries are purged during reads (CASSANDRA-11013)
 + * (cqlsh) Also apply --connect-timeout to control connection
 +   timeout (CASSANDRA-10959)
   * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
   * Fix UnsupportedOperationException when reading old sstable with range
 tombstone (CASSANDRA-10743)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/10207793/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/10207793/test/unit/org/apache/cassandra/Util.java
--
diff --cc test/unit/org/apache/cassandra/Util.java
index 55fa824,7ce8f04..87a07b0
--- a/test/unit/org/apache/cassandra/Util.java
+++ b/test/unit/org/apache/cassandra/Util.java
@@@ -571,4 -564,35 +572,35 @@@ public class Uti
  return content.hasNext() ? content.next() : endOfData();
  }
  }
+ 
+ public static UnfilteredPartitionIterator 
executeLocally(PartitionRangeReadCommand command,
+  
ColumnFamilyStore cfs,
 - ReadOrderGroup 
orderGroup)
++ 
ReadExecutionController controller)
+ {
 -return new 
InternalPartitionRangeReadCommand(command).queryStorageInternal(cfs, 
orderGroup);
++return new 
InternalPartitionRangeReadCommand(command).queryStorageInternal(cfs, 
controller);
+ }
+ 
+ private static final class InternalPartitionRangeReadCommand extends 
PartitionRangeReadCommand
+ {
+ 
+ private InternalPartitionRangeReadCommand(PartitionRangeReadCommand 
original)
+ {
+ super(original.isDigestQuery(),
+   original.digestVersion(),
+   original.isForThrift(),
+   original.metadata(),
+   original.nowInSec(),
+   original.columnFilter(),
+   original.rowFilter(),
+   original.limits(),
+   original.dataRange(),
+   Optional.empty());
+ }
+ 
+ private UnfilteredPartitionIterator 
queryStorageInternal(ColumnFamilyStore cfs,
 - 
ReadOrderGroup orderGroup)
++ 
ReadExecutionController controller)
+ {
 -return queryStorage(cfs, orderGroup);
++return queryStorage(cfs, controller);
+ }
+ }
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/10207793/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
--
diff --cc test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
index cfa0e9e,bbccc48..ee01a47
--- a/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
@@@ -509,4 -515,15 +516,15 @@@ public class SecondaryIndexTes
  assertEquals(count, Util.size(iter));
  }
  }
+ 
+ private void assertIndexCfsIsEmpty(ColumnFamilyStore indexCfs)
+ {
+ PartitionRangeReadCommand command = 
(PartitionRangeReadCommand)Util.cmd(indexCfs).build();
 -try (ReadOrderGroup orderGroup = command.startOrderGroup();
 - 

[3/6] cassandra git commit: Ensure stale index entries are purged on read

[samt]

Ensure stale index entries are purged on read

Patch by Sam Tunnicliffe; reviewed by Benedict Elliot Smith for
CASSANDRA-11013


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

Branch: refs/heads/trunk
Commit: 06960d752ab6748ee87ac6743f0d34004e73468a
Parents: 94e7ef1
Author: Sam Tunnicliffe 
Authored: Thu Jan 14 11:39:30 2016 +
Committer: Sam Tunnicliffe 
Committed: Thu Jan 14 14:06:43 2016 +

--
 CHANGES.txt |  1 +
 .../internal/composites/CompositesSearcher.java |  2 +-
 test/unit/org/apache/cassandra/Util.java| 32 
 .../apache/cassandra/db/SecondaryIndexTest.java | 18 +++
 .../org/apache/cassandra/index/StubIndex.java   | 27 ++---
 5 files changed, 54 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/06960d75/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a37ec99..143ed2d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.3
+ * Ensure stale index entries are purged during reads (CASSANDRA-11013)
  * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
  * Fix UnsupportedOperationException when reading old sstable with range
tombstone (CASSANDRA-10743)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/06960d75/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
--
diff --git 
a/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
 
b/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
index b8ed800..765ae4d 100644
--- 
a/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
+++ 
b/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
@@ -242,7 +242,7 @@ public class CompositesSearcher extends 
CassandraIndexSearcher
 }
 
 @Override
-public void onClose()
+public void onPartitionClose()
 {
 deleteAllEntries(staleEntries, writeOp, nowInSec);
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/06960d75/test/unit/org/apache/cassandra/Util.java
--
diff --git a/test/unit/org/apache/cassandra/Util.java 
b/test/unit/org/apache/cassandra/Util.java
index 8658ff3..7ce8f04 100644
--- a/test/unit/org/apache/cassandra/Util.java
+++ b/test/unit/org/apache/cassandra/Util.java
@@ -57,6 +57,7 @@ import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.apache.cassandra.utils.CounterId;
 import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.concurrent.OpOrder;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -563,4 +564,35 @@ public class Util
 return content.hasNext() ? content.next() : endOfData();
 }
 }
+
+public static UnfilteredPartitionIterator 
executeLocally(PartitionRangeReadCommand command,
+ ColumnFamilyStore 
cfs,
+ ReadOrderGroup 
orderGroup)
+{
+return new 
InternalPartitionRangeReadCommand(command).queryStorageInternal(cfs, 
orderGroup);
+}
+
+private static final class InternalPartitionRangeReadCommand extends 
PartitionRangeReadCommand
+{
+
+private InternalPartitionRangeReadCommand(PartitionRangeReadCommand 
original)
+{
+super(original.isDigestQuery(),
+  original.digestVersion(),
+  original.isForThrift(),
+  original.metadata(),
+  original.nowInSec(),
+  original.columnFilter(),
+  original.rowFilter(),
+  original.limits(),
+  original.dataRange(),
+  Optional.empty());
+}
+
+private UnfilteredPartitionIterator 
queryStorageInternal(ColumnFamilyStore cfs,
+ 
ReadOrderGroup orderGroup)
+{
+return queryStorage(cfs, orderGroup);
+}
+}
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/06960d75/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java

[1/6] cassandra git commit: Ensure stale index entries are purged on read

[samt]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 94e7ef177 -> 06960d752
  refs/heads/cassandra-3.3 93f652939 -> 10207793d
  refs/heads/trunk 367dfd505 -> 512a2fa21


Ensure stale index entries are purged on read

Patch by Sam Tunnicliffe; reviewed by Benedict Elliot Smith for
CASSANDRA-11013


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

Branch: refs/heads/cassandra-3.0
Commit: 06960d752ab6748ee87ac6743f0d34004e73468a
Parents: 94e7ef1
Author: Sam Tunnicliffe 
Authored: Thu Jan 14 11:39:30 2016 +
Committer: Sam Tunnicliffe 
Committed: Thu Jan 14 14:06:43 2016 +

--
 CHANGES.txt |  1 +
 .../internal/composites/CompositesSearcher.java |  2 +-
 test/unit/org/apache/cassandra/Util.java| 32 
 .../apache/cassandra/db/SecondaryIndexTest.java | 18 +++
 .../org/apache/cassandra/index/StubIndex.java   | 27 ++---
 5 files changed, 54 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/06960d75/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a37ec99..143ed2d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.3
+ * Ensure stale index entries are purged during reads (CASSANDRA-11013)
  * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
  * Fix UnsupportedOperationException when reading old sstable with range
tombstone (CASSANDRA-10743)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/06960d75/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
--
diff --git 
a/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
 
b/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
index b8ed800..765ae4d 100644
--- 
a/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
+++ 
b/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
@@ -242,7 +242,7 @@ public class CompositesSearcher extends 
CassandraIndexSearcher
 }
 
 @Override
-public void onClose()
+public void onPartitionClose()
 {
 deleteAllEntries(staleEntries, writeOp, nowInSec);
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/06960d75/test/unit/org/apache/cassandra/Util.java
--
diff --git a/test/unit/org/apache/cassandra/Util.java 
b/test/unit/org/apache/cassandra/Util.java
index 8658ff3..7ce8f04 100644
--- a/test/unit/org/apache/cassandra/Util.java
+++ b/test/unit/org/apache/cassandra/Util.java
@@ -57,6 +57,7 @@ import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.apache.cassandra.utils.CounterId;
 import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.concurrent.OpOrder;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -563,4 +564,35 @@ public class Util
 return content.hasNext() ? content.next() : endOfData();
 }
 }
+
+public static UnfilteredPartitionIterator 
executeLocally(PartitionRangeReadCommand command,
+ ColumnFamilyStore 
cfs,
+ ReadOrderGroup 
orderGroup)
+{
+return new 
InternalPartitionRangeReadCommand(command).queryStorageInternal(cfs, 
orderGroup);
+}
+
+private static final class InternalPartitionRangeReadCommand extends 
PartitionRangeReadCommand
+{
+
+private InternalPartitionRangeReadCommand(PartitionRangeReadCommand 
original)
+{
+super(original.isDigestQuery(),
+  original.digestVersion(),
+  original.isForThrift(),
+  original.metadata(),
+  original.nowInSec(),
+  original.columnFilter(),
+  original.rowFilter(),
+  original.limits(),
+  original.dataRange(),
+  Optional.empty());
+}
+
+private UnfilteredPartitionIterator 
queryStorageInternal(ColumnFamilyStore cfs,
+ 
ReadOrderGroup orderGroup)
+{
+return queryStorage(cfs, orderGroup);
+}
+}
 }

[jira] [Commented] (CASSANDRA-10540) RangeAwareCompaction

[Marcus Eriksson (JIRA)]

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

Marcus Eriksson commented on CASSANDRA-10540:
-

pushed a [new branch|https://github.com/krummas/cassandra/commits/marcuse/10540]

dtest: http://cassci.datastax.com/job/krummas-marcuse-10540-dtest/
utest: http://cassci.datastax.com/job/krummas-marcuse-10540-testall/

I see that there are a few tests that seem to break, I'll look into those

> RangeAwareCompaction
> 
>
> Key: CASSANDRA-10540
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10540
> Project: Cassandra
>  Issue Type: New Feature
>Reporter: Marcus Eriksson
>Assignee: Marcus Eriksson
> Fix For: 3.x
>
>
> Broken out from CASSANDRA-6696, we should split sstables based on ranges 
> during compaction.
> Requirements;
> * dont create tiny sstables - keep them bunched together until a single vnode 
> is big enough (configurable how big that is)
> * make it possible to run existing compaction strategies on the per-range 
> sstables
> We should probably add a global compaction strategy parameter that states 
> whether this should be enabled or not.



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

[jira] [Commented] (CASSANDRA-8927) Mark libjna-java + libjna-jni as incompatible in debian package

[Malte Pickhan (JIRA)]

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

Malte Pickhan commented on CASSANDRA-8927:
--

Actually I currently hit exactly this issue, is there any advice as workaround.

I get the following error during startup:

There is an incompatible JNA native library installed on this system
/usr/java/packages/lib/amd64:/usr/lib/x86_64-linux-gnu/jni:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/usr/lib/jni:/lib:/usr/lib.
To resolve this issue you may do one of the following:
 - remove or uninstall the offending library
 - set the system property jna.nosys=true
 - set jna.boot.library.path to include the path to the version of the 
   jnidispatch library included with the JNA jar file you are using

As far as i understood adding `jna.nosys=true` to the cassandra-env.sh might 
have the implication that cassandra is unable to allocate more memory.

> Mark libjna-java + libjna-jni as incompatible in debian package
> ---
>
> Key: CASSANDRA-8927
> URL: https://issues.apache.org/jira/browse/CASSANDRA-8927
> Project: Cassandra
>  Issue Type: Bug
>  Components: Packaging
> Environment: Debian
>Reporter: Robert Stupp
>Assignee: Michael Shuler
>Priority: Minor
> Fix For: 3.0.x
>
>
> Current Debian (Wheezy) might bring {{libjna-java}} in version 3.2.7-4, which 
> has incompatible {{libjnadispatch.so}} because since C* 2.1 we use JNA 4.0.0 
> (the native stuff changed):
> jna.jar includes all binaries for all supported platforms - so there's no 
> need for libjna installed separately.
> Since CASSANDRA-8714 has been committed, the incompatibility manifests in 
> {{java.lang.NoClassDefFoundError: Could not initialize class 
> com.sun.jna.Native}} (which is caused by outdated libjna-java installed via 
> apt).
> Note: Debian jessie adds new package {{libjna-jni}} (4.1.0-1) in addition to 
> {{libjna-java}} (4.1.0-1) - both contain the {{libjnidispatch.so}}. Although 
> these seem to work, we might hit the same issue when there's a need to 
> upgrade JNA to 4.2.x sometime.



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

[jira] [Commented] (CASSANDRA-11010) Bootstrap hangs on 3.2

[T Jake Luciani (JIRA)]

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

T Jake Luciani commented on CASSANDRA-11010:


I verified this fixes my issue.  and tests look good +1

> Bootstrap hangs on 3.2
> --
>
> Key: CASSANDRA-11010
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11010
> Project: Cassandra
>  Issue Type: Bug
>Reporter: T Jake Luciani
>Assignee: Paulo Motta
>Priority: Blocker
> Fix For: 3.x
>
>
> Doing some testing I've noticed with 3.2 nodes can hang when bootstrapping. 
> below is the snippet from the log of a hung node.
> {quote}
> INFO  [main] 2016-01-14 02:53:25,537 StorageService.java:1281 - JOINING: 
> Starting to bootstrap...
> INFO  [main] 2016-01-14 02:53:25,564 StreamResultFuture.java:88 - [Stream 
> #fb512640-ba69-11e5-8f71-f38b96ae2156] Executing streaming plan for Bootstrap
> DEBUG [main] 2016-01-14 02:53:25,564 StreamCoordinator.java:144 - Connecting 
> next session fb512640-ba69-11e5-8f71-f38b96ae2156 with 172.31.4.27.
> INFO  [StreamConnectionEstablisher:1] 2016-01-14 02:53:25,565 
> StreamSession.java:238 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Starting streaming to /172.31.4.27
> DEBUG [StreamConnectionEstablisher:1] 2016-01-14 02:53:25,566 
> ConnectionHandler.java:82 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Sending stream init for incoming stream
> DEBUG [StreamConnectionEstablisher:1] 2016-01-14 02:53:25,568 
> ConnectionHandler.java:87 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Sending stream init for outgoing stream
> INFO  [StreamConnectionEstablisher:1] 2016-01-14 02:53:25,574 
> StreamCoordinator.java:266 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156, 
> ID#0] Beginning stream session with /172.31.4.27
> DEBUG [STREAM-OUT-/172.31.4.27] 2016-01-14 02:53:25,574 
> ConnectionHandler.java:334 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Sending Prepare (2 requests,  0 files}
> DEBUG [STREAM-IN-/172.31.4.27] 2016-01-14 02:53:25,597 
> ConnectionHandler.java:262 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Received Prepare (0 requests,  0 files}
> DEBUG [STREAM-OUT-/172.31.4.27] 2016-01-14 02:53:25,597 
> ConnectionHandler.java:334 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Sending Complete
> DEBUG [STREAM-IN-/172.31.4.27] 2016-01-14 02:53:25,597 
> ConnectionHandler.java:262 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Received Complete
> DEBUG [STREAM-IN-/172.31.4.27] 2016-01-14 02:53:25,598 
> ConnectionHandler.java:110 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Closing stream connection handler on /172.31.4.27
> INFO  [STREAM-IN-/172.31.4.27] 2016-01-14 02:53:25,598 
> StreamResultFuture.java:185 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Session with /172.31.4.27 is complete
> {quote}
> Vs the log of a successful bootstrap.
> {quote}
> INFO  [main] 2016-01-14 03:54:13,068 StreamResultFuture.java:88 - [Stream 
> #7963f460-ba72-11e5-b8d5-834198444b31] Executing streaming plan for Bootstrap
> INFO  [StreamConnectionEstablisher:1] 2016-01-14 03:54:13,070 
> StreamSession.java:238 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31] 
> Starting streaming to /172.31.18.61
> INFO  [StreamConnectionEstablisher:1] 2016-01-14 03:54:13,086 
> StreamCoordinator.java:266 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31, 
> ID#0] Beginning stream session with /172.31.18.61
> INFO  [STREAM-IN-/172.31.18.61] 2016-01-14 03:54:13,198 
> StreamResultFuture.java:171 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31 
> ID#0] Prepare completed. Receiving 1 files(102 bytes), sending 0 files(0 
> bytes)
> INFO  [StreamConnectionEstablisher:2] 2016-01-14 03:54:13,206 
> StreamSession.java:238 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31] 
> Starting streaming to /172.31.21.58
> INFO  [StreamConnectionEstablisher:2] 2016-01-14 03:54:13,209 
> StreamCoordinator.java:266 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31, 
> ID#0] Beginning stream session with /172.31.21.58
> INFO  [STREAM-IN-/172.31.21.58] 2016-01-14 03:54:13,255 
> StreamResultFuture.java:185 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31] 
> Session with /172.31.21.58 is complete
> INFO  [StreamReceiveTask:1] 2016-01-14 03:54:13,590 
> StreamResultFuture.java:185 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31] 
> Session with /172.31.18.61 is complete
> INFO  [StreamReceiveTask:1] 2016-01-14 03:54:13,594 
> StreamResultFuture.java:217 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31] 
> All sessions completed
> INFO  [StreamReceiveTask:1] 2016-01-14 03:54:13,597 StorageService.java:1234 
> - Bootstrap completed! for the tokens [3074457345618258602]
> INFO  [main] 2016-01-14 03:54:14,424 StorageService.java:1924 - Node 
> /172.31.29.26 state jump to NORMAL
> {quote}
> The jstack of the bad 

[jira] [Updated] (CASSANDRA-11010) Bootstrap hangs on 3.2

[T Jake Luciani (JIRA)]

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

T Jake Luciani updated CASSANDRA-11010:
---
Reviewer: T Jake Luciani  (was: Yuki Morishita)

> Bootstrap hangs on 3.2
> --
>
> Key: CASSANDRA-11010
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11010
> Project: Cassandra
>  Issue Type: Bug
>Reporter: T Jake Luciani
>Assignee: Paulo Motta
>Priority: Blocker
> Fix For: 3.x
>
>
> Doing some testing I've noticed with 3.2 nodes can hang when bootstrapping. 
> below is the snippet from the log of a hung node.
> {quote}
> INFO  [main] 2016-01-14 02:53:25,537 StorageService.java:1281 - JOINING: 
> Starting to bootstrap...
> INFO  [main] 2016-01-14 02:53:25,564 StreamResultFuture.java:88 - [Stream 
> #fb512640-ba69-11e5-8f71-f38b96ae2156] Executing streaming plan for Bootstrap
> DEBUG [main] 2016-01-14 02:53:25,564 StreamCoordinator.java:144 - Connecting 
> next session fb512640-ba69-11e5-8f71-f38b96ae2156 with 172.31.4.27.
> INFO  [StreamConnectionEstablisher:1] 2016-01-14 02:53:25,565 
> StreamSession.java:238 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Starting streaming to /172.31.4.27
> DEBUG [StreamConnectionEstablisher:1] 2016-01-14 02:53:25,566 
> ConnectionHandler.java:82 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Sending stream init for incoming stream
> DEBUG [StreamConnectionEstablisher:1] 2016-01-14 02:53:25,568 
> ConnectionHandler.java:87 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Sending stream init for outgoing stream
> INFO  [StreamConnectionEstablisher:1] 2016-01-14 02:53:25,574 
> StreamCoordinator.java:266 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156, 
> ID#0] Beginning stream session with /172.31.4.27
> DEBUG [STREAM-OUT-/172.31.4.27] 2016-01-14 02:53:25,574 
> ConnectionHandler.java:334 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Sending Prepare (2 requests,  0 files}
> DEBUG [STREAM-IN-/172.31.4.27] 2016-01-14 02:53:25,597 
> ConnectionHandler.java:262 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Received Prepare (0 requests,  0 files}
> DEBUG [STREAM-OUT-/172.31.4.27] 2016-01-14 02:53:25,597 
> ConnectionHandler.java:334 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Sending Complete
> DEBUG [STREAM-IN-/172.31.4.27] 2016-01-14 02:53:25,597 
> ConnectionHandler.java:262 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Received Complete
> DEBUG [STREAM-IN-/172.31.4.27] 2016-01-14 02:53:25,598 
> ConnectionHandler.java:110 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Closing stream connection handler on /172.31.4.27
> INFO  [STREAM-IN-/172.31.4.27] 2016-01-14 02:53:25,598 
> StreamResultFuture.java:185 - [Stream #fb512640-ba69-11e5-8f71-f38b96ae2156] 
> Session with /172.31.4.27 is complete
> {quote}
> Vs the log of a successful bootstrap.
> {quote}
> INFO  [main] 2016-01-14 03:54:13,068 StreamResultFuture.java:88 - [Stream 
> #7963f460-ba72-11e5-b8d5-834198444b31] Executing streaming plan for Bootstrap
> INFO  [StreamConnectionEstablisher:1] 2016-01-14 03:54:13,070 
> StreamSession.java:238 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31] 
> Starting streaming to /172.31.18.61
> INFO  [StreamConnectionEstablisher:1] 2016-01-14 03:54:13,086 
> StreamCoordinator.java:266 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31, 
> ID#0] Beginning stream session with /172.31.18.61
> INFO  [STREAM-IN-/172.31.18.61] 2016-01-14 03:54:13,198 
> StreamResultFuture.java:171 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31 
> ID#0] Prepare completed. Receiving 1 files(102 bytes), sending 0 files(0 
> bytes)
> INFO  [StreamConnectionEstablisher:2] 2016-01-14 03:54:13,206 
> StreamSession.java:238 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31] 
> Starting streaming to /172.31.21.58
> INFO  [StreamConnectionEstablisher:2] 2016-01-14 03:54:13,209 
> StreamCoordinator.java:266 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31, 
> ID#0] Beginning stream session with /172.31.21.58
> INFO  [STREAM-IN-/172.31.21.58] 2016-01-14 03:54:13,255 
> StreamResultFuture.java:185 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31] 
> Session with /172.31.21.58 is complete
> INFO  [StreamReceiveTask:1] 2016-01-14 03:54:13,590 
> StreamResultFuture.java:185 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31] 
> Session with /172.31.18.61 is complete
> INFO  [StreamReceiveTask:1] 2016-01-14 03:54:13,594 
> StreamResultFuture.java:217 - [Stream #7963f460-ba72-11e5-b8d5-834198444b31] 
> All sessions completed
> INFO  [StreamReceiveTask:1] 2016-01-14 03:54:13,597 StorageService.java:1234 
> - Bootstrap completed! for the tokens [3074457345618258602]
> INFO  [main] 2016-01-14 03:54:14,424 StorageService.java:1924 - Node 
> /172.31.29.26 state jump to NORMAL
> {quote}
> The jstack of the bad bootstrap shows it waiting for the stream to 

[jira] [Commented] (CASSANDRA-7555) Support copy and link for commitlog archiving without forking the jvm

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne commented on CASSANDRA-7555:
-

[~JoshuaMcKenzie] Pinging you since you seem to have dropped the ball on this.

> Support copy and link for commitlog archiving without forking the jvm
> -
>
> Key: CASSANDRA-7555
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7555
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Local Write-Read Paths
>Reporter: Nick Bailey
>Assignee: Joshua McKenzie
>Priority: Minor
> Fix For: 3.x
>
>
> Right now for commitlog archiving the user specifies a command to run and c* 
> forks the jvm to run that command. The most common operations will be either 
> copy or link (hard or soft). Since we can do all of these operations without 
> forking the jvm, which is very expensive, we should have special cases for 
> those.



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

[jira] [Commented] (CASSANDRA-8927) Mark libjna-java + libjna-jni as incompatible in debian package

[Michael Shuler (JIRA)]

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

Michael Shuler commented on CASSANDRA-8927:
---

I'm not completely sure if {{-Djna.nosys=true}} will only ignore the 
system-install of libjna-java package, or disable JNA completely. Still need to 
repro and see how this behaves. Thanks for the update, [~malpi].

> Mark libjna-java + libjna-jni as incompatible in debian package
> ---
>
> Key: CASSANDRA-8927
> URL: https://issues.apache.org/jira/browse/CASSANDRA-8927
> Project: Cassandra
>  Issue Type: Bug
>  Components: Packaging
> Environment: Debian
>Reporter: Robert Stupp
>Assignee: Michael Shuler
>Priority: Minor
> Fix For: 3.0.x
>
>
> Current Debian (Wheezy) might bring {{libjna-java}} in version 3.2.7-4, which 
> has incompatible {{libjnadispatch.so}} because since C* 2.1 we use JNA 4.0.0 
> (the native stuff changed):
> jna.jar includes all binaries for all supported platforms - so there's no 
> need for libjna installed separately.
> Since CASSANDRA-8714 has been committed, the incompatibility manifests in 
> {{java.lang.NoClassDefFoundError: Could not initialize class 
> com.sun.jna.Native}} (which is caused by outdated libjna-java installed via 
> apt).
> Note: Debian jessie adds new package {{libjna-jni}} (4.1.0-1) in addition to 
> {{libjna-java}} (4.1.0-1) - both contain the {{libjnidispatch.so}}. Although 
> these seem to work, we might hit the same issue when there's a need to 
> upgrade JNA to 4.2.x sometime.



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

[jira] [Updated] (CASSANDRA-7075) Add the ability to automatically distribute your commitlogs across all data volumes

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-7075:

Reviewer:   (was: Benedict)

> Add the ability to automatically distribute your commitlogs across all data 
> volumes
> ---
>
> Key: CASSANDRA-7075
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7075
> Project: Cassandra
>  Issue Type: New Feature
>  Components: Local Write-Read Paths
>Reporter: Tupshin Harper
>Assignee: Branimir Lambov
>Priority: Minor
>  Labels: performance
> Fix For: 3.x
>
>
> given the prevalance of ssds (no need to separate commitlog and data), and 
> improved jbod support, along with CASSANDRA-3578, it seems like we should 
> have an option to have one commitlog per data volume, to even the load. i've 
> been seeing more and more cases where there isn't an obvious "extra" volume 
> to put the commitlog on, and sticking it on only one of the jbodded ssd 
> volumes leads to IO imbalance.



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

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

[samt]

Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: 512a2fa21fa77bd8780733186747529343176160
Parents: 367dfd5 1020779
Author: Sam Tunnicliffe 
Authored: Thu Jan 14 14:14:29 2016 +
Committer: Sam Tunnicliffe 
Committed: Thu Jan 14 14:14:29 2016 +

--
 CHANGES.txt |  1 +
 .../internal/composites/CompositesSearcher.java |  2 +-
 test/unit/org/apache/cassandra/Util.java| 32 
 .../apache/cassandra/db/SecondaryIndexTest.java | 18 +++
 .../org/apache/cassandra/index/StubIndex.java   | 27 ++---
 5 files changed, 54 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/512a2fa2/CHANGES.txt
--
diff --cc CHANGES.txt
index b2df9f7,447b857..b59f182
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,6 +1,14 @@@
 +3.4
 + * Simplify row cache invalidation code (CASSANDRA-10396)
 + * Support user-defined compaction through nodetool (CASSANDRA-10660)
 + * Stripe view locks by key and table ID to reduce contention 
(CASSANDRA-10981)
 + * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953)
 + * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838)
 +
 +
  3.3
  Merged from 3.0:
+  * Ensure stale index entries are purged during reads (CASSANDRA-11013)
   * (cqlsh) Also apply --connect-timeout to control connection
 timeout (CASSANDRA-10959)
   * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)

[2/6] cassandra git commit: Ensure stale index entries are purged on read

[samt]

Ensure stale index entries are purged on read

Patch by Sam Tunnicliffe; reviewed by Benedict Elliot Smith for
CASSANDRA-11013


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

Branch: refs/heads/cassandra-3.3
Commit: 06960d752ab6748ee87ac6743f0d34004e73468a
Parents: 94e7ef1
Author: Sam Tunnicliffe 
Authored: Thu Jan 14 11:39:30 2016 +
Committer: Sam Tunnicliffe 
Committed: Thu Jan 14 14:06:43 2016 +

--
 CHANGES.txt |  1 +
 .../internal/composites/CompositesSearcher.java |  2 +-
 test/unit/org/apache/cassandra/Util.java| 32 
 .../apache/cassandra/db/SecondaryIndexTest.java | 18 +++
 .../org/apache/cassandra/index/StubIndex.java   | 27 ++---
 5 files changed, 54 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/06960d75/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a37ec99..143ed2d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.3
+ * Ensure stale index entries are purged during reads (CASSANDRA-11013)
  * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
  * Fix UnsupportedOperationException when reading old sstable with range
tombstone (CASSANDRA-10743)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/06960d75/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
--
diff --git 
a/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
 
b/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
index b8ed800..765ae4d 100644
--- 
a/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
+++ 
b/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
@@ -242,7 +242,7 @@ public class CompositesSearcher extends 
CassandraIndexSearcher
 }
 
 @Override
-public void onClose()
+public void onPartitionClose()
 {
 deleteAllEntries(staleEntries, writeOp, nowInSec);
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/06960d75/test/unit/org/apache/cassandra/Util.java
--
diff --git a/test/unit/org/apache/cassandra/Util.java 
b/test/unit/org/apache/cassandra/Util.java
index 8658ff3..7ce8f04 100644
--- a/test/unit/org/apache/cassandra/Util.java
+++ b/test/unit/org/apache/cassandra/Util.java
@@ -57,6 +57,7 @@ import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.apache.cassandra.utils.CounterId;
 import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.concurrent.OpOrder;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -563,4 +564,35 @@ public class Util
 return content.hasNext() ? content.next() : endOfData();
 }
 }
+
+public static UnfilteredPartitionIterator 
executeLocally(PartitionRangeReadCommand command,
+ ColumnFamilyStore 
cfs,
+ ReadOrderGroup 
orderGroup)
+{
+return new 
InternalPartitionRangeReadCommand(command).queryStorageInternal(cfs, 
orderGroup);
+}
+
+private static final class InternalPartitionRangeReadCommand extends 
PartitionRangeReadCommand
+{
+
+private InternalPartitionRangeReadCommand(PartitionRangeReadCommand 
original)
+{
+super(original.isDigestQuery(),
+  original.digestVersion(),
+  original.isForThrift(),
+  original.metadata(),
+  original.nowInSec(),
+  original.columnFilter(),
+  original.rowFilter(),
+  original.limits(),
+  original.dataRange(),
+  Optional.empty());
+}
+
+private UnfilteredPartitionIterator 
queryStorageInternal(ColumnFamilyStore cfs,
+ 
ReadOrderGroup orderGroup)
+{
+return queryStorage(cfs, orderGroup);
+}
+}
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/06960d75/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java

[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3

[samt]

Merge branch 'cassandra-3.0' into cassandra-3.3


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

Branch: refs/heads/cassandra-3.3
Commit: 10207793da3f8bfaa1348c70f21be744724bd54a
Parents: 93f6529 06960d7
Author: Sam Tunnicliffe 
Authored: Thu Jan 14 14:13:23 2016 +
Committer: Sam Tunnicliffe 
Committed: Thu Jan 14 14:13:23 2016 +

--
 CHANGES.txt |  1 +
 .../internal/composites/CompositesSearcher.java |  2 +-
 test/unit/org/apache/cassandra/Util.java| 32 
 .../apache/cassandra/db/SecondaryIndexTest.java | 18 +++
 .../org/apache/cassandra/index/StubIndex.java   | 27 ++---
 5 files changed, 54 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/10207793/CHANGES.txt
--
diff --cc CHANGES.txt
index 85bc100,143ed2d..447b857
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.3
 +3.3
 +Merged from 3.0:
+  * Ensure stale index entries are purged during reads (CASSANDRA-11013)
 + * (cqlsh) Also apply --connect-timeout to control connection
 +   timeout (CASSANDRA-10959)
   * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
   * Fix UnsupportedOperationException when reading old sstable with range
 tombstone (CASSANDRA-10743)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/10207793/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/10207793/test/unit/org/apache/cassandra/Util.java
--
diff --cc test/unit/org/apache/cassandra/Util.java
index 55fa824,7ce8f04..87a07b0
--- a/test/unit/org/apache/cassandra/Util.java
+++ b/test/unit/org/apache/cassandra/Util.java
@@@ -571,4 -564,35 +572,35 @@@ public class Uti
  return content.hasNext() ? content.next() : endOfData();
  }
  }
+ 
+ public static UnfilteredPartitionIterator 
executeLocally(PartitionRangeReadCommand command,
+  
ColumnFamilyStore cfs,
 - ReadOrderGroup 
orderGroup)
++ 
ReadExecutionController controller)
+ {
 -return new 
InternalPartitionRangeReadCommand(command).queryStorageInternal(cfs, 
orderGroup);
++return new 
InternalPartitionRangeReadCommand(command).queryStorageInternal(cfs, 
controller);
+ }
+ 
+ private static final class InternalPartitionRangeReadCommand extends 
PartitionRangeReadCommand
+ {
+ 
+ private InternalPartitionRangeReadCommand(PartitionRangeReadCommand 
original)
+ {
+ super(original.isDigestQuery(),
+   original.digestVersion(),
+   original.isForThrift(),
+   original.metadata(),
+   original.nowInSec(),
+   original.columnFilter(),
+   original.rowFilter(),
+   original.limits(),
+   original.dataRange(),
+   Optional.empty());
+ }
+ 
+ private UnfilteredPartitionIterator 
queryStorageInternal(ColumnFamilyStore cfs,
 - 
ReadOrderGroup orderGroup)
++ 
ReadExecutionController controller)
+ {
 -return queryStorage(cfs, orderGroup);
++return queryStorage(cfs, controller);
+ }
+ }
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/10207793/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
--
diff --cc test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
index cfa0e9e,bbccc48..ee01a47
--- a/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
@@@ -509,4 -515,15 +516,15 @@@ public class SecondaryIndexTes
  assertEquals(count, Util.size(iter));
  }
  }
+ 
+ private void assertIndexCfsIsEmpty(ColumnFamilyStore indexCfs)
+ {
+ PartitionRangeReadCommand command = 
(PartitionRangeReadCommand)Util.cmd(indexCfs).build();
 -try (ReadOrderGroup orderGroup = command.startOrderGroup();
 - 

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

[yukim]

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/a3ae9d8b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3ae9d8b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3ae9d8b

Branch: refs/heads/cassandra-3.0
Commit: a3ae9d8bdcef2576460b5316e8c0375d96a78c46
Parents: 162edc2 101cd72
Author: Yuki Morishita 
Authored: Thu Jan 14 09:57:59 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Jan 14 09:57:59 2016 -0600

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java| 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3ae9d8b/CHANGES.txt
--
diff --cc CHANGES.txt
index 143ed2d,52e3d4d..aebdc26
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
 -2.2.5
 +3.0.3
 + * Ensure stale index entries are purged during reads (CASSANDRA-11013)
 + * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
 + * Fix UnsupportedOperationException when reading old sstable with range
 +   tombstone (CASSANDRA-10743)
 + * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
 + * Fix potential assertion error during compaction (CASSANDRA-10944)
 + * Fix counting of received sstables in streaming (CASSANDRA-10949)
 + * Implement hints compression (CASSANDRA-9428)
 + * Fix potential assertion error when reading static columns (CASSANDRA-10903)
 + * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
 + * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
 + * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
 + * Add back support for 3rd party auth providers to bulk loader 
(CASSANDRA-10873)
 + * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
 + * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes 
(CASSANDRA-10837)
 + * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)
 +Merged from 2.2:
+  * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
   * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
   * Fix error streaming section more than 2GB (CASSANDRA-10961)
   * (cqlsh) Also apply --connect-timeout to control connection

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

[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3

[yukim]

Merge branch 'cassandra-3.0' into cassandra-3.3


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

Branch: refs/heads/trunk
Commit: 628c07678c022c5f062cba760056d9f22bc244cb
Parents: 09364e0 a3ae9d8
Author: Yuki Morishita 
Authored: Thu Jan 14 09:58:43 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Jan 14 09:58:43 2016 -0600

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java| 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/628c0767/CHANGES.txt
--
diff --cc CHANGES.txt
index bf873fc,aebdc26..bfe1730
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,9 -5,22 +9,10 @@@ Merged from 3.0
 tombstone (CASSANDRA-10743)
   * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
   * Fix potential assertion error during compaction (CASSANDRA-10944)
 - * Fix counting of received sstables in streaming (CASSANDRA-10949)
 - * Implement hints compression (CASSANDRA-9428)
 - * Fix potential assertion error when reading static columns (CASSANDRA-10903)
 - * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
 - * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
 - * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
 - * Add back support for 3rd party auth providers to bulk loader 
(CASSANDRA-10873)
 - * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
 - * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes 
(CASSANDRA-10837)
 - * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)
  Merged from 2.2:
+  * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
   * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
   * Fix error streaming section more than 2GB (CASSANDRA-10961)
 - * (cqlsh) Also apply --connect-timeout to control connection
 -   timeout (CASSANDRA-10959)
   * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
   * Enable GC logging by default (CASSANDRA-10140)
   * Optimize pending range computation (CASSANDRA-9258)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/628c0767/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 1f39767,28e4174..3e7b198
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -266,12 -265,12 +266,12 @@@ public class CompactionManager implemen
  private AllSSTableOpStatus parallelAllSSTableOperation(final 
ColumnFamilyStore cfs, final OneSSTableOperation operation, OperationType 
operationType) throws ExecutionException, InterruptedException
  {
  List transactions = new ArrayList<>();
- try (LifecycleTransaction compacting = 
cfs.markAllCompacting(operationType);)
+ try (LifecycleTransaction compacting = 
cfs.markAllCompacting(operationType))
  {
- Iterable sstables = 
Lists.newArrayList(operation.filterSSTables(compacting));
+ Iterable sstables = compacting != null ? 
Lists.newArrayList(operation.filterSSTables(compacting)) : 
Collections.emptyList();
  if (Iterables.isEmpty(sstables))
  {
 -logger.info("No sstables for {}.{}", cfs.keyspace.getName(), 
cfs.name);
 +logger.info("No sstables to {} for {}.{}", 
operationType.name(), cfs.keyspace.getName(), cfs.name);
  return AllSSTableOpStatus.SUCCESSFUL;
  }
  

[02/10] cassandra git commit: Avoid NPE when performing sstable tasks (scrub etc)

[yukim]

Avoid NPE when performing sstable tasks (scrub etc)

patch by yukim; reviewed by marcuse for CASSANDRA-10980


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

Branch: refs/heads/cassandra-3.0
Commit: 101cd72e55168f6a97bbb2556aed9f23cef80f42
Parents: 97474ee
Author: Yuki Morishita 
Authored: Mon Jan 11 14:48:38 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Jan 14 09:56:59 2016 -0600

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java| 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/101cd72e/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 6530956..52e3d4d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.5
+ * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
  * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
  * Fix error streaming section more than 2GB (CASSANDRA-10961)
  * (cqlsh) Also apply --connect-timeout to control connection

http://git-wip-us.apache.org/repos/asf/cassandra/blob/101cd72e/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index ba9c25e..e0caf76 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -258,9 +258,9 @@ public class CompactionManager implements 
CompactionManagerMBean
 private AllSSTableOpStatus parallelAllSSTableOperation(final 
ColumnFamilyStore cfs, final OneSSTableOperation operation, OperationType 
operationType) throws ExecutionException, InterruptedException
 {
 List transactions = new ArrayList<>();
-try (LifecycleTransaction compacting = 
cfs.markAllCompacting(operationType);)
+try (LifecycleTransaction compacting = 
cfs.markAllCompacting(operationType))
 {
-Iterable sstables = 
Lists.newArrayList(operation.filterSSTables(compacting));
+Iterable sstables = compacting != null ? 
Lists.newArrayList(operation.filterSSTables(compacting)) : 
Collections.emptyList();
 if (Iterables.isEmpty(sstables))
 {
 logger.info("No sstables for {}.{}", cfs.keyspace.getName(), 
cfs.name);

[jira] [Updated] (CASSANDRA-11007) Exception when running nodetool info during bootstrap

[T Jake Luciani (JIRA)]

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

T Jake Luciani updated CASSANDRA-11007:
---
Labels: fallout  (was: )

> Exception when running nodetool info during bootstrap
> -
>
> Key: CASSANDRA-11007
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11007
> Project: Cassandra
>  Issue Type: Bug
>Reporter: T Jake Luciani
>Priority: Minor
>  Labels: fallout
> Fix For: 3.0.x
>
>
> {code}
> automaton@ip-172-31-26-150:~$ nodetool info
> ID : 7d9aa832-de94-43ab-9548-b2e710418301
> Gossip active  : true
> Thrift active  : false
> Native Transport active: false
> Load   : 114.52 KB
> Generation No  : 1452721596
> Uptime (seconds)   : 1396
> Heap Memory (MB)   : 71.80 / 1842.00
> Off Heap Memory (MB)   : 0.00
> Data Center: datacenter1
> Rack   : rack1
> Exceptions : 0
> Key Cache  : entries 11, size 888 bytes, capacity 92 MB, 180 
> hits, 212 requests, 0.849 recent hit rate, 14400 save period in seconds
> Row Cache  : entries 0, size 0 bytes, capacity 0 bytes, 0 hits, 0 
> requests, NaN recent hit rate, 0 save period in seconds
> Counter Cache  : entries 0, size 0 bytes, capacity 46 MB, 0 hits, 0 
> requests, NaN recent hit rate, 7200 save period in seconds
> error: null
> -- StackTrace --
> java.lang.AssertionError
>   at 
> org.apache.cassandra.locator.TokenMetadata.getTokens(TokenMetadata.java:488)
>   at 
> org.apache.cassandra.service.StorageService.getTokens(StorageService.java:2561)
>   at 
> org.apache.cassandra.service.StorageService.getTokens(StorageService.java:2550)
>   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>   at 
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
>   at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:497)
>   at sun.reflect.misc.Trampoline.invoke(MethodUtil.java:71)
>   at sun.reflect.GeneratedMethodAccessor3.invoke(Unknown Source)
>   at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:497)
>   at sun.reflect.misc.MethodUtil.invoke(MethodUtil.java:275)
>   at 
> com.sun.jmx.mbeanserver.StandardMBeanIntrospector.invokeM2(StandardMBeanIntrospector.java:112)
>   at 
> com.sun.jmx.mbeanserver.StandardMBeanIntrospector.invokeM2(StandardMBeanIntrospector.java:46)
>   at 
> com.sun.jmx.mbeanserver.MBeanIntrospector.invokeM(MBeanIntrospector.java:237)
>   at 
> com.sun.jmx.mbeanserver.PerInterface.getAttribute(PerInterface.java:83)
>   at 
> com.sun.jmx.mbeanserver.MBeanSupport.getAttribute(MBeanSupport.java:206)
>   at 
> com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.getAttribute(DefaultMBeanServerInterceptor.java:647)
>   at 
> com.sun.jmx.mbeanserver.JmxMBeanServer.getAttribute(JmxMBeanServer.java:678)
>   at 
> javax.management.remote.rmi.RMIConnectionImpl.doOperation(RMIConnectionImpl.java:1443)
>   at 
> javax.management.remote.rmi.RMIConnectionImpl.access$300(RMIConnectionImpl.java:76)
>   at 
> javax.management.remote.rmi.RMIConnectionImpl$PrivilegedOperation.run(RMIConnectionImpl.java:1307)
>   at 
> javax.management.remote.rmi.RMIConnectionImpl.doPrivilegedOperation(RMIConnectionImpl.java:1399)
>   at 
> javax.management.remote.rmi.RMIConnectionImpl.getAttribute(RMIConnectionImpl.java:637)
>   at sun.reflect.GeneratedMethodAccessor6.invoke(Unknown Source)
>   at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:497)
>   at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:323)
>   at sun.rmi.transport.Transport$1.run(Transport.java:200)
>   at sun.rmi.transport.Transport$1.run(Transport.java:197)
>   at java.security.AccessController.doPrivileged(Native Method)
>   at sun.rmi.transport.Transport.serviceCall(Transport.java:196)
>   at 
> sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:568)
>   at 
> sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:826)
>   at 
> sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$94(TCPTransport.java:683)
>   at 
> sun.rmi.transport.tcp.TCPTransport$ConnectionHandler$$Lambda$179/2070569218.run(Unknown
>  Source)
>   at java.security.AccessController.doPrivileged(Native Method)
>   at 
> sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:682)
>   at 
> 

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

[yukim]

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/a3ae9d8b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3ae9d8b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3ae9d8b

Branch: refs/heads/trunk
Commit: a3ae9d8bdcef2576460b5316e8c0375d96a78c46
Parents: 162edc2 101cd72
Author: Yuki Morishita 
Authored: Thu Jan 14 09:57:59 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Jan 14 09:57:59 2016 -0600

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java| 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3ae9d8b/CHANGES.txt
--
diff --cc CHANGES.txt
index 143ed2d,52e3d4d..aebdc26
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
 -2.2.5
 +3.0.3
 + * Ensure stale index entries are purged during reads (CASSANDRA-11013)
 + * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
 + * Fix UnsupportedOperationException when reading old sstable with range
 +   tombstone (CASSANDRA-10743)
 + * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
 + * Fix potential assertion error during compaction (CASSANDRA-10944)
 + * Fix counting of received sstables in streaming (CASSANDRA-10949)
 + * Implement hints compression (CASSANDRA-9428)
 + * Fix potential assertion error when reading static columns (CASSANDRA-10903)
 + * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
 + * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
 + * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
 + * Add back support for 3rd party auth providers to bulk loader 
(CASSANDRA-10873)
 + * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
 + * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes 
(CASSANDRA-10837)
 + * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)
 +Merged from 2.2:
+  * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
   * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
   * Fix error streaming section more than 2GB (CASSANDRA-10961)
   * (cqlsh) Also apply --connect-timeout to control connection

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

[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

[yukim]

Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: fc89a379cda4966dd57e3c65ebb5f383cd846925
Parents: ef4d450 628c076
Author: Yuki Morishita 
Authored: Thu Jan 14 09:58:53 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Jan 14 09:58:53 2016 -0600

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java| 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


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

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3

[yukim]

Merge branch 'cassandra-3.0' into cassandra-3.3


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

Branch: refs/heads/cassandra-3.3
Commit: 628c07678c022c5f062cba760056d9f22bc244cb
Parents: 09364e0 a3ae9d8
Author: Yuki Morishita 
Authored: Thu Jan 14 09:58:43 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Jan 14 09:58:43 2016 -0600

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java| 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/628c0767/CHANGES.txt
--
diff --cc CHANGES.txt
index bf873fc,aebdc26..bfe1730
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,9 -5,22 +9,10 @@@ Merged from 3.0
 tombstone (CASSANDRA-10743)
   * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
   * Fix potential assertion error during compaction (CASSANDRA-10944)
 - * Fix counting of received sstables in streaming (CASSANDRA-10949)
 - * Implement hints compression (CASSANDRA-9428)
 - * Fix potential assertion error when reading static columns (CASSANDRA-10903)
 - * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
 - * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
 - * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
 - * Add back support for 3rd party auth providers to bulk loader 
(CASSANDRA-10873)
 - * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
 - * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes 
(CASSANDRA-10837)
 - * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)
  Merged from 2.2:
+  * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
   * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
   * Fix error streaming section more than 2GB (CASSANDRA-10961)
 - * (cqlsh) Also apply --connect-timeout to control connection
 -   timeout (CASSANDRA-10959)
   * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
   * Enable GC logging by default (CASSANDRA-10140)
   * Optimize pending range computation (CASSANDRA-9258)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/628c0767/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 1f39767,28e4174..3e7b198
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -266,12 -265,12 +266,12 @@@ public class CompactionManager implemen
  private AllSSTableOpStatus parallelAllSSTableOperation(final 
ColumnFamilyStore cfs, final OneSSTableOperation operation, OperationType 
operationType) throws ExecutionException, InterruptedException
  {
  List transactions = new ArrayList<>();
- try (LifecycleTransaction compacting = 
cfs.markAllCompacting(operationType);)
+ try (LifecycleTransaction compacting = 
cfs.markAllCompacting(operationType))
  {
- Iterable sstables = 
Lists.newArrayList(operation.filterSSTables(compacting));
+ Iterable sstables = compacting != null ? 
Lists.newArrayList(operation.filterSSTables(compacting)) : 
Collections.emptyList();
  if (Iterables.isEmpty(sstables))
  {
 -logger.info("No sstables for {}.{}", cfs.keyspace.getName(), 
cfs.name);
 +logger.info("No sstables to {} for {}.{}", 
operationType.name(), cfs.keyspace.getName(), cfs.name);
  return AllSSTableOpStatus.SUCCESSFUL;
  }
  

[04/10] cassandra git commit: Avoid NPE when performing sstable tasks (scrub etc)

[yukim]

Avoid NPE when performing sstable tasks (scrub etc)

patch by yukim; reviewed by marcuse for CASSANDRA-10980


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

Branch: refs/heads/trunk
Commit: 101cd72e55168f6a97bbb2556aed9f23cef80f42
Parents: 97474ee
Author: Yuki Morishita 
Authored: Mon Jan 11 14:48:38 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Jan 14 09:56:59 2016 -0600

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java| 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/101cd72e/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 6530956..52e3d4d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.5
+ * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
  * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
  * Fix error streaming section more than 2GB (CASSANDRA-10961)
  * (cqlsh) Also apply --connect-timeout to control connection

http://git-wip-us.apache.org/repos/asf/cassandra/blob/101cd72e/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index ba9c25e..e0caf76 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -258,9 +258,9 @@ public class CompactionManager implements 
CompactionManagerMBean
 private AllSSTableOpStatus parallelAllSSTableOperation(final 
ColumnFamilyStore cfs, final OneSSTableOperation operation, OperationType 
operationType) throws ExecutionException, InterruptedException
 {
 List transactions = new ArrayList<>();
-try (LifecycleTransaction compacting = 
cfs.markAllCompacting(operationType);)
+try (LifecycleTransaction compacting = 
cfs.markAllCompacting(operationType))
 {
-Iterable sstables = 
Lists.newArrayList(operation.filterSSTables(compacting));
+Iterable sstables = compacting != null ? 
Lists.newArrayList(operation.filterSSTables(compacting)) : 
Collections.emptyList();
 if (Iterables.isEmpty(sstables))
 {
 logger.info("No sstables for {}.{}", cfs.keyspace.getName(), 
cfs.name);

[01/10] cassandra git commit: Avoid NPE when performing sstable tasks (scrub etc)

[yukim]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 97474ee36 -> 101cd72e5
  refs/heads/cassandra-3.0 162edc26e -> a3ae9d8bd
  refs/heads/cassandra-3.3 09364e03e -> 628c07678
  refs/heads/trunk ef4d4506e -> fc89a379c


Avoid NPE when performing sstable tasks (scrub etc)

patch by yukim; reviewed by marcuse for CASSANDRA-10980


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

Branch: refs/heads/cassandra-2.2
Commit: 101cd72e55168f6a97bbb2556aed9f23cef80f42
Parents: 97474ee
Author: Yuki Morishita 
Authored: Mon Jan 11 14:48:38 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Jan 14 09:56:59 2016 -0600

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java| 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/101cd72e/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 6530956..52e3d4d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.5
+ * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
  * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
  * Fix error streaming section more than 2GB (CASSANDRA-10961)
  * (cqlsh) Also apply --connect-timeout to control connection

http://git-wip-us.apache.org/repos/asf/cassandra/blob/101cd72e/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index ba9c25e..e0caf76 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -258,9 +258,9 @@ public class CompactionManager implements 
CompactionManagerMBean
 private AllSSTableOpStatus parallelAllSSTableOperation(final 
ColumnFamilyStore cfs, final OneSSTableOperation operation, OperationType 
operationType) throws ExecutionException, InterruptedException
 {
 List transactions = new ArrayList<>();
-try (LifecycleTransaction compacting = 
cfs.markAllCompacting(operationType);)
+try (LifecycleTransaction compacting = 
cfs.markAllCompacting(operationType))
 {
-Iterable sstables = 
Lists.newArrayList(operation.filterSSTables(compacting));
+Iterable sstables = compacting != null ? 
Lists.newArrayList(operation.filterSSTables(compacting)) : 
Collections.emptyList();
 if (Iterables.isEmpty(sstables))
 {
 logger.info("No sstables for {}.{}", cfs.keyspace.getName(), 
cfs.name);

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

[yukim]

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/a3ae9d8b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3ae9d8b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3ae9d8b

Branch: refs/heads/cassandra-3.3
Commit: a3ae9d8bdcef2576460b5316e8c0375d96a78c46
Parents: 162edc2 101cd72
Author: Yuki Morishita 
Authored: Thu Jan 14 09:57:59 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Jan 14 09:57:59 2016 -0600

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java| 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3ae9d8b/CHANGES.txt
--
diff --cc CHANGES.txt
index 143ed2d,52e3d4d..aebdc26
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
 -2.2.5
 +3.0.3
 + * Ensure stale index entries are purged during reads (CASSANDRA-11013)
 + * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
 + * Fix UnsupportedOperationException when reading old sstable with range
 +   tombstone (CASSANDRA-10743)
 + * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
 + * Fix potential assertion error during compaction (CASSANDRA-10944)
 + * Fix counting of received sstables in streaming (CASSANDRA-10949)
 + * Implement hints compression (CASSANDRA-9428)
 + * Fix potential assertion error when reading static columns (CASSANDRA-10903)
 + * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
 + * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
 + * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
 + * Add back support for 3rd party auth providers to bulk loader 
(CASSANDRA-10873)
 + * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
 + * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes 
(CASSANDRA-10837)
 + * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)
 +Merged from 2.2:
+  * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
   * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
   * Fix error streaming section more than 2GB (CASSANDRA-10961)
   * (cqlsh) Also apply --connect-timeout to control connection

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

[03/10] cassandra git commit: Avoid NPE when performing sstable tasks (scrub etc)

[yukim]

Avoid NPE when performing sstable tasks (scrub etc)

patch by yukim; reviewed by marcuse for CASSANDRA-10980


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

Branch: refs/heads/cassandra-3.3
Commit: 101cd72e55168f6a97bbb2556aed9f23cef80f42
Parents: 97474ee
Author: Yuki Morishita 
Authored: Mon Jan 11 14:48:38 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Jan 14 09:56:59 2016 -0600

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java| 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/101cd72e/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 6530956..52e3d4d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.5
+ * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
  * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
  * Fix error streaming section more than 2GB (CASSANDRA-10961)
  * (cqlsh) Also apply --connect-timeout to control connection

http://git-wip-us.apache.org/repos/asf/cassandra/blob/101cd72e/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index ba9c25e..e0caf76 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -258,9 +258,9 @@ public class CompactionManager implements 
CompactionManagerMBean
 private AllSSTableOpStatus parallelAllSSTableOperation(final 
ColumnFamilyStore cfs, final OneSSTableOperation operation, OperationType 
operationType) throws ExecutionException, InterruptedException
 {
 List transactions = new ArrayList<>();
-try (LifecycleTransaction compacting = 
cfs.markAllCompacting(operationType);)
+try (LifecycleTransaction compacting = 
cfs.markAllCompacting(operationType))
 {
-Iterable sstables = 
Lists.newArrayList(operation.filterSSTables(compacting));
+Iterable sstables = compacting != null ? 
Lists.newArrayList(operation.filterSSTables(compacting)) : 
Collections.emptyList();
 if (Iterables.isEmpty(sstables))
 {
 logger.info("No sstables for {}.{}", cfs.keyspace.getName(), 
cfs.name);

[jira] [Updated] (CASSANDRA-11007) Exception when running nodetool info during bootstrap

[Yuki Morishita (JIRA)]

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

Yuki Morishita updated CASSANDRA-11007:
---
Component/s: Tools

> Exception when running nodetool info during bootstrap
> -
>
> Key: CASSANDRA-11007
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11007
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: T Jake Luciani
>Assignee: Yuki Morishita
>Priority: Minor
>  Labels: fallout
> Fix For: 3.0.x
>
>
> {code}
> automaton@ip-172-31-26-150:~$ nodetool info
> ID : 7d9aa832-de94-43ab-9548-b2e710418301
> Gossip active  : true
> Thrift active  : false
> Native Transport active: false
> Load   : 114.52 KB
> Generation No  : 1452721596
> Uptime (seconds)   : 1396
> Heap Memory (MB)   : 71.80 / 1842.00
> Off Heap Memory (MB)   : 0.00
> Data Center: datacenter1
> Rack   : rack1
> Exceptions : 0
> Key Cache  : entries 11, size 888 bytes, capacity 92 MB, 180 
> hits, 212 requests, 0.849 recent hit rate, 14400 save period in seconds
> Row Cache  : entries 0, size 0 bytes, capacity 0 bytes, 0 hits, 0 
> requests, NaN recent hit rate, 0 save period in seconds
> Counter Cache  : entries 0, size 0 bytes, capacity 46 MB, 0 hits, 0 
> requests, NaN recent hit rate, 7200 save period in seconds
> error: null
> -- StackTrace --
> java.lang.AssertionError
>   at 
> org.apache.cassandra.locator.TokenMetadata.getTokens(TokenMetadata.java:488)
>   at 
> org.apache.cassandra.service.StorageService.getTokens(StorageService.java:2561)
>   at 
> org.apache.cassandra.service.StorageService.getTokens(StorageService.java:2550)
>   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>   at 
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
>   at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:497)
>   at sun.reflect.misc.Trampoline.invoke(MethodUtil.java:71)
>   at sun.reflect.GeneratedMethodAccessor3.invoke(Unknown Source)
>   at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:497)
>   at sun.reflect.misc.MethodUtil.invoke(MethodUtil.java:275)
>   at 
> com.sun.jmx.mbeanserver.StandardMBeanIntrospector.invokeM2(StandardMBeanIntrospector.java:112)
>   at 
> com.sun.jmx.mbeanserver.StandardMBeanIntrospector.invokeM2(StandardMBeanIntrospector.java:46)
>   at 
> com.sun.jmx.mbeanserver.MBeanIntrospector.invokeM(MBeanIntrospector.java:237)
>   at 
> com.sun.jmx.mbeanserver.PerInterface.getAttribute(PerInterface.java:83)
>   at 
> com.sun.jmx.mbeanserver.MBeanSupport.getAttribute(MBeanSupport.java:206)
>   at 
> com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.getAttribute(DefaultMBeanServerInterceptor.java:647)
>   at 
> com.sun.jmx.mbeanserver.JmxMBeanServer.getAttribute(JmxMBeanServer.java:678)
>   at 
> javax.management.remote.rmi.RMIConnectionImpl.doOperation(RMIConnectionImpl.java:1443)
>   at 
> javax.management.remote.rmi.RMIConnectionImpl.access$300(RMIConnectionImpl.java:76)
>   at 
> javax.management.remote.rmi.RMIConnectionImpl$PrivilegedOperation.run(RMIConnectionImpl.java:1307)
>   at 
> javax.management.remote.rmi.RMIConnectionImpl.doPrivilegedOperation(RMIConnectionImpl.java:1399)
>   at 
> javax.management.remote.rmi.RMIConnectionImpl.getAttribute(RMIConnectionImpl.java:637)
>   at sun.reflect.GeneratedMethodAccessor6.invoke(Unknown Source)
>   at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:497)
>   at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:323)
>   at sun.rmi.transport.Transport$1.run(Transport.java:200)
>   at sun.rmi.transport.Transport$1.run(Transport.java:197)
>   at java.security.AccessController.doPrivileged(Native Method)
>   at sun.rmi.transport.Transport.serviceCall(Transport.java:196)
>   at 
> sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:568)
>   at 
> sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:826)
>   at 
> sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$94(TCPTransport.java:683)
>   at 
> sun.rmi.transport.tcp.TCPTransport$ConnectionHandler$$Lambda$179/2070569218.run(Unknown
>  Source)
>   at java.security.AccessController.doPrivileged(Native Method)
>   at 
> 

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

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.3
Commit: e253bfee13166fb1e49949236feaa0175d6dc7ee
Parents: 101cd72 c42716f
Author: Aleksey Yeschenko 
Authored: Thu Jan 14 17:12:09 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 17:12:09 2016 +

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 47 ++---
 2 files changed, 26 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e253bfee/CHANGES.txt
--
diff --cc CHANGES.txt
index 52e3d4d,74fd45b..9d1cb88
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,6 +1,25 @@@
 -2.1.13
 +2.2.5
 + * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
 + * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
 + * Fix error streaming section more than 2GB (CASSANDRA-10961)
 + * (cqlsh) Also apply --connect-timeout to control connection
 +   timeout (CASSANDRA-10959)
 + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
 + * Enable GC logging by default (CASSANDRA-10140)
 + * Optimize pending range computation (CASSANDRA-9258)
 + * Skip commit log and saved cache directories in SSTable version startup 
check (CASSANDRA-10902)
 + * drop/alter user should be case sensitive (CASSANDRA-10817)
 + * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
 + * Support counter-columns for native aggregates (sum,avg,max,min) 
(CASSANDRA-9977)
 + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 + * Add new types to Stress (CASSANDRA-9556)
 + * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 +Merged from 2.1:
+  * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997)
 - * (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
   * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
   * Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
   * If CompactionMetadata is not in stats file, use index summary instead 
(CASSANDRA-10676)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e253bfee/pylib/cqlshlib/copyutil.py
--

[01/10] cassandra git commit: (cqlsh) fix cqlsh_copy_tests when vnodes are disabled

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 26dc07b7d -> c42716f2a
  refs/heads/cassandra-2.2 101cd72e5 -> e253bfee1
  refs/heads/cassandra-3.0 a3ae9d8bd -> 58643b0af
  refs/heads/cassandra-3.3 628c07678 -> ed13e05bd


(cqlsh) fix cqlsh_copy_tests when vnodes are disabled

patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-10997


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

Branch: refs/heads/cassandra-2.1
Commit: c42716f2a91ff4e0e8b1ed50eb01edb46978a562
Parents: 26dc07b
Author: Stefania Alborghetti 
Authored: Tue Jan 12 12:12:34 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 17:09:40 2016 +

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 47 ++---
 2 files changed, 26 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c42716f2/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 9c73adf..74fd45b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.13
+ * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997)
  * (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
  * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
  * Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c42716f2/pylib/cqlshlib/copyutil.py
--
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 381701e..b015a77 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -492,30 +492,33 @@ class ExportTask(CopyTask):
 ring = shell.get_ring(self.ks).items()
 ring.sort()
 
-#  If the ring is empty we get the entire ring from the host we are 
currently connected to
 if not ring:
+#  If the ring is empty we get the entire ring from the host we 
are currently connected to
 ranges[(begin_token, end_token)] = make_range_data()
-return ranges
-
-first_range_data = None
-previous = None
-for token, replicas in ring:
-if previous is None and token.value == min_token:
-continue  # avoids looping entire ring
-
-if previous is None:  # we use it at the end when wrapping around
-first_range_data = make_range_data(replicas)
-
-current_range = make_range(previous, token.value)
-if not current_range:
-continue
-
-ranges[current_range] = make_range_data(replicas)
-previous = token.value
-
-#  For the last ring interval we query the same replicas that hold the 
first token in the ring
-if previous is not None and (not end_token or previous < end_token):
-ranges[(previous, end_token)] = first_range_data
+elif len(ring) == 1:
+#  If there is only one token we get the entire ring from the 
replicas for that token
+ranges[(begin_token, end_token)] = make_range_data(ring[0][1])
+else:
+# else we loop on the ring
+first_range_data = None
+previous = None
+for token, replicas in ring:
+if not first_range_data:
+first_range_data = make_range_data(replicas)  # we use it 
at the end when wrapping around
+
+if token.value == min_token:
+continue  # avoids looping entire ring
+
+current_range = make_range(previous, token.value)
+if not current_range:
+continue
+
+ranges[current_range] = make_range_data(replicas)
+previous = token.value
+
+#  For the last ring interval we query the same replicas that hold 
the first token in the ring
+if previous is not None and (not end_token or previous < 
end_token):
+ranges[(previous, end_token)] = first_range_data
 
 if not ranges:
 shell.printerr('Found no ranges to query, check begin and end 
tokens: %s - %s' % (begin_token, end_token))

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

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.3


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

Branch: refs/heads/cassandra-3.3
Commit: ed13e05bdcb1370d81c931add2ca0f689c104fc2
Parents: 628c076 58643b0
Author: Aleksey Yeschenko 
Authored: Thu Jan 14 17:12:44 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 17:12:44 2016 +

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 47 ++---
 2 files changed, 26 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed13e05b/CHANGES.txt
--
diff --cc CHANGES.txt
index bfe1730,a1835bd..4c44120
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -18,7 -26,16 +18,8 @@@ Merged from 2.2
   * Optimize pending range computation (CASSANDRA-9258)
   * Skip commit log and saved cache directories in SSTable version startup 
check (CASSANDRA-10902)
   * drop/alter user should be case sensitive (CASSANDRA-10817)
 - * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
 - * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 - * Add new types to Stress (CASSANDRA-9556)
 - * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 - * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
  Merged from 2.1:
+  * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997)
   * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
   * Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
   * If CompactionMetadata is not in stats file, use index summary instead 
(CASSANDRA-10676)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed13e05b/pylib/cqlshlib/copyutil.py
--

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

[aleksey]

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/58643b0a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58643b0a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58643b0a

Branch: refs/heads/cassandra-3.3
Commit: 58643b0afe1521e1d99be1fc4532deb9b902d767
Parents: a3ae9d8 e253bfe
Author: Aleksey Yeschenko 
Authored: Thu Jan 14 17:12:24 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 17:12:24 2016 +

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 47 ++---
 2 files changed, 26 insertions(+), 22 deletions(-)
--


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

[02/10] cassandra git commit: (cqlsh) fix cqlsh_copy_tests when vnodes are disabled

[aleksey]

(cqlsh) fix cqlsh_copy_tests when vnodes are disabled

patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-10997


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

Branch: refs/heads/cassandra-2.2
Commit: c42716f2a91ff4e0e8b1ed50eb01edb46978a562
Parents: 26dc07b
Author: Stefania Alborghetti 
Authored: Tue Jan 12 12:12:34 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 17:09:40 2016 +

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 47 ++---
 2 files changed, 26 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c42716f2/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 9c73adf..74fd45b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.13
+ * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997)
  * (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
  * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
  * Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c42716f2/pylib/cqlshlib/copyutil.py
--
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 381701e..b015a77 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -492,30 +492,33 @@ class ExportTask(CopyTask):
 ring = shell.get_ring(self.ks).items()
 ring.sort()
 
-#  If the ring is empty we get the entire ring from the host we are 
currently connected to
 if not ring:
+#  If the ring is empty we get the entire ring from the host we 
are currently connected to
 ranges[(begin_token, end_token)] = make_range_data()
-return ranges
-
-first_range_data = None
-previous = None
-for token, replicas in ring:
-if previous is None and token.value == min_token:
-continue  # avoids looping entire ring
-
-if previous is None:  # we use it at the end when wrapping around
-first_range_data = make_range_data(replicas)
-
-current_range = make_range(previous, token.value)
-if not current_range:
-continue
-
-ranges[current_range] = make_range_data(replicas)
-previous = token.value
-
-#  For the last ring interval we query the same replicas that hold the 
first token in the ring
-if previous is not None and (not end_token or previous < end_token):
-ranges[(previous, end_token)] = first_range_data
+elif len(ring) == 1:
+#  If there is only one token we get the entire ring from the 
replicas for that token
+ranges[(begin_token, end_token)] = make_range_data(ring[0][1])
+else:
+# else we loop on the ring
+first_range_data = None
+previous = None
+for token, replicas in ring:
+if not first_range_data:
+first_range_data = make_range_data(replicas)  # we use it 
at the end when wrapping around
+
+if token.value == min_token:
+continue  # avoids looping entire ring
+
+current_range = make_range(previous, token.value)
+if not current_range:
+continue
+
+ranges[current_range] = make_range_data(replicas)
+previous = token.value
+
+#  For the last ring interval we query the same replicas that hold 
the first token in the ring
+if previous is not None and (not end_token or previous < 
end_token):
+ranges[(previous, end_token)] = first_range_data
 
 if not ranges:
 shell.printerr('Found no ranges to query, check begin and end 
tokens: %s - %s' % (begin_token, end_token))

[04/10] cassandra git commit: (cqlsh) fix cqlsh_copy_tests when vnodes are disabled

[aleksey]

(cqlsh) fix cqlsh_copy_tests when vnodes are disabled

patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-10997


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

Branch: refs/heads/cassandra-3.3
Commit: c42716f2a91ff4e0e8b1ed50eb01edb46978a562
Parents: 26dc07b
Author: Stefania Alborghetti 
Authored: Tue Jan 12 12:12:34 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 17:09:40 2016 +

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 47 ++---
 2 files changed, 26 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c42716f2/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 9c73adf..74fd45b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.13
+ * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997)
  * (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
  * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
  * Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c42716f2/pylib/cqlshlib/copyutil.py
--
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 381701e..b015a77 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -492,30 +492,33 @@ class ExportTask(CopyTask):
 ring = shell.get_ring(self.ks).items()
 ring.sort()
 
-#  If the ring is empty we get the entire ring from the host we are 
currently connected to
 if not ring:
+#  If the ring is empty we get the entire ring from the host we 
are currently connected to
 ranges[(begin_token, end_token)] = make_range_data()
-return ranges
-
-first_range_data = None
-previous = None
-for token, replicas in ring:
-if previous is None and token.value == min_token:
-continue  # avoids looping entire ring
-
-if previous is None:  # we use it at the end when wrapping around
-first_range_data = make_range_data(replicas)
-
-current_range = make_range(previous, token.value)
-if not current_range:
-continue
-
-ranges[current_range] = make_range_data(replicas)
-previous = token.value
-
-#  For the last ring interval we query the same replicas that hold the 
first token in the ring
-if previous is not None and (not end_token or previous < end_token):
-ranges[(previous, end_token)] = first_range_data
+elif len(ring) == 1:
+#  If there is only one token we get the entire ring from the 
replicas for that token
+ranges[(begin_token, end_token)] = make_range_data(ring[0][1])
+else:
+# else we loop on the ring
+first_range_data = None
+previous = None
+for token, replicas in ring:
+if not first_range_data:
+first_range_data = make_range_data(replicas)  # we use it 
at the end when wrapping around
+
+if token.value == min_token:
+continue  # avoids looping entire ring
+
+current_range = make_range(previous, token.value)
+if not current_range:
+continue
+
+ranges[current_range] = make_range_data(replicas)
+previous = token.value
+
+#  For the last ring interval we query the same replicas that hold 
the first token in the ring
+if previous is not None and (not end_token or previous < 
end_token):
+ranges[(previous, end_token)] = first_range_data
 
 if not ranges:
 shell.printerr('Found no ranges to query, check begin and end 
tokens: %s - %s' % (begin_token, end_token))

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

[aleksey]

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/58643b0a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58643b0a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58643b0a

Branch: refs/heads/cassandra-3.0
Commit: 58643b0afe1521e1d99be1fc4532deb9b902d767
Parents: a3ae9d8 e253bfe
Author: Aleksey Yeschenko 
Authored: Thu Jan 14 17:12:24 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 17:12:24 2016 +

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 47 ++---
 2 files changed, 26 insertions(+), 22 deletions(-)
--


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

[jira] [Commented] (CASSANDRA-10997) cqlsh_copy_tests failing en mass when vnodes are disabled

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko commented on CASSANDRA-10997:
---

Alright. Committed as 
[c42716f2a91ff4e0e8b1ed50eb01edb46978a562|https://github.com/apache/cassandra/commit/c42716f2a91ff4e0e8b1ed50eb01edb46978a562]
 to 2.1 and merged with 2.2, 3.0, 3.3, and trunk. Thanks.

FWIW, CHANGES.txt conflicts don't really count. It's sufficient for you to 
specify all the branches that require special treatment - either because there 
are merge conflicts, or because there are none, but some different changes need 
to be applied either way.

> cqlsh_copy_tests failing en mass when vnodes are disabled
> -
>
> Key: CASSANDRA-10997
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10997
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Philip Thompson
>Assignee: Stefania
>  Labels: dtest
> Fix For: 2.1.x, 2.2.x, 3.0.x, 3.x
>
>
> Check out [an example cassci 
> failure|http://cassci.datastax.com/job/cassandra-2.1_novnode_dtest/186/testReport/cqlsh_tests.cqlsh_copy_tests/CqlshCopyTest/test_list_data/]
>  as well as the [full novnode report 
> page|http://cassci.datastax.com/userContent/cstar_report/index.html?jobs=cassandra-2.1_novnode_dtest,cassandra-3.0_novnode_dtest,cassandra-2.2_novnode_dtest_known=true].
> Many COPY TO tests are failing when the cluster only has one token. The 
> message {{Found no ranges to query, check begin and end tokens: None - None}} 
> is printed, and it appears to be coming from cqlsh, specfically in 
> pylib/cqlshlib/copyutil.py



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

[jira] [Updated] (CASSANDRA-10120) When specifying both num_tokens and initial_token, error out if the numbers don't match

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-10120:
-
Labels: lhf  (was: )

> When specifying both num_tokens and initial_token, error out if the numbers 
> don't match
> ---
>
> Key: CASSANDRA-10120
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10120
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Jeremy Hanna
>Priority: Minor
>  Labels: lhf
> Fix For: 3.x
>
>
> Right now if both initial_token and num_tokens are specified, initial_token 
> is used.  As something to not trip people up, it would be nice to do a basic 
> error check.  If both are specified, we should make sure they match.  That 
> is, if they have one initial token and num_tokens of 256, it should error out 
> on startup and alert the user of the configuration.  It's better to fail fast 
> than bootstrap with only one token.



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

[jira] [Commented] (CASSANDRA-10023) Emit a metric for number of local read and write calls

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko commented on CASSANDRA-10023:
---

[~kohlisankalp] Can you please review? Thanks.

> Emit a metric for number of local read and write calls
> --
>
> Key: CASSANDRA-10023
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10023
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: sankalp kohli
>Assignee: Tushar Agrawal
>Priority: Minor
>  Labels: lhf
> Fix For: 3.x
>
> Attachments: CASSANDRA-10023.patch
>
>
> Many C* drivers have feature to be replica aware and chose the co-ordinator 
> which is a replica. We should add a metric which tells us whether all calls 
> to the co-ordinator are replica aware.
> We have seen issues where client thinks they are replica aware when they 
> forget to add routing key at various places in the code. 



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

[jira] [Updated] (CASSANDRA-9999) Improve usage of HashMap and HashSet in NetworkTopologyStrategy

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-:

Reviewer: Branimir Lambov

> Improve usage of HashMap and HashSet in NetworkTopologyStrategy
> ---
>
> Key: CASSANDRA-
> URL: https://issues.apache.org/jira/browse/CASSANDRA-
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Tommy Stendahl
>Assignee: Tommy Stendahl
>Priority: Minor
> Attachments: .txt
>
>
> In NetworkTopologyStrategy there are HashMaps and HashSets created with a 
> specified initial size. I assume that this is done avoid having them re sized 
> then when objects are inserted to them. Unfortunately they are created with 
> the size of the expected number of object that will be inserted into them. 
> Since the default load factor is 0.75 this will almost guarantee that 
> HashMaps and HashSets are re sized, to avoid re size the initial size should 
> be set to "no of objects / 0.75 +1".
> Since this is done every time calculateNaturalEndpoints() is called this 
> might have some performance impact.



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

[jira] [Updated] (CASSANDRA-10247) Allow both named values and regular values in a single batch

[Michael Penick (JIRA)]

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

Michael Penick updated CASSANDRA-10247:
---
Labels: client-impacting protocolv5  (was: protocolv5)

> Allow both named values and regular values in a single batch
> 
>
> Key: CASSANDRA-10247
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10247
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Michael Penick
>  Labels: client-impacting, protocolv5
>
> Currently, there's a single {{}} to determine whether a batch uses 
> named values or not. This forces all query entries in a batch to use the same 
> value encoding. There's also the fact that the current design is broken. See: 
> CASSANDRA-10246
> I propose that this information be encoded using the batch entries' 
> {{}} component and remove "0x40: With names for values" as an option 
> from {{}}. In the current design the {{}} component, a 
> {{[byte]}}, only uses two values 0 and 1 for non-prepared and prepared, 
> respectively. The proposed solution would add two more values 2 and 3 for 
> non-prepared w/ names values and prepared w/ named values. This has a couple 
> benefits:
> 1) It allows for heterogeneous value encodings in a single batch
> 2) It eliminates the need for reading ahead to determine the value encodings 
> (See: CASSANDRA-10246)



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

[jira] [Updated] (CASSANDRA-10273) Reduce number of data directory scans during startup

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko updated CASSANDRA-10273:
--
Labels: lhf  (was: )

> Reduce number of data directory scans during startup
> 
>
> Key: CASSANDRA-10273
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10273
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Robert Stupp
>Priority: Minor
>  Labels: lhf
>
> ATM we scan each data directory four times. We could easily reduce that to at 
> least two, maybe to one.
> 1. pre-flight (startup tests) scrub
> 1. pre-flight (startup tests) sstable min version
> 1. {{ColumnFamilyStore.createColumnFamilyStore}}
> 1. {{ColumnFamilyStore.}} (if {{loadSSTables==true}})
> First two pre-flight tests could be combined to one and 3+4 could also be 
> combined, as both appear at pretty related code paths.



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

[jira] [Updated] (CASSANDRA-10247) Allow both named values and regular values in a single batch

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne updated CASSANDRA-10247:
-
Labels: protocolv5  (was: )

> Allow both named values and regular values in a single batch
> 
>
> Key: CASSANDRA-10247
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10247
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Michael Penick
>  Labels: protocolv5
>
> Currently, there's a single {{}} to determine whether a batch uses 
> named values or not. This forces all query entries in a batch to use the same 
> value encoding. There's also the fact that the current design is broken. See: 
> CASSANDRA-10246
> I propose that this information be encoded using the batch entries' 
> {{}} component and remove "0x40: With names for values" as an option 
> from {{}}. In the current design the {{}} component, a 
> {{[byte]}}, only uses two values 0 and 1 for non-prepared and prepared, 
> respectively. The proposed solution would add two more values 2 and 3 for 
> non-prepared w/ names values and prepared w/ named values. This has a couple 
> benefits:
> 1) It allows for heterogeneous value encodings in a single batch
> 2) It eliminates the need for reading ahead to determine the value encodings 
> (See: CASSANDRA-10246)



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

[jira] [Commented] (CASSANDRA-10829) cleanup + repair generates a lot of logs

[Carl Yeksigian (JIRA)]

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

Carl Yeksigian commented on CASSANDRA-10829:


+1

> cleanup + repair generates a lot of logs
> 
>
> Key: CASSANDRA-10829
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10829
> Project: Cassandra
>  Issue Type: Bug
> Environment: 5 nodes on Cassandra 2.1.11 (on Debian)
>Reporter: Fabien Rousseau
>Assignee: Marcus Eriksson
> Fix For: 2.1.x
>
>
> One of our node generates a lot of cassandra logs (int the 10 MB/s) and CPU 
> usage has increased (by a factor 2-3).
> This was most probably triggered by a "nodetool snapshot" while a cleanup was 
> already running on this node.
> An example of those logs:
> 2015-12-08 09:15:17,794 INFO  
> [ValidationExecutor:689]ColumnFamilyStore.java:1923 Spinning trying to 
> capture released readers [...]
> 2015-12-08 09:15:17,794 INFO  
> [ValidationExecutor:689]ColumnFamilyStore.java:1924 Spinning trying to 
> capture all readers [...]
> 2015-12-08 09:15:17,795 INFO  
> [ValidationExecutor:689]ColumnFamilyStore.java:1923 Spinning trying to 
> capture released readers [...]
> 2015-12-08 09:15:17,795 INFO  
> [ValidationExecutor:689]ColumnFamilyStore.java:1924 Spinning trying to 
> capture all readers [...]
> (I removed SSTableReader information because it's rather long... I can share 
> it privately if needed)
> Note that the date has not been changed (only 1ms between logs)
> It should not generate that gigantic amount of logs :)
> This is probably linked to: 
> https://issues.apache.org/jira/browse/CASSANDRA-9637



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

[03/10] cassandra git commit: (cqlsh) fix cqlsh_copy_tests when vnodes are disabled

[aleksey]

(cqlsh) fix cqlsh_copy_tests when vnodes are disabled

patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-10997


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

Branch: refs/heads/cassandra-3.0
Commit: c42716f2a91ff4e0e8b1ed50eb01edb46978a562
Parents: 26dc07b
Author: Stefania Alborghetti 
Authored: Tue Jan 12 12:12:34 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 17:09:40 2016 +

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 47 ++---
 2 files changed, 26 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c42716f2/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 9c73adf..74fd45b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.13
+ * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997)
  * (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
  * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
  * Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c42716f2/pylib/cqlshlib/copyutil.py
--
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 381701e..b015a77 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -492,30 +492,33 @@ class ExportTask(CopyTask):
 ring = shell.get_ring(self.ks).items()
 ring.sort()
 
-#  If the ring is empty we get the entire ring from the host we are 
currently connected to
 if not ring:
+#  If the ring is empty we get the entire ring from the host we 
are currently connected to
 ranges[(begin_token, end_token)] = make_range_data()
-return ranges
-
-first_range_data = None
-previous = None
-for token, replicas in ring:
-if previous is None and token.value == min_token:
-continue  # avoids looping entire ring
-
-if previous is None:  # we use it at the end when wrapping around
-first_range_data = make_range_data(replicas)
-
-current_range = make_range(previous, token.value)
-if not current_range:
-continue
-
-ranges[current_range] = make_range_data(replicas)
-previous = token.value
-
-#  For the last ring interval we query the same replicas that hold the 
first token in the ring
-if previous is not None and (not end_token or previous < end_token):
-ranges[(previous, end_token)] = first_range_data
+elif len(ring) == 1:
+#  If there is only one token we get the entire ring from the 
replicas for that token
+ranges[(begin_token, end_token)] = make_range_data(ring[0][1])
+else:
+# else we loop on the ring
+first_range_data = None
+previous = None
+for token, replicas in ring:
+if not first_range_data:
+first_range_data = make_range_data(replicas)  # we use it 
at the end when wrapping around
+
+if token.value == min_token:
+continue  # avoids looping entire ring
+
+current_range = make_range(previous, token.value)
+if not current_range:
+continue
+
+ranges[current_range] = make_range_data(replicas)
+previous = token.value
+
+#  For the last ring interval we query the same replicas that hold 
the first token in the ring
+if previous is not None and (not end_token or previous < 
end_token):
+ranges[(previous, end_token)] = first_range_data
 
 if not ranges:
 shell.printerr('Found no ranges to query, check begin and end 
tokens: %s - %s' % (begin_token, end_token))

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

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: e253bfee13166fb1e49949236feaa0175d6dc7ee
Parents: 101cd72 c42716f
Author: Aleksey Yeschenko 
Authored: Thu Jan 14 17:12:09 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Jan 14 17:12:09 2016 +

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 47 ++---
 2 files changed, 26 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e253bfee/CHANGES.txt
--
diff --cc CHANGES.txt
index 52e3d4d,74fd45b..9d1cb88
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,6 +1,25 @@@
 -2.1.13
 +2.2.5
 + * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
 + * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
 + * Fix error streaming section more than 2GB (CASSANDRA-10961)
 + * (cqlsh) Also apply --connect-timeout to control connection
 +   timeout (CASSANDRA-10959)
 + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
 + * Enable GC logging by default (CASSANDRA-10140)
 + * Optimize pending range computation (CASSANDRA-9258)
 + * Skip commit log and saved cache directories in SSTable version startup 
check (CASSANDRA-10902)
 + * drop/alter user should be case sensitive (CASSANDRA-10817)
 + * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
 + * Support counter-columns for native aggregates (sum,avg,max,min) 
(CASSANDRA-9977)
 + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 + * Add new types to Stress (CASSANDRA-9556)
 + * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 +Merged from 2.1:
+  * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997)
 - * (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
   * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
   * Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
   * If CompactionMetadata is not in stats file, use index summary instead 
(CASSANDRA-10676)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e253bfee/pylib/cqlshlib/copyutil.py
--

[jira] [Commented] (CASSANDRA-9624) unable to bootstrap; streaming fails with NullPointerException

[Paulo Motta (JIRA)]

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

Paulo Motta commented on CASSANDRA-9624:


[~depend] still having the problem? if so, could you try replacing the jar on 
CASSANDRA-10961 (instructions there), and attach debug.logs?
Thanks!

> unable to bootstrap; streaming fails with NullPointerException
> --
>
> Key: CASSANDRA-9624
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9624
> Project: Cassandra
>  Issue Type: Bug
>  Components: Streaming and Messaging
> Environment: Debian Jessie, 7u79-2.5.5-1~deb8u1, Cassandra 2.1.3
>Reporter: Eric Evans
> Fix For: 2.1.x
>
> Attachments: joining_system.log.zip
>
>
> When attempting to bootstrap a new node into a 2.1.3 cluster, the stream 
> source fails with a {{NullPointerException}}:
> {noformat}
> ERROR [STREAM-IN-/10.xx.x.xxx] 2015-06-13 00:02:01,264 StreamSession.java:477 
> - [Stream #60e8c120-
> 115f-11e5-9fee-] Streaming error occurred
> java.lang.NullPointerException: null
> at 
> org.apache.cassandra.io.sstable.SSTableReader.getPositionsForRanges(SSTableReader.java:1277)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at 
> org.apache.cassandra.streaming.StreamSession.getSSTableSectionsForRanges(StreamSession.java:313)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at 
> org.apache.cassandra.streaming.StreamSession.addTransferRanges(StreamSession.java:266)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at 
> org.apache.cassandra.streaming.StreamSession.prepare(StreamSession.java:493) 
> ~[apache-cassandra-2.1.3.jar:2.1.3]
> at 
> org.apache.cassandra.streaming.StreamSession.messageReceived(StreamSession.java:425)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at 
> org.apache.cassandra.streaming.ConnectionHandler$IncomingMessageHandler.run(ConnectionHandler.java:251)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at java.lang.Thread.run(Thread.java:745) [na:1.7.0_79]
> INFO  [STREAM-IN-/10.xx.x.xxx] 2015-06-13 00:02:01,265 
> StreamResultFuture.java:180 - [Stream #60e8c120-115f-11e5-9fee-] 
> Session with /10.xx.x.xx1 is complete
> {noformat}
> _Update (2015-06-26):_
> I can also reproduce this on 2.1.7, though without the NPE on the stream-from 
> side.
> Stream source / existing node:
> {noformat}
> INFO  [STREAM-IN-/10.64.32.178] 2015-06-26 06:48:53,060 
> StreamResultFuture.java:180 - [Stream #8bdeb1b0-1ad2-11e5-abd8-3fcfb96209d9] 
> Session with /10.64.32.178 is complete
> INFO  [STREAM-IN-/10.64.32.178] 2015-06-26 06:48:53,064 
> StreamResultFuture.java:212 - [Stream #8bdeb1b0-1ad2-11e5-abd8-3fcfb96209d9] 
> All sessions completed
> {noformat}
> Stream sink / bootstrapping node:
> {noformat}
> INFO  [StreamReceiveTask:57] 2015-06-26 06:48:53,061 
> StreamResultFuture.java:180 - [Stream #8bdeb1b0-1ad2-11e5-abd8-3fcfb96209d9] 
> Session with /10.64.32.160 is complete
> WARN  [StreamReceiveTask:57] 2015-06-26 06:48:53,062 
> StreamResultFuture.java:207 - [Stream #8bdeb1b0-1ad2-11e5-abd8-3fcfb96209d9] 
> Stream failed
> INFO  [CompactionExecutor:2885] 2015-06-26 06:48:53,062 
> ColumnFamilyStore.java:906 - Enqueuing flush of compactions_in_progress: 428 
> (0%) on-heap, 379 (0%) off-heap
> INFO  [MemtableFlushWriter:959] 2015-06-26 06:48:53,063 Memtable.java:346 - 
> Writing Memtable-compactions_in_progress@1203013482(294 serialized bytes, 12 
> ops, 0%/0% of on/off-heap limit)
> ERROR [main] 2015-06-26 06:48:53,063 CassandraDaemon.java:541 - Exception 
> encountered during startup
> java.lang.RuntimeException: Error during boostrap: Stream failed
> at 
> org.apache.cassandra.dht.BootStrapper.bootstrap(BootStrapper.java:86) 
> ~[apache-cassandra-2.1.7.jar:2.1.7]
> at 
> org.apache.cassandra.service.StorageService.bootstrap(StorageService.java:1137)
>  ~[apache-cassandra-2.1.7.jar:2.1.7]
> at 
> org.apache.cassandra.service.StorageService.joinTokenRing(StorageService.java:927)
>  ~[apache-cassandra-2.1.7.jar:2.1.7]
> at 
> org.apache.cassandra.service.StorageService.initServer(StorageService.java:723)
>  ~[apache-cassandra-2.1.7.jar:2.1.7]
> at 
> org.apache.cassandra.service.StorageService.initServer(StorageService.java:605)
>  ~[apache-cassandra-2.1.7.jar:2.1.7]
> at 
> org.apache.cassandra.service.CassandraDaemon.setup(CassandraDaemon.java:378) 
> [apache-cassandra-2.1.7.jar:2.1.7]
> at 
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:524)
>  [apache-cassandra-2.1.7.jar:2.1.7]
> at 
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:613) 
> [apache-cassandra-2.1.7.jar:2.1.7]
> Caused by: org.apache.cassandra.streaming.StreamException: Stream failed
> at 
> 

[cassandra] Git Push Summary

[jake]

Repository: cassandra
Updated Tags:  refs/tags/3.2.1-tentative [created] 2ac95bd6c

[jira] [Commented] (CASSANDRA-9624) unable to bootstrap; streaming fails with NullPointerException

[Kai Wang (JIRA)]

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

Kai Wang commented on CASSANDRA-9624:
-

Paulo,
sorry but I am not able to reproduce this problem any more. I took a weird path 
to get there (2.1.11 with Linux & Windows hybrid cluster being upgraded to 
2.2.4...). After importing everything to a clean 2.2.4 cluster I am not seeing 
this problem any more.

> unable to bootstrap; streaming fails with NullPointerException
> --
>
> Key: CASSANDRA-9624
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9624
> Project: Cassandra
>  Issue Type: Bug
>  Components: Streaming and Messaging
> Environment: Debian Jessie, 7u79-2.5.5-1~deb8u1, Cassandra 2.1.3
>Reporter: Eric Evans
> Fix For: 2.1.x
>
> Attachments: joining_system.log.zip
>
>
> When attempting to bootstrap a new node into a 2.1.3 cluster, the stream 
> source fails with a {{NullPointerException}}:
> {noformat}
> ERROR [STREAM-IN-/10.xx.x.xxx] 2015-06-13 00:02:01,264 StreamSession.java:477 
> - [Stream #60e8c120-
> 115f-11e5-9fee-] Streaming error occurred
> java.lang.NullPointerException: null
> at 
> org.apache.cassandra.io.sstable.SSTableReader.getPositionsForRanges(SSTableReader.java:1277)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at 
> org.apache.cassandra.streaming.StreamSession.getSSTableSectionsForRanges(StreamSession.java:313)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at 
> org.apache.cassandra.streaming.StreamSession.addTransferRanges(StreamSession.java:266)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at 
> org.apache.cassandra.streaming.StreamSession.prepare(StreamSession.java:493) 
> ~[apache-cassandra-2.1.3.jar:2.1.3]
> at 
> org.apache.cassandra.streaming.StreamSession.messageReceived(StreamSession.java:425)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at 
> org.apache.cassandra.streaming.ConnectionHandler$IncomingMessageHandler.run(ConnectionHandler.java:251)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at java.lang.Thread.run(Thread.java:745) [na:1.7.0_79]
> INFO  [STREAM-IN-/10.xx.x.xxx] 2015-06-13 00:02:01,265 
> StreamResultFuture.java:180 - [Stream #60e8c120-115f-11e5-9fee-] 
> Session with /10.xx.x.xx1 is complete
> {noformat}
> _Update (2015-06-26):_
> I can also reproduce this on 2.1.7, though without the NPE on the stream-from 
> side.
> Stream source / existing node:
> {noformat}
> INFO  [STREAM-IN-/10.64.32.178] 2015-06-26 06:48:53,060 
> StreamResultFuture.java:180 - [Stream #8bdeb1b0-1ad2-11e5-abd8-3fcfb96209d9] 
> Session with /10.64.32.178 is complete
> INFO  [STREAM-IN-/10.64.32.178] 2015-06-26 06:48:53,064 
> StreamResultFuture.java:212 - [Stream #8bdeb1b0-1ad2-11e5-abd8-3fcfb96209d9] 
> All sessions completed
> {noformat}
> Stream sink / bootstrapping node:
> {noformat}
> INFO  [StreamReceiveTask:57] 2015-06-26 06:48:53,061 
> StreamResultFuture.java:180 - [Stream #8bdeb1b0-1ad2-11e5-abd8-3fcfb96209d9] 
> Session with /10.64.32.160 is complete
> WARN  [StreamReceiveTask:57] 2015-06-26 06:48:53,062 
> StreamResultFuture.java:207 - [Stream #8bdeb1b0-1ad2-11e5-abd8-3fcfb96209d9] 
> Stream failed
> INFO  [CompactionExecutor:2885] 2015-06-26 06:48:53,062 
> ColumnFamilyStore.java:906 - Enqueuing flush of compactions_in_progress: 428 
> (0%) on-heap, 379 (0%) off-heap
> INFO  [MemtableFlushWriter:959] 2015-06-26 06:48:53,063 Memtable.java:346 - 
> Writing Memtable-compactions_in_progress@1203013482(294 serialized bytes, 12 
> ops, 0%/0% of on/off-heap limit)
> ERROR [main] 2015-06-26 06:48:53,063 CassandraDaemon.java:541 - Exception 
> encountered during startup
> java.lang.RuntimeException: Error during boostrap: Stream failed
> at 
> org.apache.cassandra.dht.BootStrapper.bootstrap(BootStrapper.java:86) 
> ~[apache-cassandra-2.1.7.jar:2.1.7]
> at 
> org.apache.cassandra.service.StorageService.bootstrap(StorageService.java:1137)
>  ~[apache-cassandra-2.1.7.jar:2.1.7]
> at 
> org.apache.cassandra.service.StorageService.joinTokenRing(StorageService.java:927)
>  ~[apache-cassandra-2.1.7.jar:2.1.7]
> at 
> org.apache.cassandra.service.StorageService.initServer(StorageService.java:723)
>  ~[apache-cassandra-2.1.7.jar:2.1.7]
> at 
> org.apache.cassandra.service.StorageService.initServer(StorageService.java:605)
>  ~[apache-cassandra-2.1.7.jar:2.1.7]
> at 
> org.apache.cassandra.service.CassandraDaemon.setup(CassandraDaemon.java:378) 
> [apache-cassandra-2.1.7.jar:2.1.7]
> at 
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:524)
>  [apache-cassandra-2.1.7.jar:2.1.7]
> at 
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:613) 
> 

[jira] [Commented] (CASSANDRA-10211) SliceQueryFilter warnings should print the partition key

[sankalp kohli (JIRA)]

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

sankalp kohli commented on CASSANDRA-10211:
---

I have already reviewed it internally so +1

> SliceQueryFilter warnings should print the partition key
> 
>
> Key: CASSANDRA-10211
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10211
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Soumava Ghosh
>Assignee: Soumava Ghosh
>Priority: Minor
> Fix For: 2.1.x
>
> Attachments: 10211-2.1.txt
>
>
> Currently the SliceQueryFilter does not log the partition key while logging 
> the warning/error when the number of tombstones exceed the limits set by the 
> tombstone_warn_threshold and the tombstone_failure_threshold. Logging the 
> partition key would be really helpful for debugging.



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

[jira] [Commented] (CASSANDRA-10661) Integrate SASI to Cassandra

[Pavel Yaskevich (JIRA)]

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

Pavel Yaskevich commented on CASSANDRA-10661:
-

Just as a quick update, I've ported in-memory index size estimation, so the 
only remaining thing on the list for phase #1 is clustering support.

> Integrate SASI to Cassandra
> ---
>
> Key: CASSANDRA-10661
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10661
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Local Write-Read Paths
>Reporter: Pavel Yaskevich
>Assignee: Pavel Yaskevich
>  Labels: sasi
> Fix For: 3.x
>
>
> We have recently released new secondary index engine 
> (https://github.com/xedin/sasi) build using SecondaryIndex API, there are 
> still couple of things to work out regarding 3.x since it's currently 
> targeted on 2.0 released. I want to make this an umbrella issue to all of the 
> things related to integration of SASI, which are also tracked in 
> [sasi_issues|https://github.com/xedin/sasi/issues], into mainline Cassandra 
> 3.x release.



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

[jira] [Comment Edited] (CASSANDRA-10973) disk_balance_decommission_test is failing on trunk

[Philip Thompson (JIRA)]

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

Philip Thompson edited comment on CASSANDRA-10973 at 1/14/16 10:21 PM:
---

[~krummas], could you take a look at this and CASSANDRA-10974? I'm seeing other 
failures in disk_balance_test.py on trunk that look similar to these. Thank you.


was (Author: philipthompson):
[~krummas], could you take a look at this and CASSANDRA-10974? I'm seeing other 
failures in disk_balance_test.py on trunk that look similar to these.

> disk_balance_decommission_test is failing on trunk
> --
>
> Key: CASSANDRA-10973
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10973
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Alan Boudreault
>  Labels: dtest
> Fix For: 3.x
>
>
> http://cassci.datastax.com/job/trunk_dtest/891/testReport/junit/disk_balance_test/TestDiskBalance/disk_balance_decommission_test/
> {code}
> ==
> FAIL: disk_balance_decommission_test (disk_balance_test.TestDiskBalance)
> --
> Traceback (most recent call last):
>   File "/home/aboudreault/git/cstar/cassandra-dtest/disk_balance_test.py", 
> line 74, in disk_balance_decommission_test
> self.assert_balanced(node)
>   File "/home/aboudreault/git/cstar/cassandra-dtest/disk_balance_test.py", 
> line 127, in assert_balanced
> assert_almost_equal(*sums, error=0.2, error_message=node.name)
>   File "/home/aboudreault/git/cstar/cassandra-dtest/assertions.py", line 65, 
> in assert_almost_equal
> assert vmin > vmax * (1.0 - error) or vmin == vmax, "values not within 
> %.2f%% of the max: %s (%s)" % (error * 100, args, kwargs['error_message'])
> AssertionError: values not within 20.00% of the max: (482095, 477840, 612940) 
> (node2)
>  >> begin captured logging << 
> dtest: DEBUG: cluster ccm directory: /tmp/dtest-SLbi3e
> - >> end captured logging << -
> --
> Ran 1 test in 121.295s
> FAILED (failures=1)
> {code}



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

svn commit: r1724706 - in /cassandra/site: publish/download/index.html src/content/download/index.html

[jbellis]

Author: jbellis
Date: Thu Jan 14 22:28:44 2016
New Revision: 1724706

URL: http://svn.apache.org/viewvc?rev=1724706=rev
Log:
fix conditional

Modified:
cassandra/site/publish/download/index.html
cassandra/site/src/content/download/index.html

Modified: cassandra/site/publish/download/index.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/publish/download/index.html?rev=1724706=1724705=1724706=diff
==
--- cassandra/site/publish/download/index.html (original)
+++ cassandra/site/publish/download/index.html Thu Jan 14 22:28:44 2016
@@ -107,7 +107,19 @@
 
   
 
-  
+  
+Apache Cassandra 2.1 is supported until November 2016 with critical 
fixes only.
+The lastest release is 2.1.12, (released on 2015-12-07).
+  
+
+  
+
+http://www.apache.org/dyn/closer.lua/cassandra/2.1.12/apache-cassandra-2.1.12-bin.tar.gz;>apache-cassandra-2.1.12-bin.tar.gz
+[http://www.apache.org/dist/cassandra/2.1.12/apache-cassandra-2.1.12-bin.tar.gz.asc;>PGP]
+[http://www.apache.org/dist/cassandra/2.1.12/apache-cassandra-2.1.12-bin.tar.gz.md5;>MD5]
+[http://www.apache.org/dist/cassandra/2.1.12/apache-cassandra-2.1.12-bin.tar.gz.sha1;>SHA1]
+
+  
 
   
 

Modified: cassandra/site/src/content/download/index.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/content/download/index.html?rev=1724706=1724705=1724706=diff
==
--- cassandra/site/src/content/download/index.html (original)
+++ cassandra/site/src/content/download/index.html Thu Jan 14 22:28:44 2016
@@ -64,7 +64,6 @@
 
   
 
-  {% if veryoldstable_exists %}
   
 Apache Cassandra 2.1 is supported until November 2016 with critical 
fixes only.
 The lastest release is {{ cassandra_veryoldstable }}, (released on {{ 
cassandra_veryoldstable_release_date }}).
@@ -78,7 +77,6 @@
 [SHA1]
 
   
-  {% endif %}
 
   
 

[jira] [Updated] (CASSANDRA-10866) Column Family should expose count metrics for dropped mutations.

[Anubhav Kale (JIRA)]

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

Anubhav Kale updated CASSANDRA-10866:
-
Attachment: 0002-Dropped-Mutations-Count.patch

Rebased.

> Column Family should expose count metrics for dropped mutations.
> 
>
> Key: CASSANDRA-10866
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10866
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Observability, Tools
> Environment: PROD
>Reporter: Anubhav Kale
>Assignee: Anubhav Kale
>Priority: Minor
> Fix For: 3.x
>
> Attachments: 0001-CF-Dropped-Mutation-Stats.patch, 
> 0001-CFCount.patch, 0002-Dropped-Mutations-Count.patch, 10866-Trunk.patch
>
>
> Please take a look at the discussion in CASSANDRA-10580. This is opened so 
> that the latency on dropped mutations is exposed as a metric on column 
> families.



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

[jira] [Created] (CASSANDRA-11017) WaitingOnFreeMemtableSpace metric does nothing

[Chris Lohfink (JIRA)]

Chris Lohfink created CASSANDRA-11017:
-

 Summary: WaitingOnFreeMemtableSpace metric does nothing
 Key: CASSANDRA-11017
 URL: https://issues.apache.org/jira/browse/CASSANDRA-11017
 Project: Cassandra
  Issue Type: Bug
  Components: Observability
Reporter: Chris Lohfink
Priority: Minor


I think it was added in https://issues.apache.org/jira/browse/CASSANDRA-5549 
but never actually used. I may be missing something though. Not sure where this 
should be wired in or if it should just be removed?



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

svn commit: r1724709 - in /cassandra/site: publish/download/index.html src/content/download/index.html

[jbellis]

Author: jbellis
Date: Thu Jan 14 22:31:35 2016
New Revision: 1724709

URL: http://svn.apache.org/viewvc?rev=1724709=rev
Log:
deparenthesize

Modified:
cassandra/site/publish/download/index.html
cassandra/site/src/content/download/index.html

Modified: cassandra/site/publish/download/index.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/publish/download/index.html?rev=1724709=1724708=1724709=diff
==
--- cassandra/site/publish/download/index.html (original)
+++ cassandra/site/publish/download/index.html Thu Jan 14 22:31:35 2016
@@ -47,7 +47,7 @@
 
 Tick-Tock Cassandra Server Releases
 
-Cassandra is moving to a monthly release process called Tick-Tock.  
Even-numbered releases contain new features; odd-numbered ones contain bug 
fixes only.  If a critical bug is found, a patch will be released against the 
most recent bug fix release.  (http://www.planetcassandra.org/blog/cassandra-2-2-3-0-and-beyond/;>Read 
more about tick-tock here.)
+Cassandra is moving to a monthly release process called Tick-Tock.  
Even-numbered releases contain new features; odd-numbered ones contain bug 
fixes only.  If a critical bug is found, a patch will be released against the 
most recent bug fix release.  http://www.planetcassandra.org/blog/cassandra-2-2-3-0-and-beyond/;>Read 
more about tick-tock here.
 
 The latest tick-tock release is 3.2, released on
 2016-01-11.

Modified: cassandra/site/src/content/download/index.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/content/download/index.html?rev=1724709=1724708=1724709=diff
==
--- cassandra/site/src/content/download/index.html (original)
+++ cassandra/site/src/content/download/index.html Thu Jan 14 22:31:35 2016
@@ -4,7 +4,7 @@
 
 Tick-Tock Cassandra Server Releases
 
-Cassandra is moving to a monthly release process called Tick-Tock.  
Even-numbered releases contain new features; odd-numbered ones contain bug 
fixes only.  If a critical bug is found, a patch will be released against the 
most recent bug fix release.  (http://www.planetcassandra.org/blog/cassandra-2-2-3-0-and-beyond/;>Read 
more about tick-tock here.)
+Cassandra is moving to a monthly release process called Tick-Tock.  
Even-numbered releases contain new features; odd-numbered ones contain bug 
fixes only.  If a critical bug is found, a patch will be released against the 
most recent bug fix release.  http://www.planetcassandra.org/blog/cassandra-2-2-3-0-and-beyond/;>Read 
more about tick-tock here.
 
 The latest tick-tock release is {{ cassandra_ticktock }}, released on
 {{ cassandra_ticktock_release_date }}.

svn commit: r1724708 - in /cassandra/site: publish/download/index.html src/content/download/index.html

[jbellis]

Author: jbellis
Date: Thu Jan 14 22:30:13 2016
New Revision: 1724708

URL: http://svn.apache.org/viewvc?rev=1724708=rev
Log:
cleanup

Modified:
cassandra/site/publish/download/index.html
cassandra/site/src/content/download/index.html

Modified: cassandra/site/publish/download/index.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/publish/download/index.html?rev=1724708=1724707=1724708=diff
==
--- cassandra/site/publish/download/index.html (original)
+++ cassandra/site/publish/download/index.html Thu Jan 14 22:30:13 2016
@@ -47,7 +47,7 @@
 
 Tick-Tock Cassandra Server Releases
 
-Cassandra is moving to a monthly release process called Tick-Tock.  
Even-numbered releases contain new features; odd-numbered ones contain bug 
fixes only.  If a critical bug is found, a patch will be released against the 
most recent bug fix release.  (Read more about tick-tock http://www.planetcassandra.org/blog/cassandra-2-2-3-0-and-beyond/;>here.)
+Cassandra is moving to a monthly release process called Tick-Tock.  
Even-numbered releases contain new features; odd-numbered ones contain bug 
fixes only.  If a critical bug is found, a patch will be released against the 
most recent bug fix release.  (http://www.planetcassandra.org/blog/cassandra-2-2-3-0-and-beyond/;>Read 
more about tick-tock here.)
 
 The latest tick-tock release is 3.2, released on
 2016-01-11.
@@ -109,7 +109,7 @@
 
   
 Apache Cassandra 2.1 is supported until November 2016 with critical 
fixes only.
-The lastest release is 2.1.12, (released on 2015-12-07).
+The lastest release is 2.1.12, released on 2015-12-07.
   
 
   

Modified: cassandra/site/src/content/download/index.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/content/download/index.html?rev=1724708=1724707=1724708=diff
==
--- cassandra/site/src/content/download/index.html (original)
+++ cassandra/site/src/content/download/index.html Thu Jan 14 22:30:13 2016
@@ -4,7 +4,7 @@
 
 Tick-Tock Cassandra Server Releases
 
-Cassandra is moving to a monthly release process called Tick-Tock.  
Even-numbered releases contain new features; odd-numbered ones contain bug 
fixes only.  If a critical bug is found, a patch will be released against the 
most recent bug fix release.  (Read more about tick-tock http://www.planetcassandra.org/blog/cassandra-2-2-3-0-and-beyond/;>here.)
+Cassandra is moving to a monthly release process called Tick-Tock.  
Even-numbered releases contain new features; odd-numbered ones contain bug 
fixes only.  If a critical bug is found, a patch will be released against the 
most recent bug fix release.  (http://www.planetcassandra.org/blog/cassandra-2-2-3-0-and-beyond/;>Read 
more about tick-tock here.)
 
 The latest tick-tock release is {{ cassandra_ticktock }}, released on
 {{ cassandra_ticktock_release_date }}.
@@ -66,7 +66,7 @@
 
   
 Apache Cassandra 2.1 is supported until November 2016 with critical 
fixes only.
-The lastest release is {{ cassandra_veryoldstable }}, (released on {{ 
cassandra_veryoldstable_release_date }}).
+The lastest release is {{ cassandra_veryoldstable }}, released on {{ 
cassandra_veryoldstable_release_date }}.
   
 
   
@@ -112,8 +112,8 @@
 
   Development Cassandra Server Releases (not production 
ready)
   
-  The latest development release is {{ cassandra_devel }} (released on
-  {{ cassandra_devel_release_date }}).
+  The latest development release is {{ cassandra_devel }}, released on
+  {{ cassandra_devel_release_date }}.
   
 
   

svn commit: r1724704 - in /cassandra/site/src: content/download/index.html settings.py

[jbellis]

Author: jbellis
Date: Thu Jan 14 22:26:19 2016
New Revision: 1724704

URL: http://svn.apache.org/viewvc?rev=1724704=rev
Log:
add EOL info and consolidate older releases into a single section

Modified:
cassandra/site/src/content/download/index.html
cassandra/site/src/settings.py

Modified: cassandra/site/src/content/download/index.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/content/download/index.html?rev=1724704=1724703=1724704=diff
==
--- cassandra/site/src/content/download/index.html (original)
+++ cassandra/site/src/content/download/index.html Thu Jan 14 22:26:19 2016
@@ -4,10 +4,10 @@
 
 Tick-Tock Cassandra Server Releases
 
-Cassandra is moving to a new release process called http://www.planetcassandra.org/blog/cassandra-2-2-3-0-and-beyond/;>Tick-Tock.
-
-The latest tick-tock release is {{ cassandra_ticktock }} (released on
-{{ cassandra_ticktock_release_date }}).
+Cassandra is moving to a monthly release process called Tick-Tock.  
Even-numbered releases contain new features; odd-numbered ones contain bug 
fixes only.  If a critical bug is found, a patch will be released against the 
most recent bug fix release.  (Read more about tick-tock http://www.planetcassandra.org/blog/cassandra-2-2-3-0-and-beyond/;>here.)
+
+The latest tick-tock release is {{ cassandra_ticktock }}, released on
+{{ cassandra_ticktock_release_date }}.
 
 
 
@@ -19,44 +19,13 @@
   
 
 
-  Traditional Cassandra Server Releases
+  Older Cassandra Release Series
   
-  Apache Cassandra  releases include the core server, the http://wiki.apache.org/cassandra/NodeTool;>nodetool administration 
command-line interface, and a development shell (http://cassandra.apache.org/doc/cql/CQL.html;>cqlsh and the 
old cassandra-cli).
-  
-
-  
-
-  {% if is_stable_prod_ready %}
 
-  
-  The most stable release of Apache Cassandra is {{ cassandra_stable }}
-  (released on {{ cassandra_stable_release_date }}).  If you are looking 
for latest production ready Cassandra, download this one.
-  
-
-  
-
-
-  {{ binary_filename }}
-
-[PGP]
-[MD5]
-[SHA1]
-
-
-http://wiki.apache.org/cassandra/DebianPackaging;>Debian 
installation instructions
-
-  
-
-  {% else %}
-
-   There are currently two active releases available:
-   

-  The latest release of Apache Cassandra is {{ cassandra_stable }}
-  (released on {{ cassandra_stable_release_date }}).  If you're just
-  starting out and not yet in production, download this one.
+  Apache Cassandra 3.0.x is supported until May 2017.
+  The latest release is {{ cassandra_stable }}, 
+  released on {{ cassandra_stable_release_date }}).
 
 

@@ -76,8 +45,9 @@

 

- The most stable release of Apache Cassandra is {{ 
cassandra_oldstable }}
- (released on {{ cassandra_oldstable_release_date }}).  If you are in 
production or planning to be soon, download this one.
+ Apache Cassandra 2.2 is supported until November 2016. 
+ The latest release is {{ cassandra_oldstable }},
+ released on {{ cassandra_oldstable_release_date }}.

 

@@ -92,9 +62,30 @@
 

 
-  {% endif %}
   
 
+  {% if veryoldstable_exists %}
+  
+Apache Cassandra 2.1 is supported until November 2016 with critical 
fixes only.
+The lastest release is {{ cassandra_veryoldstable }}, (released on {{ 
cassandra_veryoldstable_release_date }}).
+  
+
+  
+
+{{ 
veryoldbin_filename }}
+[PGP]
+[MD5]
+[SHA1]
+
+  
+  {% endif %}
+
+  
+
+  Older (unsupported) versions of Cassandra are
+  http://archive.apache.org/dist/cassandra/;>archived here.
+
+  
 
 
   Third Party Distributions (not endorsed by Apache)
@@ -137,47 +128,6 @@
   
   {% endif %}
 
-  Previous and Archived Cassandra Server Releases
-
-  {% if is_stable_prod_ready and oldstable_exists %}
-  
-  Previous stable branches of Cassandra continue to see periodic maintenance
-  for some time after a new major release is made. The lastest release on the
-  {{ oldstable_branch }} branch is {{ cassandra_oldstable }} (released on
-  {{ cassandra_oldstable_release_date }}).
-  
-
-  
-
-{{ oldbin_filename }}
-[PGP]
-[MD5]
-[SHA1]
-
-  
-  {% endif %}
-
-  {% if veryoldstable_exists %}
-  
-  The lastest release on the {{ veryoldstable_branch }} branch is
-  {{ cassandra_veryoldstable }} (released on {{ 
cassandra_veryoldstable_release_date }}).
-  
-
-  
-
-{{ 
veryoldbin_filename }}
-[PGP]
-[MD5]
-[SHA1]
-
-  
-  {% endif %}
-
-  
-Older (unsupported) versions of Cassandra are
-http://archive.apache.org/dist/cassandra/;>archived here.
-  
-
   Source
   
   The Cassandra source code is available to download:
@@ -193,22 +143,18 @@
 [MD5]
 [SHA1]
 
-  {% if oldstable_exists %}
 
 {{ oldsrc_filename }}
 [PGP]