[jira] [Commented] (CASSANDRA-12164) dtest failure in materialized_views_test.TestMaterializedViews.add_dc_after_mv_network_replication_test

[Philip Thompson (JIRA)]

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

Philip Thompson commented on CASSANDRA-12164:
-

I don't quite follow, it seems Joel explained why we're specifying the 
migration wait period, unless I'm misunderstanding what you're asking.

> dtest failure in 
> materialized_views_test.TestMaterializedViews.add_dc_after_mv_network_replication_test
> ---
>
> Key: CASSANDRA-12164
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12164
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log, 
> node4.log, node4_debug.log, node4_gc.log, node5.log, node5_debug.log, 
> node5_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_offheap_dtest/309/testReport/materialized_views_test/TestMaterializedViews/add_dc_after_mv_network_replication_test
> Failed on CassCI build trunk_offheap_dtest #309
> {code}
> Standard Output
> Unexpected error in node4 log, error: 
> ERROR [main] 2016-07-06 19:21:26,631 MigrationManager.java:164 - Migration 
> task failed to complete
> {code}
> Related failure:
> http://cassci.datastax.com/job/trunk_novnode_dtest/423/testReport/materialized_views_test/TestMaterializedViews/add_node_after_mv_test/



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

[jira] [Commented] (CASSANDRA-11687) dtest failure in rebuild_test.TestRebuild.simple_rebuild_test

[Philip Thompson (JIRA)]

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

Philip Thompson commented on CASSANDRA-11687:
-

We don't seem to be printing out the actual rebuild errors, just the count.

> dtest failure in rebuild_test.TestRebuild.simple_rebuild_test
> -
>
> Key: CASSANDRA-11687
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11687
> Project: Cassandra
>  Issue Type: Test
>Reporter: Russ Hatch
>Assignee: DS Test Eng
>  Labels: dtest
>
> single failure on most recent run (3.0 no-vnode)
> {noformat}
> concurrent rebuild should not be allowed, but one rebuild command should have 
> succeeded.
> {noformat}
> http://cassci.datastax.com/job/cassandra-3.0_novnode_dtest/217/testReport/rebuild_test/TestRebuild/simple_rebuild_test
> Failed on CassCI build cassandra-3.0_novnode_dtest #217



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

[jira] [Commented] (CASSANDRA-11902) dtest failure in hintedhandoff_test.TestHintedHandoffConfig.hintedhandoff_dc_reenabled_test

[Philip Thompson (JIRA)]

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

Philip Thompson commented on CASSANDRA-11902:
-

Looks like this fails ~1% of the time. It's only two nodes, do we want to bump 
up timeouts, or consider this might be a bug? [~mambocab]?

> dtest failure in 
> hintedhandoff_test.TestHintedHandoffConfig.hintedhandoff_dc_reenabled_test
> ---
>
> Key: CASSANDRA-11902
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11902
> Project: Cassandra
>  Issue Type: Test
>Reporter: Philip Thompson
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node2.log, node2_debug.log
>
>
> Failure occurred on trunk here:
> http://cassci.datastax.com/job/trunk_dtest/1239/testReport/hintedhandoff_test/TestHintedHandoffConfig/hintedhandoff_dc_reenabled_test/
> Logs are attached
> We re-enable HH on a DC, but we aren't seeing hints move in the logs, so this 
> does worry me a bit. I'm not sure quite how flaky it is. It's only failed 
> once.



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

[jira] [Commented] (CASSANDRA-12225) dtest failure in materialized_views_test.TestMaterializedViews.clustering_column_test

[Carl Yeksigian (JIRA)]

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

Carl Yeksigian commented on CASSANDRA-12225:


Yeah, looks like the failed mutations in the other test run were just a red 
herring; wish it had happened locally after the change like it did before, but 
I'd say it is still a flakey test.

> dtest failure in 
> materialized_views_test.TestMaterializedViews.clustering_column_test
> -
>
> Key: CASSANDRA-12225
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12225
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_offheap_dtest/336/testReport/materialized_views_test/TestMaterializedViews/clustering_column_test
> Failed on CassCI build trunk_offheap_dtest #336
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/materialized_views_test.py", line 
> 321, in clustering_column_test
> self.assertEqual(len(result), 2, "Expecting {} users, got {}".format(2, 
> len(result)))
>   File "/usr/lib/python2.7/unittest/case.py", line 513, in assertEqual
> assertion_func(first, second, msg=msg)
>   File "/usr/lib/python2.7/unittest/case.py", line 506, in _baseAssertEqual
> raise self.failureException(msg)
> "Expecting 2 users, got 1
> {code}



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

[jira] [Resolved] (CASSANDRA-12135) dtest failure in repair_tests.incremental_repair_test.TestIncRepair.sstable_marking_test

[Philip Thompson (JIRA)]

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

Philip Thompson resolved CASSANDRA-12135.
-
Resolution: Not A Problem

We think this was a hardware issue, closing.

> dtest failure in 
> repair_tests.incremental_repair_test.TestIncRepair.sstable_marking_test
> 
>
> Key: CASSANDRA-12135
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12135
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node2.log, node3.log
>
>
> example failure:
> http://cassci.datastax.com/job/cassandra-2.1_dtest_jdk8/240/testReport/repair_tests.incremental_repair_test/TestIncRepair/sstable_marking_test
> Failed on CassCI build cassandra-2.1_dtest_jdk8 #240
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File 
> "/home/automaton/cassandra-dtest/repair_tests/incremental_repair_test.py", 
> line 42, in sstable_marking_test
> node3.stop(gently=True)
>   File "/home/automaton/ccm/ccmlib/node.py", line 701, in stop
> raise NodeError("Problem stopping node %s" % self.name)
> "Problem stopping node node3
> {code}



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

[jira] [Commented] (CASSANDRA-9054) Break DatabaseDescriptor up into multiple classes.

[Jeremiah Jordan (JIRA)]

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

Jeremiah Jordan commented on CASSANDRA-9054:


Would it be good to do this patch and then do a second patch breaking things 
apart?

> Break DatabaseDescriptor up into multiple classes.
> --
>
> Key: CASSANDRA-9054
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9054
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Jeremiah Jordan
>Assignee: Robert Stupp
> Fix For: 3.x
>
>
> Right now to get at Config stuff you go through DatabaseDescriptor.  But when 
> you instantiate DatabaseDescriptor it actually opens system tables and such, 
> which triggers commit log replays, and other things if the right flags aren't 
> set ahead of time.  This makes getting at config stuff from tools annoying, 
> as you have to be very careful about instantiation orders.
> It would be nice if we could break DatabaseDescriptor up into multiple 
> classes, so that getting at config stuff from tools wasn't such a pain.



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

[jira] [Updated] (CASSANDRA-11951) dtest failure in user_functions_test.TestUserFunctions.test_migration

[Jim Witschey (JIRA)]

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

Jim Witschey updated CASSANDRA-11951:
-
Fix Version/s: 3.9

> dtest failure in user_functions_test.TestUserFunctions.test_migration
> -
>
> Key: CASSANDRA-11951
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11951
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: Philip Thompson
>  Labels: dtest
> Fix For: 3.9
>
> Attachments: node1.log, node1_debug.log, node2.log, node2_debug.log, 
> node3.log, node3_debug.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_offheap_dtest/234/testReport/user_functions_test/TestUserFunctions/test_migration
> Failed on CassCI build trunk_offheap_dtest #234
> Logs are attached.
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/user_functions_test.py", line 50, in 
> test_migration
> session2.execute("use ks")
>   File "cassandra/cluster.py", line 1706, in 
> cassandra.cluster.Session.execute (cassandra/cluster.c:28532)
> return self.execute_async(query, parameters, trace, custom_payload, 
> timeout).result()
>   File "cassandra/cluster.py", line 3339, in 
> cassandra.cluster.ResponseFuture.result (cassandra/cluster.c:62978)
> raise self._final_exception
> 'Error from server: code=2200 [Invalid query] message="Keyspace \'ks\' does 
> not exist"\n >> begin captured logging << 
> \ndtest: DEBUG: cluster ccm directory: 
> /mnt/tmp/dtest-1nvamN\ndtest: DEBUG: Custom init_config not found. Setting 
> defaults.\ndtest: DEBUG: Done setting configuration options:\n{   
> \'enable_scripted_user_defined_functions\': \'true\',\n
> \'enable_user_defined_functions\': \'true\',\n\'initial_token\': None,\n  
>   \'memtable_allocation_type\': \'offheap_objects\',\n\'num_tokens\': 
> \'32\',\n\'phi_convict_threshold\': 5}\n- >> end 
> captured logging << -'
> {code}



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

[jira] [Updated] (CASSANDRA-11951) dtest failure in user_functions_test.TestUserFunctions.test_migration

[Philip Thompson (JIRA)]

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

Philip Thompson updated CASSANDRA-11951:

Reviewer: Russ Hatch
  Status: Patch Available  (was: Open)

https://github.com/riptano/cassandra-dtest/pull/1104

> dtest failure in user_functions_test.TestUserFunctions.test_migration
> -
>
> Key: CASSANDRA-11951
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11951
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: Philip Thompson
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node2.log, node2_debug.log, 
> node3.log, node3_debug.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_offheap_dtest/234/testReport/user_functions_test/TestUserFunctions/test_migration
> Failed on CassCI build trunk_offheap_dtest #234
> Logs are attached.
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/user_functions_test.py", line 50, in 
> test_migration
> session2.execute("use ks")
>   File "cassandra/cluster.py", line 1706, in 
> cassandra.cluster.Session.execute (cassandra/cluster.c:28532)
> return self.execute_async(query, parameters, trace, custom_payload, 
> timeout).result()
>   File "cassandra/cluster.py", line 3339, in 
> cassandra.cluster.ResponseFuture.result (cassandra/cluster.c:62978)
> raise self._final_exception
> 'Error from server: code=2200 [Invalid query] message="Keyspace \'ks\' does 
> not exist"\n >> begin captured logging << 
> \ndtest: DEBUG: cluster ccm directory: 
> /mnt/tmp/dtest-1nvamN\ndtest: DEBUG: Custom init_config not found. Setting 
> defaults.\ndtest: DEBUG: Done setting configuration options:\n{   
> \'enable_scripted_user_defined_functions\': \'true\',\n
> \'enable_user_defined_functions\': \'true\',\n\'initial_token\': None,\n  
>   \'memtable_allocation_type\': \'offheap_objects\',\n\'num_tokens\': 
> \'32\',\n\'phi_convict_threshold\': 5}\n- >> end 
> captured logging << -'
> {code}



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

[jira] [Assigned] (CASSANDRA-11951) dtest failure in user_functions_test.TestUserFunctions.test_migration

[Philip Thompson (JIRA)]

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

Philip Thompson reassigned CASSANDRA-11951:
---

Assignee: Philip Thompson  (was: DS Test Eng)

> dtest failure in user_functions_test.TestUserFunctions.test_migration
> -
>
> Key: CASSANDRA-11951
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11951
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: Philip Thompson
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node2.log, node2_debug.log, 
> node3.log, node3_debug.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_offheap_dtest/234/testReport/user_functions_test/TestUserFunctions/test_migration
> Failed on CassCI build trunk_offheap_dtest #234
> Logs are attached.
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/user_functions_test.py", line 50, in 
> test_migration
> session2.execute("use ks")
>   File "cassandra/cluster.py", line 1706, in 
> cassandra.cluster.Session.execute (cassandra/cluster.c:28532)
> return self.execute_async(query, parameters, trace, custom_payload, 
> timeout).result()
>   File "cassandra/cluster.py", line 3339, in 
> cassandra.cluster.ResponseFuture.result (cassandra/cluster.c:62978)
> raise self._final_exception
> 'Error from server: code=2200 [Invalid query] message="Keyspace \'ks\' does 
> not exist"\n >> begin captured logging << 
> \ndtest: DEBUG: cluster ccm directory: 
> /mnt/tmp/dtest-1nvamN\ndtest: DEBUG: Custom init_config not found. Setting 
> defaults.\ndtest: DEBUG: Done setting configuration options:\n{   
> \'enable_scripted_user_defined_functions\': \'true\',\n
> \'enable_user_defined_functions\': \'true\',\n\'initial_token\': None,\n  
>   \'memtable_allocation_type\': \'offheap_objects\',\n\'num_tokens\': 
> \'32\',\n\'phi_convict_threshold\': 5}\n- >> end 
> captured logging << -'
> {code}



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

[jira] [Commented] (CASSANDRA-12164) dtest failure in materialized_views_test.TestMaterializedViews.add_dc_after_mv_network_replication_test

[Carl Yeksigian (JIRA)]

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

Carl Yeksigian commented on CASSANDRA-12164:


This looks like a duplicate of CASSANDRA-10978, which [~jkni] included a good 
synopsis on in there. Do we know why we specified the migration wait period 
here; was it to catch long running migrations?

> dtest failure in 
> materialized_views_test.TestMaterializedViews.add_dc_after_mv_network_replication_test
> ---
>
> Key: CASSANDRA-12164
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12164
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log, 
> node4.log, node4_debug.log, node4_gc.log, node5.log, node5_debug.log, 
> node5_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_offheap_dtest/309/testReport/materialized_views_test/TestMaterializedViews/add_dc_after_mv_network_replication_test
> Failed on CassCI build trunk_offheap_dtest #309
> {code}
> Standard Output
> Unexpected error in node4 log, error: 
> ERROR [main] 2016-07-06 19:21:26,631 MigrationManager.java:164 - Migration 
> task failed to complete
> {code}
> Related failure:
> http://cassci.datastax.com/job/trunk_novnode_dtest/423/testReport/materialized_views_test/TestMaterializedViews/add_node_after_mv_test/



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

[jira] [Commented] (CASSANDRA-12205) nodetool tablestats sstable count missing.

[Wei Deng (JIRA)]

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

Wei Deng commented on CASSANDRA-12205:
--

This is [the 
commit|https://github.com/apache/cassandra/commit/5805a76ca092648146ba71af744c8bce357bdc39]
 (intended to address CASSANDRA-5977) that introduced the regression. 

> nodetool tablestats sstable count missing.
> --
>
> Key: CASSANDRA-12205
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12205
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
> Environment: Cassandra 3.7
>Reporter: Cameron MacMinn
> Attachments: bad.txt, good.txt
>
>
> As a user, I have used  nodetool cfstats  since v2.1. The most useful line is 
> the 1 like 'SSTable count: 12'.
> As a user, I want v3.7  nodetool tablestats  to continue showing SStable 
> count. At the moment, SStable count is missing from the output.
> Examples attached.



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

[jira] [Commented] (CASSANDRA-12064) dtest failure in auth_test.TestAuth.login_test

[Philip Thompson (JIRA)]

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

Philip Thompson commented on CASSANDRA-12064:
-

Doing so here: 
http://cassci.datastax.com/view/Parameterized/job/parameterized_dtest_multiplexer/171/



> dtest failure in auth_test.TestAuth.login_test
> --
>
> Key: CASSANDRA-12064
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12064
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Fix For: 3.9
>
> Attachments: node1.log, node1_debug.log, node1_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_dtest/1284/testReport/auth_test/TestAuth/login_test
> Failed on CassCI build trunk_dtest #1284
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/auth_test.py", line 82, in login_test
> assert isinstance(e.errors.values()[0], AuthenticationFailed)
> {code}
> Logs are attached.



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

[jira] [Commented] (CASSANDRA-12116) dtest failure in snapshot_test.TestSnapshot.test_basic_snapshot_and_restore

[Philip Thompson (JIRA)]

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

Philip Thompson commented on CASSANDRA-12116:
-

Let's see if the changes for CASSANDRA-12137 resolve this.

> dtest failure in snapshot_test.TestSnapshot.test_basic_snapshot_and_restore
> ---
>
> Key: CASSANDRA-12116
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12116
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log
>
>
> example failure:
> http://cassci.datastax.com/job/cassandra-2.1_novnode_dtest/260/testReport/snapshot_test/TestSnapshot/test_basic_snapshot_and_restore
> Failed on CassCI build cassandra-2.1_novnode_dtest #260
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/snapshot_test.py", line 96, in 
> test_basic_snapshot_and_restore
> self.restore_snapshot(snapshot_dir, node1, 'ks', 'cf')
>   File "/home/automaton/cassandra-dtest/snapshot_test.py", line 68, in 
> restore_snapshot
> (" ".join(args), exit_status, stdout, stderr))
> 'sstableloader command \'/home/automaton/cassandra/bin/sstableloader -d 
> 127.0.0.1 /tmp/tmpGgR_dT/0/ks/cf\' failed; exit status: 1\'
> {code}



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

[jira] [Resolved] (CASSANDRA-12134) dtest failure in repair_tests.repair_test.TestRepair.dc_repair_test

[Philip Thompson (JIRA)]

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

Philip Thompson resolved CASSANDRA-12134.
-
Resolution: Duplicate

> dtest failure in repair_tests.repair_test.TestRepair.dc_repair_test
> ---
>
> Key: CASSANDRA-12134
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12134
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node2.log, node3.log, node4.log
>
>
> example failure:
> http://cassci.datastax.com/job/cassandra-2.1_dtest/488/testReport/repair_tests.repair_test/TestRepair/dc_repair_test
> Failed on CassCI build cassandra-2.1_dtest #488
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/repair_tests/repair_test.py", line 
> 441, in dc_repair_test
> cluster = self._setup_multi_dc()
>   File "/home/automaton/cassandra-dtest/repair_tests/repair_test.py", line 
> 540, in _setup_multi_dc
> self.check_rows_on_node(node2, 2000, missings=[1000])
>   File "/home/automaton/cassandra-dtest/repair_tests/repair_test.py", line 
> 70, in check_rows_on_node
> self.assertEqual(len(result), rows)
>   File "/usr/lib/python2.7/unittest/case.py", line 513, in assertEqual
> assertion_func(first, second, msg=msg)
>   File "/usr/lib/python2.7/unittest/case.py", line 506, in _baseAssertEqual
> raise self.failureException(msg)
> "2001 != 2000
> {code}



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

[jira] [Updated] (CASSANDRA-12191) dtest failure in upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_2_1_x_To_indev_3_x.cql3_non_compound_range_tombstones_test

[Philip Thompson (JIRA)]

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

Philip Thompson updated CASSANDRA-12191:

Fix Version/s: 3.9

> dtest failure in 
> upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_2_1_x_To_indev_3_x.cql3_non_compound_range_tombstones_test
> 
>
> Key: CASSANDRA-12191
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12191
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>  Labels: dtest
> Fix For: 3.9
>
>
> example failure:
> http://cassci.datastax.com/job/upgrade_tests-all/59/testReport/upgrade_tests.cql_tests/TestCQLNodes3RF3_Upgrade_current_2_1_x_To_indev_3_x/cql3_non_compound_range_tombstones_test
> Failed on CassCi build upgrade_tests-all #59
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/upgrade_tests/cql_tests.py", line 
> 1571, in cql3_non_compound_range_tombstones_test
> self.assertEqual(6, len(row), row)
> {code}
> Seems related to Cassandra-12123



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

[jira] [Comment Edited] (CASSANDRA-11697) Improve Compaction Throughput

[T Jake Luciani (JIRA)]

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

T Jake Luciani edited comment on CASSANDRA-11697 at 7/18/16 5:01 PM:
-

*The state of compaction and the potential improvements*

To continue the above comment here is information on a specific schema I'm 
focused on.  

{code}
CREATE TABLE userpics (
 userid bigint,
 picid bigint,
 valueid bigint,
 PRIMARY KEY(userid, picid)
 ) WITH compression = {'sstable_compression':'LZ4Compressor'} AND compaction = 
{'class' : 'LeveledCompactionStrategy', 'sstable_size_in_mb' : '64'}'
{code}

Each user contains 1000 pic ids.

I've run this through two scenarios: Standalone vs Stressed.  *Standalone* is 
with compaction stress that shows the uncontested throughput.  *Stressed* is 
compaction running in C* and taking many writes so the CPUs are loaded.

These scenarios were run against 2.1, 3.0, trunk, and the current patched 
version of compaction-perf work I've been doing.

!image.png!

The *Y* axis is the number of cells/sec.

You can see that we there is a significant drop when the server is loaded.  
When compactions are backing up this is the worst thing to happen.
>From 2.1 to 3.0 we improved stressed compaction 2x mainly from 
>(CASSANDRA-8988, CASSANDRA-8920, CASSANDRA-8915)
  
But there is still a huge throughput gap we need to fix.  Currently, I've made 
changes to disable thread priority on compaction threads and profiling fixes to 
avoid cpu time that improves throughput another 2x but the final goal is to 
close this gap as much as possible as well as fix any major cpu issues on the 
read and write path since those affect compaction directly as well e.g. 
(CASSANDRA-10309).

As mentioned earlier I'm working on a POC to deal with compaction threads under 
load that I hope will address this issue.  My goal is to have something that 
closes the gap as much as possibly by 3.10




was (Author: tjake):
*The state of compaction and the potential improvements*

To continue the above comment here is information on a specific schema I'm 
focused on.  

{code}
CREATE TABLE userpics (
 userid bigint,
 picid bigint,
 valueid bigint,
 PRIMARY KEY(userid, picid)
 ) WITH compression = {'sstable_compression':'LZ4Compressor'} AND compaction = 
{'class' : 'LeveledCompactionStrategy', 'sstable_size_in_mb' : '64'}'
{code}

Each picid contains 1000 value ids.

I've run this through two scenarios: Standalone vs Stressed.  *Standalone* is 
with compaction stress that shows the uncontested throughput.  *Stressed* is 
compaction running in C* and taking many writes so the CPUs are loaded.

These scenarios were run against 2.1, 3.0, trunk, and the current patched 
version of compaction-perf work I've been doing.

!image.png!

The *Y* axis is the number of cells/sec.

You can see that we there is a significant drop when the server is loaded.  
When compactions are backing up this is the worst thing to happen.
>From 2.1 to 3.0 we improved stressed compaction 2x mainly from 
>(CASSANDRA-8988, CASSANDRA-8920, CASSANDRA-8915)
  
But there is still a huge throughput gap we need to fix.  Currently, I've made 
changes to disable thread priority on compaction threads and profiling fixes to 
avoid cpu time that improves throughput another 2x but the final goal is to 
close this gap as much as possible as well as fix any major cpu issues on the 
read and write path since those affect compaction directly as well e.g. 
(CASSANDRA-10309).

As mentioned earlier I'm working on a POC to deal with compaction threads under 
load that I hope will address this issue.  My goal is to have something that 
closes the gap as much as possibly by 3.10



> Improve Compaction Throughput
> -
>
> Key: CASSANDRA-11697
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11697
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Compaction
>Reporter: T Jake Luciani
>Assignee: T Jake Luciani
> Attachments: image.png
>
>
> The goal of this ticket is to improve/understand the bottlenecks during 
> compactions.  At a high level this will involve:
> * A test system for measuring compaction time for different workloads and 
> compaction strategies.
> * Profiling and analysis
> * Make improvements
> * Add throughput regression tests so we can track
> We have a lot of random tickets that relate to this so I'll link them to this 
> ticket 



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

[jira] [Resolved] (CASSANDRA-12191) dtest failure in upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_2_1_x_To_indev_3_x.cql3_non_compound_range_tombstones_test

[Philip Thompson (JIRA)]

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

Philip Thompson resolved CASSANDRA-12191.
-
Resolution: Fixed

Turns out the problem was this test was still set to upgrade to 3.7. Once we 
include the fixes, it is passing now.

> dtest failure in 
> upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_2_1_x_To_indev_3_x.cql3_non_compound_range_tombstones_test
> 
>
> Key: CASSANDRA-12191
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12191
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>  Labels: dtest
>
> example failure:
> http://cassci.datastax.com/job/upgrade_tests-all/59/testReport/upgrade_tests.cql_tests/TestCQLNodes3RF3_Upgrade_current_2_1_x_To_indev_3_x/cql3_non_compound_range_tombstones_test
> Failed on CassCi build upgrade_tests-all #59
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/upgrade_tests/cql_tests.py", line 
> 1571, in cql3_non_compound_range_tombstones_test
> self.assertEqual(6, len(row), row)
> {code}
> Seems related to Cassandra-12123



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

[jira] [Comment Edited] (CASSANDRA-11697) Improve Compaction Throughput

[T Jake Luciani (JIRA)]

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

T Jake Luciani edited comment on CASSANDRA-11697 at 7/18/16 4:59 PM:
-

*The state of compaction and the potential improvements*

To continue the above comment here is information on a specific schema I'm 
focused on.  

{code}
CREATE TABLE userpics (
 userid bigint,
 picid bigint,
 valueid bigint,
 PRIMARY KEY(userid, picid)
 ) WITH compression = {'sstable_compression':'LZ4Compressor'} AND compaction = 
{'class' : 'LeveledCompactionStrategy', 'sstable_size_in_mb' : '64'}'
{code}

Each picid contains 1000 value ids.

I've run this through two scenarios: Standalone vs Stressed.  *Standalone* is 
with compaction stress that shows the uncontested throughput.  *Stressed* is 
compaction running in C* and taking many writes so the CPUs are loaded.

These scenarios were run against 2.1, 3.0, trunk, and the current patched 
version of compaction-perf work I've been doing.

!image.png!

The *Y* axis is the number of cells/sec.

You can see that we there is a significant drop when the server is loaded.  
When compactions are backing up this is the worst thing to happen.
>From 2.1 to 3.0 we improved stressed compaction 2x mainly from 
>(CASSANDRA-8988, CASSANDRA-8920, CASSANDRA-8915)
  
But there is still a huge throughput gap we need to fix.  Currently, I've made 
changes to disable thread priority on compaction threads and profiling fixes to 
avoid cpu time that improves throughput another 2x but the final goal is to 
close this gap as much as possible as well as fix any major cpu issues on the 
read and write path since those affect compaction directly as well e.g. 
(CASSANDRA-10309).

As mentioned earlier I'm working on a POC to deal with compaction threads under 
load that I hope will address this issue.  My goal is to have something that 
closes the gap as much as possibly by 3.10




was (Author: tjake):
*The state of compaction and the potential improvements*

To continue the above comment here is information on a specific schema I'm 
focused on.  

{code}
CREATE TABLE userpics (
 userid bigint,
 picid bigint,
 valueid bigint,
 PRIMARY KEY(userid, picid)
 ) WITH compression = \{'sstable_compression':'LZ4Compressor'\} AND compaction 
= \{'class' : 'LeveledCompactionStrategy', 'sstable_size_in_mb' : '64'\};
{code}

Each picid contains 1000 value ids.

I've run this through two scenarios: Standalone vs Stressed.  *Standalone* is 
with compaction stress that shows the uncontested throughput.  *Stressed* is 
compaction running in C* and taking many writes so the CPUs are loaded.

These scenarios were run against 2.1, 3.0, trunk, and the current patched 
version of compaction-perf work I've been doing.

!image.png

The *Y* axis is the number of cells/sec.

You can see that we there is a significant drop when the server is loaded.  
When compactions are backing up this is the worst thing to happen.
>From 2.1 to 3.0 we improved stressed compaction 2x mainly from 
>(CASSANDRA-8988, CASSANDRA-8920, CASSANDRA-8915)
  
But there is still a huge throughput gap we need to fix.  Currently, I've made 
changes to disable thread priority on compaction threads and profiling fixes to 
avoid cpu time that improves throughput another 2x but the final goal is to 
close this gap as much as possible as well as fix any major cpu issues on the 
read and write path since those affect compaction directly as well e.g. 
(CASSANDRA-10309).

As mentioned earlier I'm working on a POC to deal with compaction threads under 
load that I hope will address this issue.  My goal is to have something that 
closes the gap as much as possibly by 3.10



> Improve Compaction Throughput
> -
>
> Key: CASSANDRA-11697
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11697
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Compaction
>Reporter: T Jake Luciani
>Assignee: T Jake Luciani
> Attachments: image.png
>
>
> The goal of this ticket is to improve/understand the bottlenecks during 
> compactions.  At a high level this will involve:
> * A test system for measuring compaction time for different workloads and 
> compaction strategies.
> * Profiling and analysis
> * Make improvements
> * Add throughput regression tests so we can track
> We have a lot of random tickets that relate to this so I'll link them to this 
> ticket 



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

[jira] [Comment Edited] (CASSANDRA-11697) Improve Compaction Throughput

[T Jake Luciani (JIRA)]

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

T Jake Luciani edited comment on CASSANDRA-11697 at 7/18/16 4:58 PM:
-

*The state of compaction and the potential improvements*

To continue the above comment here is information on a specific schema I'm 
focused on.  

{code}
CREATE TABLE userpics (
 userid bigint,
 picid bigint,
 valueid bigint,
 PRIMARY KEY(userid, picid)
 ) WITH compression = \{'sstable_compression':'LZ4Compressor'\} AND compaction 
= \{'class' : 'LeveledCompactionStrategy', 'sstable_size_in_mb' : '64'\};
{code}

Each picid contains 1000 value ids.

I've run this through two scenarios: Standalone vs Stressed.  *Standalone* is 
with compaction stress that shows the uncontested throughput.  *Stressed* is 
compaction running in C* and taking many writes so the CPUs are loaded.

These scenarios were run against 2.1, 3.0, trunk, and the current patched 
version of compaction-perf work I've been doing.

!image.png

The *Y* axis is the number of cells/sec.

You can see that we there is a significant drop when the server is loaded.  
When compactions are backing up this is the worst thing to happen.
>From 2.1 to 3.0 we improved stressed compaction 2x mainly from 
>(CASSANDRA-8988, CASSANDRA-8920, CASSANDRA-8915)
  
But there is still a huge throughput gap we need to fix.  Currently, I've made 
changes to disable thread priority on compaction threads and profiling fixes to 
avoid cpu time that improves throughput another 2x but the final goal is to 
close this gap as much as possible as well as fix any major cpu issues on the 
read and write path since those affect compaction directly as well e.g. 
(CASSANDRA-10309).

As mentioned earlier I'm working on a POC to deal with compaction threads under 
load that I hope will address this issue.  My goal is to have something that 
closes the gap as much as possibly by 3.10




was (Author: tjake):
*The state of compaction and the potential improvements*

To continue the above comment here is information on a specific schema I'm 
focused on.  

{quote}
CREATE TABLE userpics (
 userid bigint,
 picid bigint,
 valueid bigint,
 PRIMARY KEY(userid, picid)
 ) WITH compression = {'sstable_compression':'LZ4Compressor'} AND compaction = 
{'class' : 'LeveledCompactionStrategy', 'sstable_size_in_mb' : '64'};
{quote}

Each picid contains 1000 value ids.

I've run this through two scenarios: Standalone vs Stressed.  *Standalone* is 
with compaction stress that shows the uncontested throughput.  *Stressed* is 
compaction running in C* and taking many writes so the CPUs are loaded.

These scenarios were run against 2.1, 3.0, trunk, and the current patched 
version of compaction-perf work I've been doing.

!image.png

The *Y* axis is the number of cells/sec.

You can see that we there is a significant drop when the server is loaded.  
When compactions are backing up this is the worst thing to happen.
>From 2.1 to 3.0 we improved stressed compaction 2x mainly from 
>(CASSANDRA-8988, CASSANDRA-8920, CASSANDRA-8915)
  
But there is still a huge throughput gap we need to fix.  Currently, I've made 
changes to disable thread priority on compaction threads and profiling fixes to 
avoid cpu time that improves throughput another 2x but the final goal is to 
close this gap as much as possible as well as fix any major cpu issues on the 
read and write path since those affect compaction directly as well e.g. 
(CASSANDRA-10309).

As mentioned earlier I'm working on a POC to deal with compaction threads under 
load that I hope will address this issue.  My goal is to have something that 
closes the gap as much as possibly by 3.10



> Improve Compaction Throughput
> -
>
> Key: CASSANDRA-11697
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11697
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Compaction
>Reporter: T Jake Luciani
>Assignee: T Jake Luciani
> Attachments: image.png
>
>
> The goal of this ticket is to improve/understand the bottlenecks during 
> compactions.  At a high level this will involve:
> * A test system for measuring compaction time for different workloads and 
> compaction strategies.
> * Profiling and analysis
> * Make improvements
> * Add throughput regression tests so we can track
> We have a lot of random tickets that relate to this so I'll link them to this 
> ticket 



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

[jira] [Updated] (CASSANDRA-11697) Improve Compaction Throughput

[T Jake Luciani (JIRA)]

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

T Jake Luciani updated CASSANDRA-11697:
---
Attachment: image.png

> Improve Compaction Throughput
> -
>
> Key: CASSANDRA-11697
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11697
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Compaction
>Reporter: T Jake Luciani
>Assignee: T Jake Luciani
> Attachments: image.png
>
>
> The goal of this ticket is to improve/understand the bottlenecks during 
> compactions.  At a high level this will involve:
> * A test system for measuring compaction time for different workloads and 
> compaction strategies.
> * Profiling and analysis
> * Make improvements
> * Add throughput regression tests so we can track
> We have a lot of random tickets that relate to this so I'll link them to this 
> ticket 



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

[jira] [Commented] (CASSANDRA-11697) Improve Compaction Throughput

[T Jake Luciani (JIRA)]

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

T Jake Luciani commented on CASSANDRA-11697:


*The state of compaction and the potential improvements*

To continue the above comment here is information on a specific schema I'm 
focused on.  

{quote}
CREATE TABLE userpics (
 userid bigint,
 picid bigint,
 valueid bigint,
 PRIMARY KEY(userid, picid)
 ) WITH compression = {'sstable_compression':'LZ4Compressor'} AND compaction = 
{'class' : 'LeveledCompactionStrategy', 'sstable_size_in_mb' : '64'};
{quote}

Each picid contains 1000 value ids.

I've run this through two scenarios: Standalone vs Stressed.  *Standalone* is 
with compaction stress that shows the uncontested throughput.  *Stressed* is 
compaction running in C* and taking many writes so the CPUs are loaded.

These scenarios were run against 2.1, 3.0, trunk, and the current patched 
version of compaction-perf work I've been doing.

!image.png

The *Y* axis is the number of cells/sec.

You can see that we there is a significant drop when the server is loaded.  
When compactions are backing up this is the worst thing to happen.
>From 2.1 to 3.0 we improved stressed compaction 2x mainly from 
>(CASSANDRA-8988, CASSANDRA-8920, CASSANDRA-8915)
  
But there is still a huge throughput gap we need to fix.  Currently, I've made 
changes to disable thread priority on compaction threads and profiling fixes to 
avoid cpu time that improves throughput another 2x but the final goal is to 
close this gap as much as possible as well as fix any major cpu issues on the 
read and write path since those affect compaction directly as well e.g. 
(CASSANDRA-10309).

As mentioned earlier I'm working on a POC to deal with compaction threads under 
load that I hope will address this issue.  My goal is to have something that 
closes the gap as much as possibly by 3.10



> Improve Compaction Throughput
> -
>
> Key: CASSANDRA-11697
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11697
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Compaction
>Reporter: T Jake Luciani
>Assignee: T Jake Luciani
>
> The goal of this ticket is to improve/understand the bottlenecks during 
> compactions.  At a high level this will involve:
> * A test system for measuring compaction time for different workloads and 
> compaction strategies.
> * Profiling and analysis
> * Make improvements
> * Add throughput regression tests so we can track
> We have a lot of random tickets that relate to this so I'll link them to this 
> ticket 



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

[cassandra] Git Push Summary

[mshuler]

Repository: cassandra
Updated Tags:  refs/tags/3.8-tentative [created] 795ad23ef

[jira] [Resolved] (CASSANDRA-12136) dtest failure in cqlsh_tests.cqlsh_copy_tests.CqlshCopyTest.test_round_trip_random

[Philip Thompson (JIRA)]

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

Philip Thompson resolved CASSANDRA-12136.
-
   Resolution: Not A Problem
Fix Version/s: (was: 3.9)

This was a hardware issue that was completely unrelated to the test, so I'm 
closing this.

> dtest failure in 
> cqlsh_tests.cqlsh_copy_tests.CqlshCopyTest.test_round_trip_random
> --
>
> Key: CASSANDRA-12136
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12136
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/cassandra-3.0_dtest/764/testReport/cqlsh_tests.cqlsh_copy_tests/CqlshCopyTest/test_round_trip_random
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/dtest.py", line 928, in wrapped
> f(obj)
>   File "/home/automaton/cassandra-dtest/cqlsh_tests/cqlsh_copy_tests.py", 
> line 2334, in test_round_trip_random
> self._test_round_trip(nodes=3, partitioner="random")
>   File "/home/automaton/cassandra-dtest/cqlsh_tests/cqlsh_copy_tests.py", 
> line 2296, in _test_round_trip
> self.prepare(nodes=nodes, partitioner=partitioner)
>   File "/home/automaton/cassandra-dtest/cqlsh_tests/cqlsh_copy_tests.py", 
> line 109, in prepare
> self.cluster.populate(nodes, 
> tokens=tokens).start(wait_for_binary_proto=True)
>   File "/home/automaton/ccm/ccmlib/cluster.py", line 412, in start
> raise NodeError("Error starting {0}.".format(node.name), p)
> "Error starting node1.
> {code}
> Failed on CassCI build cassandra-3.0_dtest #764



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

[jira] [Commented] (CASSANDRA-12192) dtest failure in upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_3_0_x_To_head_trunk.map_keys_indexing_test

[Russ Hatch (JIRA)]

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

Russ Hatch commented on CASSANDRA-12192:


That is to say we should set the class up with an ignore pattern for this.

> dtest failure in 
> upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_3_0_x_To_head_trunk.map_keys_indexing_test
> 
>
> Key: CASSANDRA-12192
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12192
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/upgrade_tests-all/59/testReport/upgrade_tests.cql_tests/TestCQLNodes3RF3_Upgrade_current_3_0_x_To_head_trunk/map_keys_indexing_test
> Failed on CassCI build upgrade_tests-all #59
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/tools.py", line 290, in wrapped
> f(obj)
>   File "/home/automaton/cassandra-dtest/upgrade_tests/cql_tests.py", line 
> 3668, in map_keys_indexing_test
> cursor.execute("TRUNCATE test")
>   File "cassandra/cluster.py", line 1941, in 
> cassandra.cluster.Session.execute (cassandra/cluster.c:33642)
> return self.execute_async(query, parameters, trace, custom_payload, 
> timeout, execution_profile).result()
>   File "cassandra/cluster.py", line 3629, in 
> cassandra.cluster.ResponseFuture.result (cassandra/cluster.c:69369)
> raise self._final_exception
> '
> {code}
> Related failure: 
> http://cassci.datastax.com/job/upgrade_tests-all/59/testReport/upgrade_tests.cql_tests/TestCQLNodes2RF1_Upgrade_current_3_0_x_To_head_trunk/map_keys_indexing_test/



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

[jira] [Commented] (CASSANDRA-12192) dtest failure in upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_3_0_x_To_head_trunk.map_keys_indexing_test

[Russ Hatch (JIRA)]

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

Russ Hatch commented on CASSANDRA-12192:


>From what I understand this one is safe to ignore. See CASSANDRA-12026.

> dtest failure in 
> upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_3_0_x_To_head_trunk.map_keys_indexing_test
> 
>
> Key: CASSANDRA-12192
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12192
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/upgrade_tests-all/59/testReport/upgrade_tests.cql_tests/TestCQLNodes3RF3_Upgrade_current_3_0_x_To_head_trunk/map_keys_indexing_test
> Failed on CassCI build upgrade_tests-all #59
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/tools.py", line 290, in wrapped
> f(obj)
>   File "/home/automaton/cassandra-dtest/upgrade_tests/cql_tests.py", line 
> 3668, in map_keys_indexing_test
> cursor.execute("TRUNCATE test")
>   File "cassandra/cluster.py", line 1941, in 
> cassandra.cluster.Session.execute (cassandra/cluster.c:33642)
> return self.execute_async(query, parameters, trace, custom_payload, 
> timeout, execution_profile).result()
>   File "cassandra/cluster.py", line 3629, in 
> cassandra.cluster.ResponseFuture.result (cassandra/cluster.c:69369)
> raise self._final_exception
> '
> {code}
> Related failure: 
> http://cassci.datastax.com/job/upgrade_tests-all/59/testReport/upgrade_tests.cql_tests/TestCQLNodes2RF1_Upgrade_current_3_0_x_To_head_trunk/map_keys_indexing_test/



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

[jira] [Commented] (CASSANDRA-12160) dtest failure in counter_tests.TestCounters.upgrade_test

[Philip Thompson (JIRA)]

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

Philip Thompson commented on CASSANDRA-12160:
-

So the node comes back up, and we see node1 begin the handshake with it, and 
then nothing. I think we need logging at a lower level to know what happened 
here.

> dtest failure in counter_tests.TestCounters.upgrade_test
> 
>
> Key: CASSANDRA-12160
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12160
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node2.log
>
>
> example failure:
> http://cassci.datastax.com/job/cassandra-2.1_dtest/493/testReport/counter_tests/TestCounters/upgrade_test
> Failed on CassCI build cassandra-2.1_dtest #493
> {code}
> Error Message
> 07 Jul 2016 21:07:28 [node1] Missing: ['127.0.0.2.* now UP']:
> .
> See system.log for remainder
> {code}
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/counter_tests.py", line 101, in 
> upgrade_test
> rolling_restart()
>   File "/home/automaton/cassandra-dtest/counter_tests.py", line 96, in 
> rolling_restart
> nodes[i].start(wait_other_notice=True, wait_for_binary_proto=True)
>   File "/home/automaton/ccm/ccmlib/node.py", line 634, in start
> node.watch_log_for_alive(self, from_mark=mark)
>   File "/home/automaton/ccm/ccmlib/node.py", line 481, in watch_log_for_alive
> self.watch_log_for(tofind, from_mark=from_mark, timeout=timeout, 
> filename=filename)
>   File "/home/automaton/ccm/ccmlib/node.py", line 449, in watch_log_for
> raise TimeoutError(time.strftime("%d %b %Y %H:%M:%S", time.gmtime()) + " 
> [" + self.name + "] Missing: " + str([e.pattern for e in tofind]) + ":\n" + 
> reads[:50] + ".\nSee {} for remainder".format(filename))
> {code}



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

[jira] [Updated] (CASSANDRA-12161) dtest failure in counter_tests.TestCounters.upgrade_test

[Philip Thompson (JIRA)]

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

Philip Thompson updated CASSANDRA-12161:

Assignee: (was: DS Test Eng)

> dtest failure in counter_tests.TestCounters.upgrade_test
> 
>
> Key: CASSANDRA-12161
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12161
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>  Labels: dtest
> Attachments: node1.log, node2.log
>
>
> example failure:
> http://cassci.datastax.com/job/cassandra-2.1_dtest_jdk8/244/testReport/counter_tests/TestCounters/upgrade_test
> Failed on CassCI build cassandra-2.1_dtest_jdk8 #244
> {code}
> Standard Output
> Unexpected error in node2 log, error: 
> ERROR [Reference-Reaper:1] 2016-07-07 02:45:08,632 Ref.java:199 - LEAK 
> DETECTED: a reference 
> (org.apache.cassandra.utils.concurrent.Ref$State@25829106) to class 
> org.apache.cassandra.utils.concurrent.WrappedSharedCloseable$1@725969862:[Memory@[0..4),
>  Memory@[0..e)] was not released before the reference was garbage collected
> Unexpected error in node2 log, error: 
> ERROR [Reference-Reaper:1] 2016-07-07 02:45:08,633 Ref.java:199 - LEAK 
> DETECTED: a reference 
> (org.apache.cassandra.utils.concurrent.Ref$State@2f7afa76) to class 
> org.apache.cassandra.utils.concurrent.WrappedSharedCloseable$1@1786274301:[[OffHeapBitSet]]
>  was not released before the reference was garbage collected
> Unexpected error in node2 log, error: 
> ERROR [Reference-Reaper:1] 2016-07-07 02:45:08,634 Ref.java:199 - LEAK 
> DETECTED: a reference 
> (org.apache.cassandra.utils.concurrent.Ref$State@5b43d715) to class 
> org.apache.cassandra.io.sstable.SSTableReader$DescriptorTypeTidy@1540918496:/tmp/dtest-0jFLWr/test/node2/data0/system/schema_keyspaces-b0f2235744583cdb9631c43e59ce3676/system-schema_keyspaces-ka-1
>  was not released before the reference was garbage collected
> Unexpected error in node2 log, error: 
> ERROR [Reference-Reaper:1] 2016-07-07 02:45:08,634 Ref.java:199 - LEAK 
> DETECTED: a reference 
> (org.apache.cassandra.utils.concurrent.Ref$State@230964a7) to class 
> org.apache.cassandra.io.util.CompressedPoolingSegmentedFile$Cleanup@173514418:/tmp/dtest-0jFLWr/test/node2/data0/system/schema_keyspaces-b0f2235744583cdb9631c43e59ce3676/system-schema_keyspaces-ka-1-Data.db
>  was not released before the reference was garbage collected
> Unexpected error in node2 log, error: 
> ERROR [Reference-Reaper:1] 2016-07-07 02:45:08,634 Ref.java:199 - LEAK 
> DETECTED: a reference 
> (org.apache.cassandra.utils.concurrent.Ref$State@4f691b92) to class 
> org.apache.cassandra.io.util.MmappedSegmentedFile$Cleanup@1346973971:/tmp/dtest-0jFLWr/test/node2/data0/system/schema_keyspaces-b0f2235744583cdb9631c43e59ce3676/system-schema_keyspaces-ka-1-Index.db
>  was not released before the reference was garbage collected
> {code}



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

[jira] [Updated] (CASSANDRA-12161) dtest failure in counter_tests.TestCounters.upgrade_test

[Philip Thompson (JIRA)]

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

Philip Thompson updated CASSANDRA-12161:

Issue Type: Bug  (was: Test)

> dtest failure in counter_tests.TestCounters.upgrade_test
> 
>
> Key: CASSANDRA-12161
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12161
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node2.log
>
>
> example failure:
> http://cassci.datastax.com/job/cassandra-2.1_dtest_jdk8/244/testReport/counter_tests/TestCounters/upgrade_test
> Failed on CassCI build cassandra-2.1_dtest_jdk8 #244
> {code}
> Standard Output
> Unexpected error in node2 log, error: 
> ERROR [Reference-Reaper:1] 2016-07-07 02:45:08,632 Ref.java:199 - LEAK 
> DETECTED: a reference 
> (org.apache.cassandra.utils.concurrent.Ref$State@25829106) to class 
> org.apache.cassandra.utils.concurrent.WrappedSharedCloseable$1@725969862:[Memory@[0..4),
>  Memory@[0..e)] was not released before the reference was garbage collected
> Unexpected error in node2 log, error: 
> ERROR [Reference-Reaper:1] 2016-07-07 02:45:08,633 Ref.java:199 - LEAK 
> DETECTED: a reference 
> (org.apache.cassandra.utils.concurrent.Ref$State@2f7afa76) to class 
> org.apache.cassandra.utils.concurrent.WrappedSharedCloseable$1@1786274301:[[OffHeapBitSet]]
>  was not released before the reference was garbage collected
> Unexpected error in node2 log, error: 
> ERROR [Reference-Reaper:1] 2016-07-07 02:45:08,634 Ref.java:199 - LEAK 
> DETECTED: a reference 
> (org.apache.cassandra.utils.concurrent.Ref$State@5b43d715) to class 
> org.apache.cassandra.io.sstable.SSTableReader$DescriptorTypeTidy@1540918496:/tmp/dtest-0jFLWr/test/node2/data0/system/schema_keyspaces-b0f2235744583cdb9631c43e59ce3676/system-schema_keyspaces-ka-1
>  was not released before the reference was garbage collected
> Unexpected error in node2 log, error: 
> ERROR [Reference-Reaper:1] 2016-07-07 02:45:08,634 Ref.java:199 - LEAK 
> DETECTED: a reference 
> (org.apache.cassandra.utils.concurrent.Ref$State@230964a7) to class 
> org.apache.cassandra.io.util.CompressedPoolingSegmentedFile$Cleanup@173514418:/tmp/dtest-0jFLWr/test/node2/data0/system/schema_keyspaces-b0f2235744583cdb9631c43e59ce3676/system-schema_keyspaces-ka-1-Data.db
>  was not released before the reference was garbage collected
> Unexpected error in node2 log, error: 
> ERROR [Reference-Reaper:1] 2016-07-07 02:45:08,634 Ref.java:199 - LEAK 
> DETECTED: a reference 
> (org.apache.cassandra.utils.concurrent.Ref$State@4f691b92) to class 
> org.apache.cassandra.io.util.MmappedSegmentedFile$Cleanup@1346973971:/tmp/dtest-0jFLWr/test/node2/data0/system/schema_keyspaces-b0f2235744583cdb9631c43e59ce3676/system-schema_keyspaces-ka-1-Index.db
>  was not released before the reference was garbage collected
> {code}



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

[jira] [Commented] (CASSANDRA-12195) dtest failure in upgrade_tests.upgrade_through_versions_test.TestUpgrade_current_2_2_x_To_indev_3_0_x.rolling_upgrade_with_internode_ssl_test

[Russ Hatch (JIRA)]

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

Russ Hatch commented on CASSANDRA-12195:


Most commonly this is an assertion error killing the process (unhandled 
exception), but that should in theory be visible on stderr/stdout.

My work to transition upgrade tests over to regular test jobs will include 
giving the subprocesses descriptive names, so at the very least in the future 
we'll know what process died.

> dtest failure in 
> upgrade_tests.upgrade_through_versions_test.TestUpgrade_current_2_2_x_To_indev_3_0_x.rolling_upgrade_with_internode_ssl_test
> -
>
> Key: CASSANDRA-12195
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12195
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_gc.log, node3.log, node3_debug.log, node3_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/upgrade_tests-all/59/testReport/upgrade_tests.upgrade_through_versions_test/TestUpgrade_current_2_2_x_To_indev_3_0_x/rolling_upgrade_with_internode_ssl_test
> Failed on CassCI build upgrade_tests-all #59
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File 
> "/home/automaton/cassandra-dtest/upgrade_tests/upgrade_through_versions_test.py",
>  line 295, in rolling_upgrade_with_internode_ssl_test
> self.upgrade_scenario(rolling=True, internode_ssl=True)
>   File 
> "/home/automaton/cassandra-dtest/upgrade_tests/upgrade_through_versions_test.py",
>  line 352, in upgrade_scenario
> self._check_on_subprocs(self.subprocs)
>   File 
> "/home/automaton/cassandra-dtest/upgrade_tests/upgrade_through_versions_test.py",
>  line 409, in _check_on_subprocs
> raise RuntimeError(message)
> "A subprocess has terminated early. Subprocess statuses: Process-13 
> (is_alive: False), Process-14 (is_alive: True), Process-15 (is_alive: True), 
> Process-16 (is_alive: True), attempting to terminate remaining subprocesses 
> now.
> {code}
> node2_debug.log is too large to attach.



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

[jira] [Commented] (CASSANDRA-12162) dtest failure in repair_tests.repair_test.TestRepair.simple_sequential_repair_test

[Philip Thompson (JIRA)]

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

Philip Thompson commented on CASSANDRA-12162:
-

[~mambocab], looks like one node had a 6 second GC, which caused it to drop 
this insert. Recommended fix? We could just retry the inserts

> dtest failure in 
> repair_tests.repair_test.TestRepair.simple_sequential_repair_test
> --
>
> Key: CASSANDRA-12162
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12162
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/cassandra-2.2_dtest_win32/267/testReport/repair_tests.repair_test/TestRepair/simple_sequential_repair_test
> Failed on CassCI build cassandra-2.2_dtest_win32 #267
> {code}
> Stacktrace
>   File "C:\tools\python2\lib\unittest\case.py", line 329, in run
> testMethod()
>   File 
> "D:\jenkins\workspace\cassandra-2.2_dtest_win32\cassandra-dtest\repair_tests\repair_test.py",
>  line 241, in simple_sequential_repair_test
> self._simple_repair(sequential=True)
>   File 
> "D:\jenkins\workspace\cassandra-2.2_dtest_win32\cassandra-dtest\repair_tests\repair_test.py",
>  line 295, in _simple_repair
> self._populate_cluster()
>   File 
> "D:\jenkins\workspace\cassandra-2.2_dtest_win32\cassandra-dtest\repair_tests\repair_test.py",
>  line 98, in _populate_cluster
> insert_c1c2(session, n=1000, consistency=ConsistencyLevel.ALL)
>   File 
> "D:\jenkins\workspace\cassandra-2.2_dtest_win32\cassandra-dtest\tools.py", 
> line 78, in insert_c1c2
> execute_concurrent_with_args(session, statement, [['k{}'.format(k)] for k 
> in keys])
>   File "cassandra\concurrent.py", line 224, in 
> cassandra.concurrent.execute_concurrent_with_args 
> (cassandra/concurrent.c:5996)
> return execute_concurrent(session, zip(cycle((statement,)), parameters), 
> *args, **kwargs)
>   File "cassandra\concurrent.py", line 92, in 
> cassandra.concurrent.execute_concurrent (cassandra/concurrent.c:1455)
> return executor.execute(concurrency, raise_on_first_error)
>   File "cassandra\concurrent.py", line 187, in 
> cassandra.concurrent.ConcurrentExecutorListResults.execute 
> (cassandra/concurrent.c:4824)
> return super(ConcurrentExecutorListResults, self).execute(concurrency, 
> fail_fast)
>   File "cassandra\concurrent.py", line 115, in 
> cassandra.concurrent._ConcurrentExecutor.execute (cassandra/concurrent.c:2120)
> return self._results()
>   File "cassandra\concurrent.py", line 201, in 
> cassandra.concurrent.ConcurrentExecutorListResults._results 
> (cassandra/concurrent.c:5617)
> with self._condition:
>   File "cassandra\concurrent.py", line 205, in 
> cassandra.concurrent.ConcurrentExecutorListResults._results 
> (cassandra/concurrent.c:5549)
> self._raise(self._exception)
>   File "cassandra\concurrent.py", line 153, in 
> cassandra.concurrent._ConcurrentExecutor._raise (cassandra/concurrent.c:3498)
> raise exc
> 'Error from server: code=1500 [Replica(s) failed to execute write] 
> message="Operation failed - received 2 responses and 1 failures" 
> info={\'failures\': 1, \'received_responses\': 2, \'required_responses\': 3, 
> \'consistency\': \'ALL\'}
> {code}



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

[jira] [Commented] (CASSANDRA-12144) Undeletable rows after upgrading from 2.2.4 to 3.0.7

[Alex Petrov (JIRA)]

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

Alex Petrov commented on CASSANDRA-12144:
-

I've renamed {{MergingSStableIterator}} to {{RowMergingSSTableIterator}} and 
placed it inside the {{Scrubber}}. Agree this is a better place for it to vbe.

In {{SSTableIdentityIterator}}, I've added a {{doCompute}} method, that 
contains just iteration logic, which left {{computeNext}} with all the error 
handling, so it deduplicated the code.

Also, the short-circuit within {{doCompute}} that returns {{endOfData()}} is 
added.

I'm re-running {{dtests}}. The first run coincided with the 500+ failures, and 
second one was made from forked job, so was not very representative. I've run 
it through {{upgrade_tests-all-custom_branch_runs}} which should work better, 
rebased and re-triggered all CI tests. I'll check results tomorrow, as they'll 
presumably run for longer time.


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

|[upgrade tests 
(matrix)|https://cassci.datastax.com/view/Upgrades/job/upgrade_tests-all-custom_branch_runs/]|

> Undeletable rows after upgrading from 2.2.4 to 3.0.7
> 
>
> Key: CASSANDRA-12144
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12144
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Stanislav Vishnevskiy
>Assignee: Alex Petrov
>
> We upgraded our cluster today and now have a some rows that refuse to delete.
> Here are some example traces.
> https://gist.github.com/vishnevskiy/36aa18c468344ea22d14f9fb9b99171d
> Even weirder.
> Updating the row and querying it back results in 2 rows even though the id is 
> the clustering key.
> {noformat}
> user_id| id | since| type
> ---++--+--
> 116138050710536192 | 153047019424972800 | null |0
> 116138050710536192 | 153047019424972800 | 2016-05-30 14:53:08+ |2
> {noformat}
> And then deleting it again only removes the new one.
> {noformat}
> cqlsh:discord_relationships> DELETE FROM relationships WHERE user_id = 
> 116138050710536192 AND id = 153047019424972800;
> cqlsh:discord_relationships> SELECT * FROM relationships WHERE user_id = 
> 116138050710536192 AND id = 153047019424972800;
>  user_id| id | since| type
> ++--+--
>  116138050710536192 | 153047019424972800 | 2016-05-30 14:53:08+ |2
> {noformat}
> We tried repairing, compacting, scrubbing. No Luck.
> Not sure what to do. Is anyone aware of this?



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

[jira] [Commented] (CASSANDRA-12164) dtest failure in materialized_views_test.TestMaterializedViews.add_dc_after_mv_network_replication_test

[Philip Thompson (JIRA)]

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

Philip Thompson commented on CASSANDRA-12164:
-

[~carlyeks], this isn't another instance of needing to wait for schema 
agreement, right? I'm assuming it should be marked as a bug.

> dtest failure in 
> materialized_views_test.TestMaterializedViews.add_dc_after_mv_network_replication_test
> ---
>
> Key: CASSANDRA-12164
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12164
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log, 
> node4.log, node4_debug.log, node4_gc.log, node5.log, node5_debug.log, 
> node5_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_offheap_dtest/309/testReport/materialized_views_test/TestMaterializedViews/add_dc_after_mv_network_replication_test
> Failed on CassCI build trunk_offheap_dtest #309
> {code}
> Standard Output
> Unexpected error in node4 log, error: 
> ERROR [main] 2016-07-06 19:21:26,631 MigrationManager.java:164 - Migration 
> task failed to complete
> {code}
> Related failure:
> http://cassci.datastax.com/job/trunk_novnode_dtest/423/testReport/materialized_views_test/TestMaterializedViews/add_node_after_mv_test/



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

[jira] [Updated] (CASSANDRA-12165) dtest failure in commitlog_test.TestCommitLog.test_commitlog_replay_on_startup

[Philip Thompson (JIRA)]

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

Philip Thompson updated CASSANDRA-12165:

Issue Type: Bug  (was: Test)

> dtest failure in commitlog_test.TestCommitLog.test_commitlog_replay_on_startup
> --
>
> Key: CASSANDRA-12165
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12165
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_offheap_dtest/312/testReport/commitlog_test/TestCommitLog/test_commitlog_replay_on_startup
> Failed on CassCI build trunk_offheap_dtest #312
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/commitlog_test.py", line 273, in 
> test_commitlog_replay_on_startup
> node1.watch_log_for("Log replay complete")
>   File "/home/automaton/ccm/ccmlib/node.py", line 449, in watch_log_for
> raise TimeoutError(time.strftime("%d %b %Y %H:%M:%S", time.gmtime()) + " 
> [" + self.name + "] Missing: " + str([e.pattern for e in tofind]) + ":\n" + 
> reads[:50] + ".\nSee {} for remainder".format(filename))
> "08 Jul 2016 04:56:21 [node1] Missing: ['Log replay complete']:\nINFO  [main] 
> 2016-07-08 04:46:13,102 YamlConfigura.\nSee system.log for remainder
> {code}



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

[jira] [Updated] (CASSANDRA-12165) dtest failure in commitlog_test.TestCommitLog.test_commitlog_replay_on_startup

[Philip Thompson (JIRA)]

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

Philip Thompson updated CASSANDRA-12165:

Assignee: (was: DS Test Eng)

> dtest failure in commitlog_test.TestCommitLog.test_commitlog_replay_on_startup
> --
>
> Key: CASSANDRA-12165
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12165
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_offheap_dtest/312/testReport/commitlog_test/TestCommitLog/test_commitlog_replay_on_startup
> Failed on CassCI build trunk_offheap_dtest #312
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/commitlog_test.py", line 273, in 
> test_commitlog_replay_on_startup
> node1.watch_log_for("Log replay complete")
>   File "/home/automaton/ccm/ccmlib/node.py", line 449, in watch_log_for
> raise TimeoutError(time.strftime("%d %b %Y %H:%M:%S", time.gmtime()) + " 
> [" + self.name + "] Missing: " + str([e.pattern for e in tofind]) + ":\n" + 
> reads[:50] + ".\nSee {} for remainder".format(filename))
> "08 Jul 2016 04:56:21 [node1] Missing: ['Log replay complete']:\nINFO  [main] 
> 2016-07-08 04:46:13,102 YamlConfigura.\nSee system.log for remainder
> {code}



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

[jira] [Commented] (CASSANDRA-12165) dtest failure in commitlog_test.TestCommitLog.test_commitlog_replay_on_startup

[Philip Thompson (JIRA)]

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

Philip Thompson commented on CASSANDRA-12165:
-

[~thobbs], should I mark this as a dupe of CASSANDRA-12213?

> dtest failure in commitlog_test.TestCommitLog.test_commitlog_replay_on_startup
> --
>
> Key: CASSANDRA-12165
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12165
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_offheap_dtest/312/testReport/commitlog_test/TestCommitLog/test_commitlog_replay_on_startup
> Failed on CassCI build trunk_offheap_dtest #312
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/commitlog_test.py", line 273, in 
> test_commitlog_replay_on_startup
> node1.watch_log_for("Log replay complete")
>   File "/home/automaton/ccm/ccmlib/node.py", line 449, in watch_log_for
> raise TimeoutError(time.strftime("%d %b %Y %H:%M:%S", time.gmtime()) + " 
> [" + self.name + "] Missing: " + str([e.pattern for e in tofind]) + ":\n" + 
> reads[:50] + ".\nSee {} for remainder".format(filename))
> "08 Jul 2016 04:56:21 [node1] Missing: ['Log replay complete']:\nINFO  [main] 
> 2016-07-08 04:46:13,102 YamlConfigura.\nSee system.log for remainder
> {code}



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

[jira] [Commented] (CASSANDRA-12165) dtest failure in commitlog_test.TestCommitLog.test_commitlog_replay_on_startup

[Philip Thompson (JIRA)]

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

Philip Thompson commented on CASSANDRA-12165:
-

Error from logs:
{code}
ERROR [main] 2016-07-08 04:46:23,975 CassandraDaemon.java:733 - Exception 
encountered during startup
java.lang.AssertionError: null
at 
org.apache.cassandra.db.marshal.CompositeType.getInstance(CompositeType.java:103)
 ~[main/:na]
at org.apache.cassandra.config.CFMetaData.rebuild(CFMetaData.java:318) 
~[main/:na]
at org.apache.cassandra.config.CFMetaData.(CFMetaData.java:295) 
~[main/:na]
at org.apache.cassandra.config.CFMetaData.create(CFMetaData.java:373) 
~[main/:na]
at 
org.apache.cassandra.schema.SchemaKeyspace.fetchTable(SchemaKeyspace.java:958) 
~[main/:na]
at 
org.apache.cassandra.schema.SchemaKeyspace.fetchTables(SchemaKeyspace.java:932) 
~[main/:na]
at 
org.apache.cassandra.schema.SchemaKeyspace.fetchKeyspace(SchemaKeyspace.java:895)
 ~[main/:na]
at 
org.apache.cassandra.schema.SchemaKeyspace.fetchKeyspacesWithout(SchemaKeyspace.java:872)
 ~[main/:na]
at 
org.apache.cassandra.schema.SchemaKeyspace.fetchNonSystemKeyspaces(SchemaKeyspace.java:860)
 ~[main/:na]
at org.apache.cassandra.config.Schema.loadFromDisk(Schema.java:136) 
~[main/:na]
at org.apache.cassandra.config.Schema.loadFromDisk(Schema.java:126) 
~[main/:na]
at 
org.apache.cassandra.service.CassandraDaemon.setup(CassandraDaemon.java:253) 
[main/:na]
at 
org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:587) 
[main/:na]
at 
org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:716) 
[main/:na]
{code}

> dtest failure in commitlog_test.TestCommitLog.test_commitlog_replay_on_startup
> --
>
> Key: CASSANDRA-12165
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12165
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_offheap_dtest/312/testReport/commitlog_test/TestCommitLog/test_commitlog_replay_on_startup
> Failed on CassCI build trunk_offheap_dtest #312
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/commitlog_test.py", line 273, in 
> test_commitlog_replay_on_startup
> node1.watch_log_for("Log replay complete")
>   File "/home/automaton/ccm/ccmlib/node.py", line 449, in watch_log_for
> raise TimeoutError(time.strftime("%d %b %Y %H:%M:%S", time.gmtime()) + " 
> [" + self.name + "] Missing: " + str([e.pattern for e in tofind]) + ":\n" + 
> reads[:50] + ".\nSee {} for remainder".format(filename))
> "08 Jul 2016 04:56:21 [node1] Missing: ['Log replay complete']:\nINFO  [main] 
> 2016-07-08 04:46:13,102 YamlConfigura.\nSee system.log for remainder
> {code}



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

[jira] [Updated] (CASSANDRA-12191) dtest failure in upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_2_1_x_To_indev_3_x.cql3_non_compound_range_tombstones_test

[Philip Thompson (JIRA)]

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

Philip Thompson updated CASSANDRA-12191:

Issue Type: Bug  (was: Test)

> dtest failure in 
> upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_2_1_x_To_indev_3_x.cql3_non_compound_range_tombstones_test
> 
>
> Key: CASSANDRA-12191
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12191
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
>
> example failure:
> http://cassci.datastax.com/job/upgrade_tests-all/59/testReport/upgrade_tests.cql_tests/TestCQLNodes3RF3_Upgrade_current_2_1_x_To_indev_3_x/cql3_non_compound_range_tombstones_test
> Failed on CassCi build upgrade_tests-all #59
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/upgrade_tests/cql_tests.py", line 
> 1571, in cql3_non_compound_range_tombstones_test
> self.assertEqual(6, len(row), row)
> {code}
> Seems related to Cassandra-12123



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

[jira] [Updated] (CASSANDRA-12191) dtest failure in upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_2_1_x_To_indev_3_x.cql3_non_compound_range_tombstones_test

[Philip Thompson (JIRA)]

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

Philip Thompson updated CASSANDRA-12191:

Assignee: (was: DS Test Eng)

> dtest failure in 
> upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_2_1_x_To_indev_3_x.cql3_non_compound_range_tombstones_test
> 
>
> Key: CASSANDRA-12191
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12191
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>  Labels: dtest
>
> example failure:
> http://cassci.datastax.com/job/upgrade_tests-all/59/testReport/upgrade_tests.cql_tests/TestCQLNodes3RF3_Upgrade_current_2_1_x_To_indev_3_x/cql3_non_compound_range_tombstones_test
> Failed on CassCi build upgrade_tests-all #59
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/upgrade_tests/cql_tests.py", line 
> 1571, in cql3_non_compound_range_tombstones_test
> self.assertEqual(6, len(row), row)
> {code}
> Seems related to Cassandra-12123



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

[jira] [Commented] (CASSANDRA-12191) dtest failure in upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_2_1_x_To_indev_3_x.cql3_non_compound_range_tombstones_test

[Philip Thompson (JIRA)]

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

Philip Thompson commented on CASSANDRA-12191:
-

This also seems like it should have been fixed by CASSANDRA-12123, and yet it 
still fails, even though both that and 12193 were committed.

> dtest failure in 
> upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_2_1_x_To_indev_3_x.cql3_non_compound_range_tombstones_test
> 
>
> Key: CASSANDRA-12191
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12191
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
>
> example failure:
> http://cassci.datastax.com/job/upgrade_tests-all/59/testReport/upgrade_tests.cql_tests/TestCQLNodes3RF3_Upgrade_current_2_1_x_To_indev_3_x/cql3_non_compound_range_tombstones_test
> Failed on CassCi build upgrade_tests-all #59
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/upgrade_tests/cql_tests.py", line 
> 1571, in cql3_non_compound_range_tombstones_test
> self.assertEqual(6, len(row), row)
> {code}
> Seems related to Cassandra-12123



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

[jira] [Commented] (CASSANDRA-9054) Break DatabaseDescriptor up into multiple classes.

[Blake Eggleston (JIRA)]

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

Blake Eggleston commented on CASSANDRA-9054:


What about _actually_ breaking DatabaseDescriptor into a few different config 
classes? The patch here does fix the specific bits of code causing problems on 
startup, but we still have this huge god object that's hooked into everything. 

Do you have any thoughts here [~yukim]? I know you've wanted to do something 
similar for a while now.

> Break DatabaseDescriptor up into multiple classes.
> --
>
> Key: CASSANDRA-9054
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9054
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Jeremiah Jordan
>Assignee: Robert Stupp
> Fix For: 3.x
>
>
> Right now to get at Config stuff you go through DatabaseDescriptor.  But when 
> you instantiate DatabaseDescriptor it actually opens system tables and such, 
> which triggers commit log replays, and other things if the right flags aren't 
> set ahead of time.  This makes getting at config stuff from tools annoying, 
> as you have to be very careful about instantiation orders.
> It would be nice if we could break DatabaseDescriptor up into multiple 
> classes, so that getting at config stuff from tools wasn't such a pain.



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

[jira] [Commented] (CASSANDRA-12221) Maximum Memory Usage Reached - NoSpamLogger

[Wei Deng (JIRA)]

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

Wei Deng commented on CASSANDRA-12221:
--

It doesn't *directly* indicate a problem, so it shouldn't be WARN/ERROR level 
logging. (Indirectly there could still be a problem on your cluster and this 
could be one of the symptoms.) See some more discussions in CASSANDRA-11681 and 
CASSANDRA-11940. TL;DR is the default 512MB setting is not always optimal.

Also, unless your analysis has revealed a real bug with the code, this kind of 
question is best asked on user mailing list, instead of tracking it in JIRA.

> Maximum Memory Usage Reached - NoSpamLogger
> ---
>
> Key: CASSANDRA-12221
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12221
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core
> Environment: CentOS 6.8 x86_64, Cassandra-3.0.7
>Reporter: vin01
>Priority: Minor
>
> I see some logs which look like :-
> INFO  [SharedPool-Worker-22] 2016-07-17 22:03:02,725 NoSpamLogger.java:91 - 
> Maximum memory usage reached (536870912 bytes), cannot allocate chunk of 
> 1048576 bytes
> INFO  [SharedPool-Worker-33] 2016-07-17 22:18:02,747 NoSpamLogger.java:91 - 
> Maximum memory usage reached (536870912 bytes), cannot allocate chunk of 
> 1048576 bytes
> INFO  [SharedPool-Worker-35] 2016-07-17 22:33:02,829 NoSpamLogger.java:91 - 
> Maximum memory usage reached (536870912 bytes), cannot allocate chunk of 
> 1048576 bytes
> INFO  [SharedPool-Worker-31] 2016-07-17 22:48:02,834 NoSpamLogger.java:91 - 
> Maximum memory usage reached (536870912 bytes), cannot allocate chunk of 
> 1048576 bytes
> When i get these logs, CPU usage is quite high on the system.
> Are they expected? Log message also seems confusing and i am not sure what 
> memory we are talking about here..



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

[jira] [Updated] (CASSANDRA-12192) dtest failure in upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_3_0_x_To_head_trunk.map_keys_indexing_test

[Philip Thompson (JIRA)]

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

Philip Thompson updated CASSANDRA-12192:

Issue Type: Bug  (was: Test)

> dtest failure in 
> upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_3_0_x_To_head_trunk.map_keys_indexing_test
> 
>
> Key: CASSANDRA-12192
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12192
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/upgrade_tests-all/59/testReport/upgrade_tests.cql_tests/TestCQLNodes3RF3_Upgrade_current_3_0_x_To_head_trunk/map_keys_indexing_test
> Failed on CassCI build upgrade_tests-all #59
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/tools.py", line 290, in wrapped
> f(obj)
>   File "/home/automaton/cassandra-dtest/upgrade_tests/cql_tests.py", line 
> 3668, in map_keys_indexing_test
> cursor.execute("TRUNCATE test")
>   File "cassandra/cluster.py", line 1941, in 
> cassandra.cluster.Session.execute (cassandra/cluster.c:33642)
> return self.execute_async(query, parameters, trace, custom_payload, 
> timeout, execution_profile).result()
>   File "cassandra/cluster.py", line 3629, in 
> cassandra.cluster.ResponseFuture.result (cassandra/cluster.c:69369)
> raise self._final_exception
> '
> {code}
> Related failure: 
> http://cassci.datastax.com/job/upgrade_tests-all/59/testReport/upgrade_tests.cql_tests/TestCQLNodes2RF1_Upgrade_current_3_0_x_To_head_trunk/map_keys_indexing_test/



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

[jira] [Commented] (CASSANDRA-12192) dtest failure in upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_3_0_x_To_head_trunk.map_keys_indexing_test

[Philip Thompson (JIRA)]

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

Philip Thompson commented on CASSANDRA-12192:
-

So, I have the following error in the logs of nodes2 and 3:
{code}
ERROR [MessagingService-Incoming-/127.0.0.1] 2016-07-13 05:23:15,952 
CassandraDaemon.java:201 - Exception in thread 
Thread[MessagingService-Incoming-/127.0.0.1,5,main]
java.lang.RuntimeException: Unknown column cdc during deserialization
at 
org.apache.cassandra.db.Columns$Serializer.deserialize(Columns.java:432) 
~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.db.SerializationHeader$Serializer.deserializeForMessaging(SerializationHeader.java:427)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer.deserializeHeader(UnfilteredRowIteratorSerializer.java:190)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.db.partitions.PartitionUpdate$PartitionUpdateSerializer.deserialize30(PartitionUpdate.java:657)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.db.partitions.PartitionUpdate$PartitionUpdateSerializer.deserialize(PartitionUpdate.java:645)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.db.Mutation$MutationSerializer.deserialize(Mutation.java:344)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.db.Mutation$MutationSerializer.deserialize(Mutation.java:353)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.service.MigrationManager$MigrationsSerializer.deserialize(MigrationManager.java:609)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.service.MigrationManager$MigrationsSerializer.deserialize(MigrationManager.java:592)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at org.apache.cassandra.net.MessageIn.read(MessageIn.java:98) 
~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.net.IncomingTcpConnection.receiveMessage(IncomingTcpConnection.java:201)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.net.IncomingTcpConnection.receiveMessages(IncomingTcpConnection.java:178)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.net.IncomingTcpConnection.run(IncomingTcpConnection.java:92)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
DEBUG [GossipStage:1] 2016-07-13 05:23:16,855 MigrationManager.java:101 - 
Submitting migration task for /127.0.0.1
ERROR [MessagingService-Incoming-/127.0.0.1] 2016-07-13 05:23:17,383 
CassandraDaemon.java:201 - Exception in thread 
Thread[MessagingService-Incoming-/127.0.0.1,5,main]
java.lang.RuntimeException: Unknown column cdc during deserialization
at 
org.apache.cassandra.db.Columns$Serializer.deserialize(Columns.java:432) 
~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.db.SerializationHeader$Serializer.deserializeForMessaging(SerializationHeader.java:427)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer.deserializeHeader(UnfilteredRowIteratorSerializer.java:190)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.db.partitions.PartitionUpdate$PartitionUpdateSerializer.deserialize30(PartitionUpdate.java:657)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.db.partitions.PartitionUpdate$PartitionUpdateSerializer.deserialize(PartitionUpdate.java:645)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.db.Mutation$MutationSerializer.deserialize(Mutation.java:344)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.db.Mutation$MutationSerializer.deserialize(Mutation.java:353)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.service.MigrationManager$MigrationsSerializer.deserialize(MigrationManager.java:609)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.service.MigrationManager$MigrationsSerializer.deserialize(MigrationManager.java:592)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at org.apache.cassandra.net.MessageIn.read(MessageIn.java:98) 
~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.net.IncomingTcpConnection.receiveMessage(IncomingTcpConnection.java:201)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.net.IncomingTcpConnection.receiveMessages(IncomingTcpConnection.java:178)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
at 
org.apache.cassandra.net.IncomingTcpConnection.run(IncomingTcpConnection.java:92)
 ~[apache-cassandra-3.0.8.jar:3.0.8]
DEBUG [GossipStage:1] 2016-07-13 05:23:17,858 StorageService.java:1899 - Node 
/127.0.0.1 state NORMAL, token [-1378122049260494817, -1491944349266034000, 
-1622944791425543487, -2011387665415943034, -2604861794090361113, 
-2623806159584154975, -2661418387004022901, -3056348922832743393, 
-3634522926981587558, 

[jira] [Updated] (CASSANDRA-12192) dtest failure in upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_3_0_x_To_head_trunk.map_keys_indexing_test

[Philip Thompson (JIRA)]

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

Philip Thompson updated CASSANDRA-12192:

Assignee: (was: DS Test Eng)

> dtest failure in 
> upgrade_tests.cql_tests.TestCQLNodes3RF3_Upgrade_current_3_0_x_To_head_trunk.map_keys_indexing_test
> 
>
> Key: CASSANDRA-12192
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12192
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/upgrade_tests-all/59/testReport/upgrade_tests.cql_tests/TestCQLNodes3RF3_Upgrade_current_3_0_x_To_head_trunk/map_keys_indexing_test
> Failed on CassCI build upgrade_tests-all #59
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/tools.py", line 290, in wrapped
> f(obj)
>   File "/home/automaton/cassandra-dtest/upgrade_tests/cql_tests.py", line 
> 3668, in map_keys_indexing_test
> cursor.execute("TRUNCATE test")
>   File "cassandra/cluster.py", line 1941, in 
> cassandra.cluster.Session.execute (cassandra/cluster.c:33642)
> return self.execute_async(query, parameters, trace, custom_payload, 
> timeout, execution_profile).result()
>   File "cassandra/cluster.py", line 3629, in 
> cassandra.cluster.ResponseFuture.result (cassandra/cluster.c:69369)
> raise self._final_exception
> '
> {code}
> Related failure: 
> http://cassci.datastax.com/job/upgrade_tests-all/59/testReport/upgrade_tests.cql_tests/TestCQLNodes2RF1_Upgrade_current_3_0_x_To_head_trunk/map_keys_indexing_test/



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

[jira] [Commented] (CASSANDRA-12195) dtest failure in upgrade_tests.upgrade_through_versions_test.TestUpgrade_current_2_2_x_To_indev_3_0_x.rolling_upgrade_with_internode_ssl_test

[Philip Thompson (JIRA)]

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

Philip Thompson commented on CASSANDRA-12195:
-

[~rhatch], with no errors in the logs, do we have any idea why these 
subprocesses may have aborted?

> dtest failure in 
> upgrade_tests.upgrade_through_versions_test.TestUpgrade_current_2_2_x_To_indev_3_0_x.rolling_upgrade_with_internode_ssl_test
> -
>
> Key: CASSANDRA-12195
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12195
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_gc.log, node3.log, node3_debug.log, node3_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/upgrade_tests-all/59/testReport/upgrade_tests.upgrade_through_versions_test/TestUpgrade_current_2_2_x_To_indev_3_0_x/rolling_upgrade_with_internode_ssl_test
> Failed on CassCI build upgrade_tests-all #59
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File 
> "/home/automaton/cassandra-dtest/upgrade_tests/upgrade_through_versions_test.py",
>  line 295, in rolling_upgrade_with_internode_ssl_test
> self.upgrade_scenario(rolling=True, internode_ssl=True)
>   File 
> "/home/automaton/cassandra-dtest/upgrade_tests/upgrade_through_versions_test.py",
>  line 352, in upgrade_scenario
> self._check_on_subprocs(self.subprocs)
>   File 
> "/home/automaton/cassandra-dtest/upgrade_tests/upgrade_through_versions_test.py",
>  line 409, in _check_on_subprocs
> raise RuntimeError(message)
> "A subprocess has terminated early. Subprocess statuses: Process-13 
> (is_alive: False), Process-14 (is_alive: True), Process-15 (is_alive: True), 
> Process-16 (is_alive: True), attempting to terminate remaining subprocesses 
> now.
> {code}
> node2_debug.log is too large to attach.



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

[jira] [Commented] (CASSANDRA-12196) dtest failure in upgrade_tests.upgrade_through_versions_test.TestUpgrade_current_2_1_x_To_indev_3_x.bootstrap_test

[Philip Thompson (JIRA)]

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

Philip Thompson commented on CASSANDRA-12196:
-

The node comes up. Do we just need to wait longer for the rest of the cluster 
to recognize it? [~rhatch], what do you think of increasing the 
wait_other_notice timeout on the upgrade tests?

> dtest failure in 
> upgrade_tests.upgrade_through_versions_test.TestUpgrade_current_2_1_x_To_indev_3_x.bootstrap_test
> --
>
> Key: CASSANDRA-12196
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12196
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: DS Test Eng
>  Labels: dtest
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log, 
> node4.log, node4_debug.log, node4_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/upgrade_tests-all/59/testReport/upgrade_tests.upgrade_through_versions_test/TestUpgrade_current_2_1_x_To_indev_3_x/bootstrap_test
> Failed on CassCI build upgrade_tests-all #59
> {code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File 
> "/home/automaton/cassandra-dtest/upgrade_tests/upgrade_through_versions_test.py",
>  line 707, in bootstrap_test
> self.upgrade_scenario(after_upgrade_call=(self._bootstrap_new_node,))
>   File 
> "/home/automaton/cassandra-dtest/upgrade_tests/upgrade_through_versions_test.py",
>  line 383, in upgrade_scenario
> call()
>   File 
> "/home/automaton/cassandra-dtest/upgrade_tests/upgrade_through_versions_test.py",
>  line 688, in _bootstrap_new_node
> nnode.start(use_jna=True, wait_other_notice=True, 
> wait_for_binary_proto=True)
>   File "/home/automaton/ccm/ccmlib/node.py", line 634, in start
> node.watch_log_for_alive(self, from_mark=mark)
>   File "/home/automaton/ccm/ccmlib/node.py", line 481, in watch_log_for_alive
> self.watch_log_for(tofind, from_mark=from_mark, timeout=timeout, 
> filename=filename)
>   File "/home/automaton/ccm/ccmlib/node.py", line 449, in watch_log_for
> raise TimeoutError(time.strftime("%d %b %Y %H:%M:%S", time.gmtime()) + " 
> [" + self.name + "] Missing: " + str([e.pattern for e in tofind]) + ":\n" + 
> reads[:50] + ".\nSee {} for remainder".format(filename))
> "13 Jul 2016 02:23:05 [node2] Missing: ['127.0.0.4.* now UP']:\nINFO  
> [HANDSHAKE-/127.0.0.4] 2016-07-13 02:21:00,2.\nSee system.log for 
> remainder
> {code}



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

[jira] [Commented] (CASSANDRA-11998) dtest failure in offline_tools_test.TestOfflineTools.sstableofflinerelevel_test

[Carl Yeksigian (JIRA)]

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

Carl Yeksigian commented on CASSANDRA-11998:


I was able to reproduce this locally when using a single data directory 
(DATADIR_COUNT=1); bumping the multiplier to 8 works locally. Rerunning the CI 
test now.

> dtest failure in 
> offline_tools_test.TestOfflineTools.sstableofflinerelevel_test
> ---
>
> Key: CASSANDRA-11998
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11998
> Project: Cassandra
>  Issue Type: Test
>Reporter: Craig Kodman
>Assignee: Carl Yeksigian
>  Labels: dtest
>
> example failure:
> http://cassci.datastax.com/job/cassandra-2.2_dtest/635/testReport/offline_tools_test/TestOfflineTools/sstableofflinerelevel_test
> Failed on CassCI build cassandra-2.2_dtest #635



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

[jira] [Commented] (CASSANDRA-10202) simplify CommitLogSegmentManager

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko commented on CASSANDRA-10202:
---

Doesn't build to me, applied to most recent trunk. Can you please rebase, 
[~blambov]?

> simplify CommitLogSegmentManager
> 
>
> Key: CASSANDRA-10202
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10202
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Local Write-Read Paths
>Reporter: Jonathan Ellis
>Assignee: Branimir Lambov
>Priority: Minor
>
> Now that we only keep one active segment around we can simplify this from the 
> old recycling design.



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

[1/2] cassandra git commit: Update build.xml and CHANGES.txt for 3.8

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 7a06b3930 -> 7b7ca79a6


Update build.xml and CHANGES.txt for 3.8


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

Branch: refs/heads/trunk
Commit: 7e3eac5f3ef49117367ad833b0dd3c14b920c0b0
Parents: 2aa7663
Author: Aleksey Yeschenko 
Authored: Mon Jul 18 16:47:52 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Jul 18 16:49:30 2016 +0100

--
 CHANGES.txt | 49 +++--
 1 file changed, 23 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e3eac5f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 3307fb3..ce58153 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,33 +1,10 @@
 3.9
- * Fix hdr logging for single operation workloads (CASSANDRA-12145)
- * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)
- * Increase size of flushExecutor thread pool (CASSANDRA-12071)
-Merged from 3.0:
- * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
- * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
- * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
- * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
- * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
- * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
- * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996)
- * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
- * Fix column ordering of results with static columns for Thrift requests in
-   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
-   those static columns in query results (CASSANDRA-12123)
- * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
- * Fix EOF exception when altering column type (CASSANDRA-11820)
-Merged from 2.2:
- * Synchronize ThriftServer::stop() (CASSANDRA-12105)
- * Use dedicated thread for JMX notifications (CASSANDRA-12146)
- * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
- * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
-Merged from 2.1:
- * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
- * Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
- * Remove finished incoming streaming connections from MessagingService 
(CASSANDRA-11854)
 
 
 3.8
+ * Fix hdr logging for single operation workloads (CASSANDRA-12145)
+ * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)
+ * Increase size of flushExecutor thread pool (CASSANDRA-12071)
  * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
  * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
  * Improve details in compaction log message (CASSANDRA-12080)
@@ -53,18 +30,38 @@ Merged from 2.1:
  * Add repaired percentage metric (CASSANDRA-11503)
  * Add Change-Data-Capture (CASSANDRA-8844)
 Merged from 3.0:
+ * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
+ * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
+ * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
+ * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
+ * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
+ * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
+ * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996)
+ * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
+ * Fix column ordering of results with static columns for Thrift requests in
+   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
+   those static columns in query results (CASSANDRA-12123)
+ * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
+ * Fix EOF exception when altering column type (CASSANDRA-11820)
  * cqlsh: fix error handling in rare COPY FROM failure scenario 
(CASSANDRA-12070)
  * Disable autocompaction during drain (CASSANDRA-11878)
  * Add a metrics timer to MemtablePool and use it to track time spent blocked 
on memory in MemtableAllocator (CASSANDRA-11327)
  * Fix 

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

[aleksey]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: 7b7ca79a68bca95c64f889461d8e0de34efa73bb
Parents: 7a06b39 7e3eac5
Author: Aleksey Yeschenko 
Authored: Mon Jul 18 16:50:45 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Jul 18 16:50:45 2016 +0100

--
 CHANGES.txt | 49 +++--
 1 file changed, 23 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b7ca79a/CHANGES.txt
--
diff --cc CHANGES.txt
index 54a5281,ce58153..c974467
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,4 +1,19 @@@
 +3.10
 + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035)
 + * Expose metrics for successful/failed authentication attempts 
(CASSANDRA-10635)
 + * Prepend snapshot name with "truncated" or "dropped" when a snapshot
 +   is taken before truncating or dropping a table (CASSANDRA-12178)
 + * Optimize RestrictionSet (CASSANDRA-12153)
 + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150)
 + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613)
 + * Create a system table to expose prepared statements (CASSANDRA-8831)
 + * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
 + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
 + * Add supplied username to authentication error messages (CASSANDRA-12076)
 + * Remove pre-startup check for open JMX port (CASSANDRA-12074)
 +
 +
  3.9
-  * Fix hdr logging for single operation workloads (CASSANDRA-12145)
-  * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
-  * Increase size of flushExecutor thread pool (CASSANDRA-12071)
- Merged from 3.0:
-  * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
-  * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
-  * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
-  * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
-  * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
-  * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
-  * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
-  * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
-  * Fix column ordering of results with static columns for Thrift requests in
-a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
-those static columns in query results (CASSANDRA-12123)
-  * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
-  * Fix EOF exception when altering column type (CASSANDRA-11820)
- Merged from 2.2:
-  * Synchronize ThriftServer::stop() (CASSANDRA-12105)
-  * Use dedicated thread for JMX notifications (CASSANDRA-12146)
-  * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
-  * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
- Merged from 2.1:
-  * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
-  * Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
-  * Remove finished incoming streaming connections from MessagingService 
(CASSANDRA-11854)
  
  
  3.8

cassandra git commit: Update build.xml and CHANGES.txt for 3.8

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.9 2aa76632d -> 7e3eac5f3


Update build.xml and CHANGES.txt for 3.8


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

Branch: refs/heads/cassandra-3.9
Commit: 7e3eac5f3ef49117367ad833b0dd3c14b920c0b0
Parents: 2aa7663
Author: Aleksey Yeschenko 
Authored: Mon Jul 18 16:47:52 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Jul 18 16:49:30 2016 +0100

--
 CHANGES.txt | 49 +++--
 1 file changed, 23 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e3eac5f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 3307fb3..ce58153 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,33 +1,10 @@
 3.9
- * Fix hdr logging for single operation workloads (CASSANDRA-12145)
- * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)
- * Increase size of flushExecutor thread pool (CASSANDRA-12071)
-Merged from 3.0:
- * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
- * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
- * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
- * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
- * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
- * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
- * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996)
- * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
- * Fix column ordering of results with static columns for Thrift requests in
-   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
-   those static columns in query results (CASSANDRA-12123)
- * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
- * Fix EOF exception when altering column type (CASSANDRA-11820)
-Merged from 2.2:
- * Synchronize ThriftServer::stop() (CASSANDRA-12105)
- * Use dedicated thread for JMX notifications (CASSANDRA-12146)
- * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
- * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
-Merged from 2.1:
- * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
- * Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
- * Remove finished incoming streaming connections from MessagingService 
(CASSANDRA-11854)
 
 
 3.8
+ * Fix hdr logging for single operation workloads (CASSANDRA-12145)
+ * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)
+ * Increase size of flushExecutor thread pool (CASSANDRA-12071)
  * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
  * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
  * Improve details in compaction log message (CASSANDRA-12080)
@@ -53,18 +30,38 @@ Merged from 2.1:
  * Add repaired percentage metric (CASSANDRA-11503)
  * Add Change-Data-Capture (CASSANDRA-8844)
 Merged from 3.0:
+ * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
+ * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
+ * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
+ * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
+ * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
+ * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
+ * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996)
+ * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
+ * Fix column ordering of results with static columns for Thrift requests in
+   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
+   those static columns in query results (CASSANDRA-12123)
+ * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
+ * Fix EOF exception when altering column type (CASSANDRA-11820)
  * cqlsh: fix error handling in rare COPY FROM failure scenario 
(CASSANDRA-12070)
  * Disable autocompaction during drain (CASSANDRA-11878)
  * Add a metrics timer to MemtablePool and use it to track time spent blocked 
on memory in MemtableAllocator (CASSANDRA-11327)

cassandra git commit: Update build.xml and CHANGES.txt for 3.8

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.8 2aa76632d -> c3ded0551


Update build.xml and CHANGES.txt for 3.8


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

Branch: refs/heads/cassandra-3.8
Commit: c3ded0551f538f7845602b27d53240cd8129265c
Parents: 2aa7663
Author: Aleksey Yeschenko 
Authored: Mon Jul 18 16:47:52 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Jul 18 16:47:52 2016 +0100

--
 CHANGES.txt | 48 +---
 build.xml   |  2 +-
 2 files changed, 22 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3ded055/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 3307fb3..4330fde 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,33 +1,7 @@
-3.9
+3.8
  * Fix hdr logging for single operation workloads (CASSANDRA-12145)
  * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)
  * Increase size of flushExecutor thread pool (CASSANDRA-12071)
-Merged from 3.0:
- * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
- * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
- * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
- * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
- * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
- * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
- * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996)
- * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
- * Fix column ordering of results with static columns for Thrift requests in
-   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
-   those static columns in query results (CASSANDRA-12123)
- * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
- * Fix EOF exception when altering column type (CASSANDRA-11820)
-Merged from 2.2:
- * Synchronize ThriftServer::stop() (CASSANDRA-12105)
- * Use dedicated thread for JMX notifications (CASSANDRA-12146)
- * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
- * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
-Merged from 2.1:
- * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
- * Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
- * Remove finished incoming streaming connections from MessagingService 
(CASSANDRA-11854)
-
-
-3.8
  * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
  * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
  * Improve details in compaction log message (CASSANDRA-12080)
@@ -53,18 +27,38 @@ Merged from 2.1:
  * Add repaired percentage metric (CASSANDRA-11503)
  * Add Change-Data-Capture (CASSANDRA-8844)
 Merged from 3.0:
+ * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
+ * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
+ * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
+ * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
+ * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
+ * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
+ * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996)
+ * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
+ * Fix column ordering of results with static columns for Thrift requests in
+   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
+   those static columns in query results (CASSANDRA-12123)
+ * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
+ * Fix EOF exception when altering column type (CASSANDRA-11820)
  * cqlsh: fix error handling in rare COPY FROM failure scenario 
(CASSANDRA-12070)
  * Disable autocompaction during drain (CASSANDRA-11878)
  * Add a metrics timer to MemtablePool and use it to track time spent blocked 
on memory in MemtableAllocator (CASSANDRA-11327)
  * Fix upgrading schema with super columns with non-text subcomparators 
(CASSANDRA-12023)
  * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
 Merged from 2.2:
+ * Synchronize 

[29/50] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/cassandra-3.8
Commit: 1417a516cf7cc89dc456eb8c9c7e2759811a6991
Parents: c1dcc9c 2fa44cd
Author: Yuki Morishita 
Authored: Fri Jul 8 19:12:34 2016 -0500
Committer: Yuki Morishita 
Committed: Fri Jul 8 19:12:34 2016 -0500

--
 src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1417a516/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
--

[44/50] cassandra git commit: Fix potential deadlock in CDC state tracking

[aleksey]

Fix potential deadlock in CDC state tracking

Patch by jmckenzie; reviewed by cyeksigian for CASSANDRA-12198


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

Branch: refs/heads/cassandra-3.8
Commit: 90afc58d3df912c720aff63de0506019b8b9af48
Parents: e3f9b7a
Author: Josh McKenzie 
Authored: Wed Jul 13 18:30:40 2016 -0400
Committer: Josh McKenzie 
Committed: Thu Jul 14 10:36:43 2016 -0400

--
 src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java | 3 ++-
 .../cassandra/db/commitlog/CommitLogSegmentManagerCDC.java   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/90afc58d/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
--
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java 
b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
index 2e97fd5..a1158be 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
@@ -61,6 +61,7 @@ public abstract class CommitLogSegment
 FORBIDDEN,
 CONTAINS
 }
+Object cdcStateLock = new Object();
 
 private final static AtomicInteger nextId = new AtomicInteger(1);
 private static long replayLimitId;
@@ -614,7 +615,7 @@ public abstract class CommitLogSegment
 return;
 
 // Also synchronized in CDCSizeTracker.processNewSegment and 
.processDiscardedSegment
-synchronized(this)
+synchronized(cdcStateLock)
 {
 if (cdcState == CDCState.CONTAINS && newState != CDCState.CONTAINS)
 throw new IllegalArgumentException("Cannot transition from 
CONTAINS to any other state.");

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90afc58d/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDC.java
--
diff --git 
a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDC.java 
b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDC.java
index 5c6fd3f..04beb20 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDC.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerCDC.java
@@ -187,7 +187,7 @@ public class CommitLogSegmentManagerCDC extends 
AbstractCommitLogSegmentManager
 void processNewSegment(CommitLogSegment segment)
 {
 // See synchronization in CommitLogSegment.setCDCState
-synchronized(segment)
+synchronized(segment.cdcStateLock)
 {
 segment.setCDCState(defaultSegmentSize() + 
totalCDCSizeOnDisk() > allowableCDCBytes()
 ? CDCState.FORBIDDEN
@@ -203,7 +203,7 @@ public class CommitLogSegmentManagerCDC extends 
AbstractCommitLogSegmentManager
 void processDiscardedSegment(CommitLogSegment segment)
 {
 // See synchronization in CommitLogSegment.setCDCState
-synchronized(segment)
+synchronized(segment.cdcStateLock)
 {
 // Add to flushed size before decrementing unflushed so we 
don't have a window of false generosity
 if (segment.getCDCState() == CDCState.CONTAINS)

[23/50] cassandra git commit: Use dedicated thread for sending JMX notifications

[aleksey]

Use dedicated thread for sending JMX notifications

patch by Stefan Podkowinski; reviewed by yukim for CASSANDRA-12146


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

Branch: refs/heads/cassandra-3.8
Commit: f28409bb9730c0318c3243f9d0febbb05ec0c2dc
Parents: ef18a17
Author: Stefan Podkowinski 
Authored: Wed Jul 6 16:58:47 2016 +0200
Committer: Yuki Morishita 
Committed: Thu Jul 7 10:59:44 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f28409bb/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index e10af6f..9fef5a2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.8
+ * Use dedicated thread for JMX notifications (CASSANDRA-12146)
  * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143)
  * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
  * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f28409bb/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index a877074..fa04595 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -210,6 +210,9 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 public StorageService()
 {
+// use dedicated executor for sending JMX notifications
+super(Executors.newSingleThreadExecutor());
+
 MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
 try
 {

[01/50] cassandra git commit: Apply Thrift ordering to legacy remote response where needed [Forced Update!]

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.8 00d50303f -> 2aa76632d (forced update)


Apply Thrift ordering to legacy remote response where needed

Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-12123


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

Branch: refs/heads/cassandra-3.8
Commit: 2217695166a61f576b36993b36a6bde8c8952fde
Parents: a9a6e5f
Author: Tyler Hobbs 
Authored: Tue Jul 5 11:45:45 2016 -0500
Committer: Tyler Hobbs 
Committed: Tue Jul 5 11:45:45 2016 -0500

--
 CHANGES.txt| 3 +++
 src/java/org/apache/cassandra/db/ReadResponse.java | 8 +---
 2 files changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/22176951/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 2df77e1..7f8a3a1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,7 @@
 3.0.9
+ * Fix column ordering of results with static columns for Thrift requests in
+   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
+   those static columns in query results (CASSANDRA-12123)
  * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
  * Fix EOF exception when altering column type (CASSANDRA-11820)
 Merged from 2.2:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/22176951/src/java/org/apache/cassandra/db/ReadResponse.java
--
diff --git a/src/java/org/apache/cassandra/db/ReadResponse.java 
b/src/java/org/apache/cassandra/db/ReadResponse.java
index a618aa5..8bd1be6 100644
--- a/src/java/org/apache/cassandra/db/ReadResponse.java
+++ b/src/java/org/apache/cassandra/db/ReadResponse.java
@@ -38,6 +38,7 @@ import org.apache.cassandra.io.util.DataInputPlus;
 import org.apache.cassandra.io.util.DataOutputPlus;
 import org.apache.cassandra.io.util.DataOutputBuffer;
 import org.apache.cassandra.net.MessagingService;
+import org.apache.cassandra.thrift.ThriftResultsMerger;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.apache.cassandra.utils.FBUtilities;
 
@@ -267,15 +268,16 @@ public abstract class ReadResponse
 {
 ImmutableBTreePartition partition = toReturn.get(idx++);
 
-
 ClusteringIndexFilter filter = 
command.clusteringIndexFilter(partition.partitionKey());
 
 // Pre-3.0, we didn't have a way to express exclusivity 
for non-composite comparators, so all slices were
 // inclusive on both ends. If we have exclusive slice 
ends, we need to filter the results here.
 if (!command.metadata().isCompound())
-return 
filter.filter(partition.sliceableUnfilteredIterator(command.columnFilter(), 
filter.isReversed()));
+return ThriftResultsMerger.maybeWrap(
+
filter.filter(partition.sliceableUnfilteredIterator(command.columnFilter(), 
filter.isReversed())), command.nowInSec());
 
-return 
partition.unfilteredIterator(command.columnFilter(), Slices.ALL, 
filter.isReversed());
+return ThriftResultsMerger.maybeWrap(
+
partition.unfilteredIterator(command.columnFilter(), Slices.ALL, 
filter.isReversed()), command.nowInSec());
 }
 };
 }

[36/50] 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/5861cd8f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5861cd8f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5861cd8f

Branch: refs/heads/cassandra-3.8
Commit: 5861cd8fe2e5427b791672c6db61d2d43d925646
Parents: 4d7141f 9a8406f
Author: Aleksey Yeschenko 
Authored: Mon Jul 11 14:55:05 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Jul 11 15:00:03 2016 +0100

--
 CHANGES.txt| 6 +++---
 src/java/org/apache/cassandra/thrift/ThriftServer.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5861cd8f/CHANGES.txt
--
diff --cc CHANGES.txt
index 4241da8,837c3fb..70210a8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,17 +1,32 @@@
 -2.2.8
 +3.0.9
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
- 2.2.8
-  * Use dedicated thread for JMX notifications (CASSANDRA-12146)
-  * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * Synchronize ThriftServer::stop() (CASSANDRA-12105)
+  * Use dedicated thread for JMX notifications (CASSANDRA-12146)
 - * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143)
+  * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
   * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
  Merged from 2.1:
 - * Don't write shadowed range tombstone (CASSANDRA-12030)
 - * Improve digest calculation in the presence of overlapping tombstones 
(CASSANDRA-11349)
   * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
 - * Account for partition deletions in tombstone histogram (CASSANDRA-12112)
  
  
 -2.2.7
 +3.0.8
 + * Fix potential race in schema during new table creation (CASSANDRA-12083)
 + * cqlsh: fix error handling in rare COPY FROM failure scenario 
(CASSANDRA-12070)
 + * Disable autocompaction during drain (CASSANDRA-11878)
 + * Add a metrics timer to MemtablePool and use it to track time spent blocked 
on memory in MemtableAllocator (CASSANDRA-11327)
 + * Fix upgrading schema with super columns with non-text subcomparators 
(CASSANDRA-12023)
 + * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
 +Merged from 2.2:
   * Allow nodetool info to run with readonly JMX access (CASSANDRA-11755)
   * Validate bloom_filter_fp_chance against lowest supported
 value when the table is created (CASSANDRA-11920)

[05/50] cassandra git commit: Avoid missing sstables when getting the canonical sstables

[aleksey]

Avoid missing sstables when getting the canonical sstables

Patch by marcuse; reviewed by Stefania Alborghetti for CASSANDRA-11996


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

Branch: refs/heads/cassandra-3.8
Commit: bc23632f201f760147d8bd1fbee68533fc3f6dfa
Parents: 5b0566a
Author: Marcus Eriksson 
Authored: Mon Jun 13 15:29:08 2016 +0200
Committer: Marcus Eriksson 
Committed: Wed Jul 6 07:57:24 2016 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  6 +--
 .../cassandra/db/SizeEstimatesRecorder.java |  7 +++-
 .../apache/cassandra/db/lifecycle/Tracker.java  |  2 +-
 .../org/apache/cassandra/db/lifecycle/View.java | 30 +++---
 .../apache/cassandra/db/view/ViewBuilder.java   |  4 +-
 .../cassandra/index/SecondaryIndexManager.java  |  2 +-
 .../index/internal/CassandraIndex.java  |  2 +-
 .../io/sstable/IndexSummaryManager.java |  2 +-
 .../cassandra/streaming/StreamSession.java  |  4 +-
 .../apache/cassandra/db/lifecycle/ViewTest.java |  6 +--
 .../index/internal/CustomCassandraIndex.java|  2 +-
 .../io/sstable/SSTableRewriterTest.java | 41 +++-
 13 files changed, 78 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc23632f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 99ac3ad..b3063b4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.9
+ * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996)
  * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
  * Fix column ordering of results with static columns for Thrift requests in
a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc23632f/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 1be3175..b95e88d 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1482,7 +1482,7 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 
 public Iterable getSSTables(SSTableSet sstableSet)
 {
-return data.getView().sstables(sstableSet);
+return data.getView().select(sstableSet);
 }
 
 public Iterable getUncompactingSSTables()
@@ -1916,7 +1916,7 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 
 public Iterable keySamples(Range range)
 {
-try (RefViewFragment view = 
selectAndReference(View.select(SSTableSet.CANONICAL)))
+try (RefViewFragment view = 
selectAndReference(View.selectFunction(SSTableSet.CANONICAL)))
 {
 Iterable[] samples = new 
Iterable[view.sstables.size()];
 int i = 0;
@@ -1930,7 +1930,7 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 
 public long estimatedKeysForRange(Range range)
 {
-try (RefViewFragment view = 
selectAndReference(View.select(SSTableSet.CANONICAL)))
+try (RefViewFragment view = 
selectAndReference(View.selectFunction(SSTableSet.CANONICAL)))
 {
 long count = 0;
 for (SSTableReader sstable : view.sstables)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc23632f/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
--
diff --git a/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java 
b/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
index 3461aef..0b31b87 100644
--- a/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
+++ b/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
@@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.cassandra.db.lifecycle.SSTableIntervalTree;
 import org.apache.cassandra.db.lifecycle.SSTableSet;
 import org.apache.cassandra.db.lifecycle.View;
 import org.apache.cassandra.dht.Range;
@@ -103,8 +104,10 @@ public class SizeEstimatesRecorder extends 
MigrationListener implements Runnable
 {
 while (refs == null)
 {
-// note that this is not guaranteed to return all sstables 
within 

[37/50] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/cassandra-3.8
Commit: 56abaca0466411739895523d0c3a81a7630ab9f0
Parents: 371a147 5861cd8
Author: Aleksey Yeschenko 
Authored: Mon Jul 11 15:00:33 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Jul 11 15:01:04 2016 +0100

--
 CHANGES.txt| 7 +++
 src/java/org/apache/cassandra/thrift/ThriftServer.java | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/56abaca0/CHANGES.txt
--
diff --cc CHANGES.txt
index f65b1f4,70210a8..da8216f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,4 +1,9 @@@
 -3.0.9
 +3.9
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 +Merged from 3.0:
- 3.0.9
   * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
   * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
   * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)

[35/50] cassandra git commit: Synchronize ThriftServer::stop()

[aleksey]

Synchronize ThriftServer::stop()

patch by Brian Wawok; reviewed by Aleksey Yeschenko for CASSANDRA-12105


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

Branch: refs/heads/cassandra-3.8
Commit: 9a8406f2f7f03fb1794e6cb0b5585579cb93cc92
Parents: e983590
Author: Brian Wawok 
Authored: Mon Jul 11 14:52:20 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Jul 11 14:53:24 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a8406f2/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 9fef5a2..837c3fb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.8
+ * Synchronize ThriftServer::stop() (CASSANDRA-12105)
  * Use dedicated thread for JMX notifications (CASSANDRA-12146)
  * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143)
  * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a8406f2/src/java/org/apache/cassandra/thrift/ThriftServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/ThriftServer.java 
b/src/java/org/apache/cassandra/thrift/ThriftServer.java
index 2409606..44ec524 100644
--- a/src/java/org/apache/cassandra/thrift/ThriftServer.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftServer.java
@@ -60,7 +60,7 @@ public class ThriftServer implements CassandraDaemon.Server
 }
 }
 
-public void stop()
+public synchronized void stop()
 {
 if (server != null)
 {

[15/50] cassandra git commit: Improve streaming synchronization and fault tolerance

[aleksey]

Improve streaming synchronization and fault tolerance

Patch by Paulo Motta; Reviewed by yukim for CASSANDRA-11414


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

Branch: refs/heads/cassandra-3.8
Commit: 00e7ecf1394f8704e2f13369f7950e129459ce2c
Parents: 43c741e
Author: Paulo Motta 
Authored: Wed Jul 6 12:16:16 2016 -0500
Committer: Yuki Morishita 
Committed: Wed Jul 6 12:32:39 2016 -0500

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/streaming/ConnectionHandler.java| 8 +++-
 .../org/apache/cassandra/streaming/StreamReceiveTask.java| 2 --
 3 files changed, 4 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/00e7ecf1/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index bfd8aa2..7d62f97 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.8
+ * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
  * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
 Merged from 2.1:
  * Don't write shadowed range tombstone (CASSANDRA-12030)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/00e7ecf1/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
--
diff --git a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java 
b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
index c497a39..364435e 100644
--- a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
+++ b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
@@ -233,6 +233,9 @@ public class ConnectionHandler
 
 protected void signalCloseDone()
 {
+if (closeFuture == null)
+close();
+
 closeFuture.get().set(null);
 
 // We can now close the socket
@@ -294,11 +297,6 @@ public class ConnectionHandler
 }
 }
 }
-catch (SocketException e)
-{
-// socket is closed
-close();
-}
 catch (Throwable t)
 {
 JVMStabilityInspector.inspectThrowable(t);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/00e7ecf1/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
--
diff --git a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java 
b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
index 6911ec6..b342edc 100644
--- a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
+++ b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
@@ -18,8 +18,6 @@
 package org.apache.cassandra.streaming;
 
 import java.io.File;
-import java.io.IOError;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

[08/50] 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/73c71672
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73c71672
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73c71672

Branch: refs/heads/cassandra-3.8
Commit: 73c71672bdb48af976cd17909162ea2b3c0ce007
Parents: bc23632 d5a15e4
Author: Marcus Eriksson 
Authored: Wed Jul 6 10:11:21 2016 +0200
Committer: Marcus Eriksson 
Committed: Wed Jul 6 10:11:21 2016 +0200

--
 .../cassandra/db/compaction/DateTieredCompactionStrategyTest.java   | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/73c71672/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
--

[25/50] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/cassandra-3.8
Commit: 8475f891c7576e3816ac450178344a5232b72738
Parents: a006f57 a227cc6
Author: Yuki Morishita 
Authored: Thu Jul 7 11:00:37 2016 -0500
Committer: Yuki Morishita 
Committed: Thu Jul 7 11:00:37 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8475f891/CHANGES.txt
--
diff --cc CHANGES.txt
index 1d11149,0e483f1..34e7587
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,7 +1,10 @@@
 -3.0.9
 +3.9
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 +Merged from 3.0:
   * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
+ 2.2.8
+  * Use dedicated thread for JMX notifications (CASSANDRA-12146)
   * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
   * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
   * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)

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

[30/50] cassandra git commit: Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC

[aleksey]

Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC

patch by Stefania Alborghetti; reviewed by Jake Luciani for CASSANDRA-11950


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

Branch: refs/heads/cassandra-3.8
Commit: d20c765a7d962b55ce905f393589869dab63d996
Parents: 1417a51
Author: Stefania Alborghetti 
Authored: Fri Jul 8 10:26:47 2016 +0800
Committer: Stefania Alborghetti 
Committed: Mon Jul 11 10:57:27 2016 +0800

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/service/StorageProxy.java | 7 +--
 2 files changed, 2 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d20c765a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b094b00..9df49f3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.9
+ * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
  * Fix hdr logging for single operation workloads (CASSANDRA-12145)
  * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)
  * Increase size of flushExecutor thread pool (CASSANDRA-12071)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d20c765a/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java 
b/src/java/org/apache/cassandra/service/StorageProxy.java
index c88c449..3ce8013 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -1284,8 +1284,7 @@ public class StorageProxy implements StorageProxyMBean
 InetAddress target = iter.next();
 
 // Add the other destinations of the same message as a FORWARD_HEADER 
entry
-DataOutputBuffer out = null;
-try (DataOutputBuffer ignored = out = DataOutputBuffer.RECYCLER.get())
+try(DataOutputBuffer out = new DataOutputBuffer())
 {
 out.writeInt(targets.size() - 1);
 while (iter.hasNext())
@@ -1311,10 +1310,6 @@ public class StorageProxy implements StorageProxyMBean
 // DataOutputBuffer is in-memory, doesn't throw IOException
 throw new AssertionError(e);
 }
-finally
-{
-out.recycle();
-}
 }
 
 private static void performLocally(Stage stage, final Runnable runnable)

[31/50] cassandra git commit: Fix upgrading sparse tables that are incorrectly marked as dense

[aleksey]

Fix upgrading sparse tables that are incorrectly marked as dense

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-11315


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

Branch: refs/heads/cassandra-3.8
Commit: f37b6f145d3db2b14de38b2c75f390f7a3113c85
Parents: 2fa44cd
Author: Aleksey Yeschenko 
Authored: Wed Jun 29 23:15:45 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Jul 11 14:29:55 2016 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/schema/LegacySchemaMigrator.java  | 81 ++--
 2 files changed, 58 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f37b6f14/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 0e483f1..f2d11b9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.9
+ * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
  * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 2.2.8
  * Use dedicated thread for JMX notifications (CASSANDRA-12146)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f37b6f14/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
--
diff --git a/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java 
b/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
index 924bd7a..b6d8d2b 100644
--- a/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
+++ b/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
@@ -284,11 +284,26 @@ public final class LegacySchemaMigrator
 AbstractType subComparator = tableRow.has("subcomparator") ? 
TypeParser.parse(tableRow.getString("subcomparator")) : null;
 
 boolean isSuper = 
"super".equals(tableRow.getString("type").toLowerCase());
-boolean isDense = tableRow.has("is_dense")
-? tableRow.getBoolean("is_dense")
-: calculateIsDense(rawComparator, columnRows);
 boolean isCompound = rawComparator instanceof CompositeType;
 
+/*
+ * Determine whether or not the table is *really* dense
+ * We cannot trust is_dense value of true (see CASSANDRA-11502, that 
fixed the issue for 2.2 only, and not retroactively),
+ * but we can trust is_dense value of false.
+ */
+Boolean rawIsDense = tableRow.has("is_dense") ? 
tableRow.getBoolean("is_dense") : null;
+boolean isDense;
+if (rawIsDense != null && !rawIsDense)
+isDense = false;
+else
+isDense = calculateIsDense(rawComparator, columnRows);
+
+// now, if switched to sparse, remove redundant compact_value column 
and the last clustering column,
+// directly copying CASSANDRA-11502 logic. See CASSANDRA-11315.
+Iterable filteredColumnRows = !isDense && 
(rawIsDense == null || rawIsDense)
+  ? 
filterOutRedundantRowsForSparse(columnRows, isSuper, isCompound)
+  : columnRows;
+
 // We don't really use the default validator but as we have it for 
backward compatibility, we use it to know if it's a counter table
 AbstractType defaultValidator = 
TypeParser.parse(tableRow.getString("default_validator"));
 boolean isCounter = defaultValidator instanceof CounterColumnType;
@@ -311,9 +326,9 @@ public final class LegacySchemaMigrator
 // previous versions, they may not have the expected schema, so detect 
if we need to upgrade and do
 // it in createColumnsFromColumnRows.
 // We can remove this once we don't support upgrade from versions < 
3.0.
-boolean needsUpgrade = !isCQLTable && checkNeedsUpgrade(columnRows, 
isSuper, isStaticCompactTable);
+boolean needsUpgrade = !isCQLTable && 
checkNeedsUpgrade(filteredColumnRows, isSuper, isStaticCompactTable);
 
-List columnDefs = 
createColumnsFromColumnRows(columnRows,
+List columnDefs = 
createColumnsFromColumnRows(filteredColumnRows,
 ksName,
 cfName,
 
rawComparator,
@@ -323,7 +338,6 @@ public final class LegacySchemaMigrator
 

[19/50] cassandra git commit: Merge commit 'ef18a17' into cassandra-3.0

[aleksey]

Merge commit 'ef18a17' into cassandra-3.0

* commit 'ef18a17':
  NPE when trying to remove purgable tombstones from result


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

Branch: refs/heads/cassandra-3.8
Commit: 30f5d44d8cc53726fc9a17b6df4928ccd23af977
Parents: 778f2a4 ef18a17
Author: Sylvain Lebresne 
Authored: Thu Jul 7 12:50:03 2016 +0200
Committer: Sylvain Lebresne 
Committed: Thu Jul 7 12:50:03 2016 +0200

--

--

[20/50] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.9

* cassandra-3.0:
  NPE when trying to remove purgable tombstones from result


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

Branch: refs/heads/cassandra-3.8
Commit: 376dae26833591303cd3140001666f23aa216a11
Parents: 59ee46e 30f5d44
Author: Sylvain Lebresne 
Authored: Thu Jul 7 12:50:26 2016 +0200
Committer: Sylvain Lebresne 
Committed: Thu Jul 7 12:50:26 2016 +0200

--

--

[45/50] cassandra git commit: Fix paging logic for deleted partitions with static columns

[aleksey]

Fix paging logic for deleted partitions with static columns

patch by Sharvanath Pathak; reviewed by Benjamin Lerer for CASSANDRA-12107


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

Branch: refs/heads/cassandra-3.8
Commit: 84426d183ae095107bb264b92d828f231d0a9826
Parents: fbd287a
Author: Sharvanath Pathak 
Authored: Thu Jul 14 21:38:14 2016 +0200
Committer: Benjamin Lerer 
Committed: Thu Jul 14 21:38:14 2016 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/filter/DataLimits.java  |  3 +-
 .../validation/operations/SelectLimitTest.java  | 31 
 3 files changed, 33 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/84426d18/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 3829046..59f0a5f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.9
+ * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
  * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
  * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
  * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/84426d18/src/java/org/apache/cassandra/db/filter/DataLimits.java
--
diff --git a/src/java/org/apache/cassandra/db/filter/DataLimits.java 
b/src/java/org/apache/cassandra/db/filter/DataLimits.java
index f6fdcdd..94f43dc 100644
--- a/src/java/org/apache/cassandra/db/filter/DataLimits.java
+++ b/src/java/org/apache/cassandra/db/filter/DataLimits.java
@@ -360,8 +360,7 @@ public abstract class DataLimits
 public void applyToPartition(DecoratedKey partitionKey, Row 
staticRow)
 {
 rowInCurrentPartition = 0;
-if (!staticRow.isEmpty() && (assumeLiveData || 
staticRow.hasLiveData(nowInSec)))
-hasLiveStaticRow = true;
+hasLiveStaticRow = !staticRow.isEmpty() && (assumeLiveData || 
staticRow.hasLiveData(nowInSec));
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/cassandra/blob/84426d18/test/unit/org/apache/cassandra/cql3/validation/operations/SelectLimitTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectLimitTest.java
 
b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectLimitTest.java
index a21ef3c..aeb3d56 100644
--- 
a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectLimitTest.java
+++ 
b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectLimitTest.java
@@ -133,4 +133,35 @@ public class SelectLimitTest extends CQLTester
row(2, 2),
row(2, 3));
 }
+
+@Test
+public void testLimitWithDeletedRowsAndStaticColumns() throws Throwable
+{
+createTable("CREATE TABLE %s (pk int, c int, v int, s int static, 
PRIMARY KEY (pk, c))");
+
+execute("INSERT INTO %s (pk, c, v, s) VALUES (1, -1, 1, 1)");
+execute("INSERT INTO %s (pk, c, v, s) VALUES (2, -1, 1, 1)");
+execute("INSERT INTO %s (pk, c, v, s) VALUES (3, -1, 1, 1)");
+execute("INSERT INTO %s (pk, c, v, s) VALUES (4, -1, 1, 1)");
+execute("INSERT INTO %s (pk, c, v, s) VALUES (5, -1, 1, 1)");
+
+assertRows(execute("SELECT * FROM %s"),
+   row(1, -1, 1, 1),
+   row(2, -1, 1, 1),
+   row(3, -1, 1, 1),
+   row(4, -1, 1, 1),
+   row(5, -1, 1, 1));
+
+execute("DELETE FROM %s WHERE pk = 2");
+
+assertRows(execute("SELECT * FROM %s"),
+   row(1, -1, 1, 1),
+   row(3, -1, 1, 1),
+   row(4, -1, 1, 1),
+   row(5, -1, 1, 1));
+
+assertRows(execute("SELECT * FROM %s LIMIT 2"),
+   row(1, -1, 1, 1),
+   row(3, -1, 1, 1));
+}
 }

[04/50] cassandra git commit: Always select the live sstables when getting sstables in bounds

[aleksey]

Always select the live sstables when getting sstables in bounds

Patch by marcuse; reviewed by benedict for CASSANDRA-11944


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

Branch: refs/heads/cassandra-3.8
Commit: 5b0566a70f373d6eb537c89c0db2a2e224706916
Parents: 2217695
Author: Marcus Eriksson 
Authored: Thu Jun 2 09:37:06 2016 +0200
Committer: Marcus Eriksson 
Committed: Wed Jul 6 07:52:28 2016 +0200

--
 CHANGES.txt   |  1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java   |  8 
 .../apache/cassandra/db/PartitionRangeReadCommand.java|  2 +-
 .../org/apache/cassandra/db/SizeEstimatesRecorder.java|  5 +++--
 .../db/compaction/AbstractCompactionStrategy.java |  2 +-
 .../cassandra/db/compaction/CompactionController.java |  2 +-
 .../db/compaction/DateTieredCompactionStrategy.java   |  2 +-
 .../db/compaction/TimeWindowCompactionStrategy.java   |  2 +-
 src/java/org/apache/cassandra/db/lifecycle/View.java  | 10 +-
 .../org/apache/cassandra/streaming/StreamSession.java |  8 +++-
 test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java |  2 +-
 11 files changed, 26 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b0566a7/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 7f8a3a1..99ac3ad 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.9
+ * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
  * Fix column ordering of results with static columns for Thrift requests in
a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
those static columns in query results (CASSANDRA-12123)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b0566a7/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 3264327..1be3175 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1231,7 +1231,7 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
  * @return sstables whose key range overlaps with that of the given 
sstables, not including itself.
  * (The given sstables may or may not overlap with each other.)
  */
-public Collection getOverlappingSSTables(SSTableSet 
sstableSet, Iterable sstables)
+public Collection 
getOverlappingLiveSSTables(Iterable sstables)
 {
 logger.trace("Checking for sstables overlapping {}", sstables);
 
@@ -1282,7 +1282,7 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 Set results = new HashSet<>();
 
 for (AbstractBounds bound : bounds)
-Iterables.addAll(results, view.sstablesInBounds(sstableSet, 
bound.left, bound.right));
+Iterables.addAll(results, view.liveSSTablesInBounds(bound.left, 
bound.right));
 
 return Sets.difference(results, ImmutableSet.copyOf(sstables));
 }
@@ -1290,11 +1290,11 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 /**
  * like getOverlappingSSTables, but acquires references before returning
  */
-public Refs getAndReferenceOverlappingSSTables(SSTableSet 
sstableSet, Iterable sstables)
+public Refs 
getAndReferenceOverlappingLiveSSTables(Iterable sstables)
 {
 while (true)
 {
-Iterable overlapped = 
getOverlappingSSTables(sstableSet, sstables);
+Iterable overlapped = 
getOverlappingLiveSSTables(sstables);
 Refs refs = Refs.tryRef(overlapped);
 if (refs != null)
 return refs;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b0566a7/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
--
diff --git a/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java 
b/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
index 9585b59..842ad5f 100644
--- a/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
+++ b/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
@@ -175,7 +175,7 @@ public class PartitionRangeReadCommand extends ReadCommand
 
 protected UnfilteredPartitionIterator queryStorage(final ColumnFamilyStore 
cfs, 

[50/50] cassandra git commit: Netty 4.0.39-Final update post .37 fix

[aleksey]

Netty 4.0.39-Final update post .37 fix


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

Branch: refs/heads/cassandra-3.8
Commit: 2aa76632d61c60f1bc115289750fd594949ff98f
Parents: 136f6b1
Author: T Jake Luciani 
Authored: Mon Jul 18 10:46:17 2016 -0400
Committer: T Jake Luciani 
Committed: Mon Jul 18 10:53:22 2016 -0400

--
 CHANGES.txt |   3 +-
 build.xml   |   2 +-
 lib/licenses/netty-all-4.0.36.Final.txt | 202 ---
 lib/licenses/netty-all-4.0.39.Final.txt | 202 +++
 lib/netty-all-4.0.36.Final.jar  | Bin 2195921 -> 0 bytes
 lib/netty-all-4.0.39.Final.jar  | Bin 0 -> 2271610 bytes
 6 files changed, 205 insertions(+), 204 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2aa76632/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 4c46695..3307fb3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,4 @@
 3.9
- * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
  * Fix hdr logging for single operation workloads (CASSANDRA-12145)
  * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)
  * Increase size of flushExecutor thread pool (CASSANDRA-12071)
@@ -29,6 +28,8 @@ Merged from 2.1:
 
 
 3.8
+ * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
+ * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
  * Improve details in compaction log message (CASSANDRA-12080)
  * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
  * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2aa76632/build.xml
--
diff --git a/build.xml b/build.xml
index d151431..e13fdc0 100644
--- a/build.xml
+++ b/build.xml
@@ -426,7 +426,7 @@
   
   
   
-  
+  
   
   
   

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2aa76632/lib/licenses/netty-all-4.0.36.Final.txt
--
diff --git a/lib/licenses/netty-all-4.0.36.Final.txt 
b/lib/licenses/netty-all-4.0.36.Final.txt
deleted file mode 100644
index d645695..000
--- a/lib/licenses/netty-all-4.0.36.Final.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
-   Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-  "License" shall mean the terms and conditions for use, reproduction,
-  and distribution as defined by Sections 1 through 9 of this document.
-
-  "Licensor" shall mean the copyright owner or entity authorized by
-  the copyright owner that is granting the License.
-
-  "Legal Entity" shall mean the union of the acting entity and all
-  other entities that control, are controlled by, or are under common
-  control with that entity. For the purposes of this definition,
-  "control" means (i) the power, direct or indirect, to cause the
-  direction or management of such entity, whether by contract or
-  otherwise, or (ii) ownership of fifty percent (50%) or more of the
-  outstanding shares, or (iii) beneficial ownership of such entity.
-
-  "You" (or "Your") shall mean an individual or Legal Entity
-  exercising permissions granted by this License.
-
-  "Source" form shall mean the preferred form for making modifications,
-  including but not limited to software source code, documentation
-  source, and configuration files.
-
-  "Object" form shall mean any form resulting from mechanical
-  transformation or translation of a Source form, including but
-  not limited to compiled object code, generated documentation,
-  and conversions to other media types.
-
-  "Work" shall mean the work of authorship, whether in Source or
-  Object form, made available under the License, as indicated by a
-  copyright notice that is included in or attached to the work
-  (an example is provided in the Appendix below).
-
-  "Derivative Works" shall mean any work, whether in Source or Object
-  form, that is based on (or derived from) the Work and for which the
- 

[12/50] cassandra git commit: Range tombstones that are masked by row tombstones should not be written out

[aleksey]

Range tombstones that are masked by row tombstones should not be written out

patch by Nachiket Patil; reviewed by Sylvain Lebresne for CASSANDRA-12030


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

Branch: refs/heads/cassandra-3.8
Commit: 98f5f77bb3c5d50e52cbb6f577a463ca8a5134ad
Parents: 3c1653f
Author: Nachiket Patil 
Authored: Wed Jul 6 11:22:56 2016 +0200
Committer: Sylvain Lebresne 
Committed: Wed Jul 6 14:35:10 2016 +0200

--
 CHANGES.txt |  1 +
 .../db/compaction/LazilyCompactedRow.java   |  3 +-
 .../apache/cassandra/db/RangeTombstoneTest.java | 40 
 3 files changed, 43 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/98f5f77b/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b1dcbe1..7fa995d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.16
+ * Don't write shadowed range tombstone (CASSANDRA-12030)
  * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
  * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  * Improve digest calculation in the presence of overlapping tombstones 
(CASSANDRA-11349)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/98f5f77b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
--
diff --git 
a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java 
b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
index f912da2..dab5eeb 100644
--- a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
@@ -286,7 +286,8 @@ public class LazilyCompactedRow extends AbstractCompactedRow
 RangeTombstone t = tombstone;
 tombstone = null;
 
-if (t.data.isGcAble(controller.gcBefore) && t.timestamp() < 
getMaxPurgeableTimestamp())
+if (t.data.isGcAble(controller.gcBefore) && t.timestamp() < 
getMaxPurgeableTimestamp() ||
+maxRowTombstone.markedForDeleteAt >= t.timestamp())
 {
 indexBuilder.tombstoneTracker().update(t, true);
 return null;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/98f5f77b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java 
b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
index 3292422..dfd6960 100644
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
@@ -39,6 +39,7 @@ import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.config.IndexType;
 import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
 import org.apache.cassandra.db.compaction.CompactionManager;
+import org.apache.cassandra.db.compaction.LeveledCompactionStrategy;
 import org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy;
 import org.apache.cassandra.db.composites.CellName;
 import org.apache.cassandra.db.composites.CellNames;
@@ -543,6 +544,45 @@ public class RangeTombstoneTest extends SchemaLoader
 }
 
 @Test
+public void testCompactionOfRangeTombstonesCoveredByRowTombstone() throws 
Exception
+{
+long testTimeStamp = 1451606400L; // 01/01/2016 : 00:00:00 GMT
+Keyspace table = Keyspace.open(KSNAME);
+ColumnFamilyStore cfs = table.getColumnFamilyStore(CFNAME);
+ByteBuffer key = ByteBufferUtil.bytes("k4");
+
+// remove any existing sstables before starting
+cfs.truncateBlocking();
+cfs.disableAutoCompaction();
+
cfs.setCompactionStrategyClass(LeveledCompactionStrategy.class.getCanonicalName());
+
+Mutation rm = new Mutation(KSNAME, key);
+for (int i = 1; i < 11; i += 2, testTimeStamp += i * 10)
+add(rm, i, testTimeStamp);
+rm.apply();
+cfs.forceBlockingFlush();
+
+rm = new Mutation(KSNAME, key);
+ColumnFamily cf = rm.addOrGet(CFNAME);
+
+// Write the covering row tombstone
+cf.delete(new DeletionTime(++testTimeStamp, (int) testTimeStamp));
+
+// Create range tombstones covered by row tombstone above.
+for (int i = 1; i < 11; i += 2, testTimeStamp -= i * 5)
+

[38/50] cassandra git commit: Make GCInspector min log duration configurable

[aleksey]

Make GCInspector min log duration configurable

Patch by jjirsa; reviewed by jmckenzie for CASSANDRA-11715


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

Branch: refs/heads/cassandra-3.8
Commit: f0d1d75ebf10beff6d24323c03c57e29dcd38c15
Parents: 9a8406f
Author: Jeff Jirsa 
Authored: Mon Jul 11 16:27:04 2016 -0400
Committer: Josh McKenzie 
Committed: Mon Jul 11 16:27:04 2016 -0400

--
 conf/cassandra.yaml   |  7 ++-
 src/java/org/apache/cassandra/config/Config.java  |  1 +
 .../org/apache/cassandra/config/DatabaseDescriptor.java   | 10 ++
 src/java/org/apache/cassandra/service/GCInspector.java|  2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0d1d75e/conf/cassandra.yaml
--
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 35e94d2..4ad798a 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -858,9 +858,14 @@ inter_dc_tcp_nodelay: false
 tracetype_query_ttl: 86400
 tracetype_repair_ttl: 604800
 
+# By default, Cassandra logs GC Pauses greater than 200 ms at INFO level
+# This threshold can be adjusted to minimize logging if necessary
+# gc_log_threshold_in_ms: 200
+
 # GC Pauses greater than gc_warn_threshold_in_ms will be logged at WARN level
+# If unset, all GC Pauses greater than gc_log_threshold_in_ms will log at
+# INFO level
 # Adjust the threshold based on your application throughput requirement
-# By default, Cassandra logs GC Pauses greater than 200 ms at INFO level
 # gc_warn_threshold_in_ms: 1000
 
 # UDFs (user defined functions) are disabled by default.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0d1d75e/src/java/org/apache/cassandra/config/Config.java
--
diff --git a/src/java/org/apache/cassandra/config/Config.java 
b/src/java/org/apache/cassandra/config/Config.java
index 9736a03..ede4560 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -254,6 +254,7 @@ public class Config
 public volatile Long index_summary_capacity_in_mb;
 public volatile int index_summary_resize_interval_in_minutes = 60;
 
+public int gc_log_threshold_in_ms = 200;
 public int gc_warn_threshold_in_ms = 0;
 
 private static final CsvPreference STANDARD_SURROUNDING_SPACES_NEED_QUOTES 
= new CsvPreference.Builder(CsvPreference.STANDARD_PREFERENCE)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0d1d75e/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index d3a5028..f1acfc4 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -366,6 +366,11 @@ public class DatabaseDescriptor
 }
 paritionerName = partitioner.getClass().getCanonicalName();
 
+if (config.gc_log_threshold_in_ms < 0)
+{
+throw new ConfigurationException("gc_log_threshold_in_ms must be a 
positive integer");
+}
+
 if (conf.gc_warn_threshold_in_ms < 0)
 {
 throw new ConfigurationException("gc_warn_threshold_in_ms must be 
a positive integer");
@@ -1801,6 +1806,11 @@ public class DatabaseDescriptor
 return conf.windows_timer_interval;
 }
 
+public static long getGCLogThreshold()
+{
+return conf.gc_log_threshold_in_ms;
+}
+
 public static long getGCWarnThreshold()
 {
 return conf.gc_warn_threshold_in_ms;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0d1d75e/src/java/org/apache/cassandra/service/GCInspector.java
--
diff --git a/src/java/org/apache/cassandra/service/GCInspector.java 
b/src/java/org/apache/cassandra/service/GCInspector.java
index de5acc0..31de151 100644
--- a/src/java/org/apache/cassandra/service/GCInspector.java
+++ b/src/java/org/apache/cassandra/service/GCInspector.java
@@ -48,7 +48,7 @@ public class GCInspector implements NotificationListener, 
GCInspectorMXBean
 {
 public static final String MBEAN_NAME = 
"org.apache.cassandra.service:type=GCInspector";
 private static final Logger logger = 
LoggerFactory.getLogger(GCInspector.class);
-final 

[14/50] cassandra git commit: Merge commit '43c741e251102bf5651ff8aa1b5ca078eb0ddc0b' into cassandra-3.0

[aleksey]

Merge commit '43c741e251102bf5651ff8aa1b5ca078eb0ddc0b' into cassandra-3.0

* commit '43c741e251102bf5651ff8aa1b5ca078eb0ddc0b':
  Range tombstones that are masked by row tombstones should not be written out


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

Branch: refs/heads/cassandra-3.8
Commit: 9ed3b42d3b50237f99485233857a7b34d5238d9a
Parents: dd05e46 43c741e
Author: Sylvain Lebresne 
Authored: Wed Jul 6 14:39:52 2016 +0200
Committer: Sylvain Lebresne 
Committed: Wed Jul 6 14:39:52 2016 +0200

--

--

[34/50] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/cassandra-3.8
Commit: 371a147945feeaea9d39a714d59847eed1b3dc22
Parents: 314f60a 4d7141f
Author: Aleksey Yeschenko 
Authored: Mon Jul 11 14:37:10 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Jul 11 14:37:10 2016 +0100

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/db/CompactTables.java | 7 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/371a1479/CHANGES.txt
--
diff --cc CHANGES.txt
index 44fe26c,4241da8..f65b1f4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.9
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 +Merged from 3.0:
  3.0.9
+  * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
   * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
   * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
  2.2.8

http://git-wip-us.apache.org/repos/asf/cassandra/blob/371a1479/src/java/org/apache/cassandra/db/CompactTables.java
--

[22/50] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.9

* cassandra-3.0:
  Don't ignore deletion info in sstable on reverse queries


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

Branch: refs/heads/cassandra-3.8
Commit: a006f577bdba7c4b248ef9f4cbd02a6c35a03162
Parents: 376dae2 76e68e9
Author: Sylvain Lebresne 
Authored: Thu Jul 7 12:59:34 2016 +0200
Committer: Sylvain Lebresne 
Committed: Thu Jul 7 12:59:34 2016 +0200

--
 CHANGES.txt |  1 +
 .../columniterator/SSTableReversedIterator.java |  2 +-
 .../cql3/validation/operations/DeleteTest.java  | 26 
 3 files changed, 28 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a006f577/CHANGES.txt
--
diff --cc CHANGES.txt
index d459e34,20ed6e0..1d11149
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.9
 +3.9
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 +Merged from 3.0:
+  * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
   * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
   * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
   * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a006f577/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a006f577/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
--
diff --cc 
test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
index 9ead942,814e822..9b92ebb
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
@@@ -1105,4 -1051,36 +1105,30 @@@ public class DeleteTest extends CQLTest
  compact();
  assertRows(execute("SELECT * FROM %s"), row(0, null));
  }
+ 
 -private void flush(boolean forceFlush)
 -{
 -if (forceFlush)
 -flush();
 -}
 -
+ @Test
+ public void testDeleteAndReverseQueries() throws Throwable
+ {
+ // This test insert rows in one sstable and a range tombstone 
covering some of those rows in another, and it
+ // validates we correctly get only the non-removed rows when doing 
reverse queries.
+ 
+ createTable("CREATE TABLE %s (k text, i int, PRIMARY KEY (k, i))");
+ 
+ for (int i = 0; i < 10; i++)
+ execute("INSERT INTO %s(k, i) values (?, ?)", "a", i);
+ 
+ flush();
+ 
+ execute("DELETE FROM %s WHERE k = ? AND i >= ? AND i <= ?", "a", 2, 
7);
+ 
+ assertRows(execute("SELECT i FROM %s WHERE k = ? ORDER BY i DESC", 
"a"),
+ row(9), row(8), row(1), row(0)
+ );
+ 
+ flush();
+ 
+ assertRows(execute("SELECT i FROM %s WHERE k = ? ORDER BY i DESC", 
"a"),
+ row(9), row(8), row(1), row(0)
+ );
+ }
  }

[13/50] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2

* cassandra-2.1:
  Range tombstones that are masked by row tombstones should not be written out


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

Branch: refs/heads/cassandra-3.8
Commit: 43c741e251102bf5651ff8aa1b5ca078eb0ddc0b
Parents: d5a15e4 98f5f77
Author: Sylvain Lebresne 
Authored: Wed Jul 6 14:39:13 2016 +0200
Committer: Sylvain Lebresne 
Committed: Wed Jul 6 14:39:13 2016 +0200

--
 CHANGES.txt |  1 +
 .../db/compaction/LazilyCompactedRow.java   |  3 +-
 .../apache/cassandra/db/RangeTombstoneTest.java | 40 
 3 files changed, 43 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/43c741e2/CHANGES.txt
--
diff --cc CHANGES.txt
index 65c7c1f,7fa995d..bfd8aa2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,43 -1,11 +1,44 @@@
 -2.1.16
 +2.2.8
 + * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
 +Merged from 2.1:
+  * Don't write shadowed range tombstone (CASSANDRA-12030)
 - * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
   * Improve digest calculation in the presence of overlapping tombstones 
(CASSANDRA-11349)
 -
 -2.1.15
 + * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
   * Account for partition deletions in tombstone histogram (CASSANDRA-12112)
 +
 +
 +2.2.7
 + * Allow nodetool info to run with readonly JMX access (CASSANDRA-11755)
 + * Validate bloom_filter_fp_chance against lowest supported
 +   value when the table is created (CASSANDRA-11920)
 + * RandomAccessReader: call isEOF() only when rebuffering, not for every read 
operation (CASSANDRA-12013)
 + * Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038)
 + * StorageService shutdown hook should use a volatile variable 
(CASSANDRA-11984)
 + * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
 + * Run CommitLog tests with different compression settings (CASSANDRA-9039)
 + * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
 + * Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
 + * Fix possible race condition in CommitLog.recover (CASSANDRA-11743)
 + * Enable client encryption in sstableloader with cli options 
(CASSANDRA-11708)
 + * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
 + * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
 + * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
 + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
 + * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
 + * Produce a heap dump when exiting on OOM (CASSANDRA-9861)
 + * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427)
 + * Restore ability to filter on clustering columns when using a 2i 
(CASSANDRA-11510)
 + * JSON datetime formatting needs timezone (CASSANDRA-11137)
 + * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502)
 + * Remove unnescessary file existence check during anticompaction 
(CASSANDRA-11660)
 + * Add missing files to debian packages (CASSANDRA-11642)
 + * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
 + * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
 +   report errors correctly if workers processes crash on initialization 
(CASSANDRA-11474)
 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 + * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988)
 +Merged from 2.1:
   * Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
   * Remove finished incoming streaming connections from MessagingService 
(CASSANDRA-11854)
   * Don't try to get sstables for non-repairing column families 
(CASSANDRA-12077)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/43c741e2/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/43c741e2/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
--
diff --cc 

[47/50] cassandra git commit: Ninja: add assertions for missing partition keys when loading table

[aleksey]

Ninja: add assertions for missing partition keys when loading table

Done to help debug test failures like CASSANDRA-12213


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

Branch: refs/heads/cassandra-3.8
Commit: b0ab12f4d52f78d30bb514d7a5ebb49c34a399b4
Parents: 2764e85
Author: Tyler Hobbs 
Authored: Fri Jul 15 12:35:59 2016 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 15 12:35:59 2016 -0500

--
 src/java/org/apache/cassandra/config/CFMetaData.java | 3 +++
 src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 6 ++
 2 files changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0ab12f4/src/java/org/apache/cassandra/config/CFMetaData.java
--
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java 
b/src/java/org/apache/cassandra/config/CFMetaData.java
index 4708033..4de4f7b 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -286,6 +286,9 @@ public final class CFMetaData
 // A compact table should always have a clustering
 assert isCQLTable() || !clusteringColumns.isEmpty() : 
String.format("For table %s.%s, isDense=%b, isCompound=%b, clustering=%s", 
ksName, cfName, isDense, isCompound, clusteringColumns);
 
+// All tables should have a partition key
+assert !partitionKeyColumns.isEmpty() : String.format("Have no 
partition keys for table %s.%s", ksName, cfName);
+
 this.partitionKeyColumns = partitionKeyColumns;
 this.clusteringColumns = clusteringColumns;
 this.partitionColumns = partitionColumns;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0ab12f4/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
--
diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java 
b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index dd0bb46..8e3961e 100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@ -951,6 +951,12 @@ public final class SchemaKeyspace
 boolean isCompound = flags.contains(CFMetaData.Flag.COMPOUND);
 
 List columns = fetchColumns(keyspaceName, tableName, 
types);
+if (!columns.stream().anyMatch(ColumnDefinition::isPartitionKey))
+{
+String msg = String.format("Table %s.%s did not have any partition 
key columns in the schema tables", keyspaceName, tableName);
+throw new AssertionError(msg);
+}
+
 Map droppedColumns = 
fetchDroppedColumns(keyspaceName, tableName);
 Indexes indexes = fetchIndexes(keyspaceName, tableName);
 Triggers triggers = fetchTriggers(keyspaceName, tableName);

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

Branch: refs/heads/cassandra-3.8
Commit: e99ee19950e764ca55331d7c814e965bef359a4f
Parents: 5861cd8 f0d1d75
Author: Josh McKenzie 
Authored: Mon Jul 11 16:28:13 2016 -0400
Committer: Josh McKenzie 
Committed: Mon Jul 11 16:28:22 2016 -0400

--
 conf/cassandra.yaml   |  7 ++-
 src/java/org/apache/cassandra/config/Config.java  |  1 +
 .../org/apache/cassandra/config/DatabaseDescriptor.java   | 10 ++
 src/java/org/apache/cassandra/service/GCInspector.java|  2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e99ee199/conf/cassandra.yaml
--
diff --cc conf/cassandra.yaml
index 4b92f64,4ad798a..09d2094
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@@ -924,21 -858,23 +924,26 @@@ inter_dc_tcp_nodelay: fals
  tracetype_query_ttl: 86400
  tracetype_repair_ttl: 604800
  
+ # By default, Cassandra logs GC Pauses greater than 200 ms at INFO level
+ # This threshold can be adjusted to minimize logging if necessary
+ # gc_log_threshold_in_ms: 200
+ 
  # GC Pauses greater than gc_warn_threshold_in_ms will be logged at WARN level
+ # If unset, all GC Pauses greater than gc_log_threshold_in_ms will log at
+ # INFO level
  # Adjust the threshold based on your application throughput requirement
- # By default, Cassandra logs GC Pauses greater than 200 ms at INFO level
 -# gc_warn_threshold_in_ms: 1000
 +gc_warn_threshold_in_ms: 1000
  
  # UDFs (user defined functions) are disabled by default.
 -# As of Cassandra 2.2, there is no security manager or anything else in place 
that
 -# prevents execution of evil code. CASSANDRA-9402 will fix this issue for 
Cassandra 3.0.
 -# This will inherently be backwards-incompatible with any 2.2 UDF that 
perform insecure
 -# operations such as opening a socket or writing to the filesystem.
 +# As of Cassandra 3.0 there is a sandbox in place that should prevent 
execution of evil code.
  enable_user_defined_functions: false
  
 +# Enables scripted UDFs (JavaScript UDFs).
 +# Java UDFs are always enabled, if enable_user_defined_functions is true.
 +# Enable this option to be able to use UDFs with "language javascript" or any 
custom JSR-223 provider.
 +# This option has no effect, if enable_user_defined_functions is false.
 +enable_scripted_user_defined_functions: false
 +
  # The default Windows kernel timer and scheduling resolution is 15.6ms for 
power conservation.
  # Lowering this value on Windows can provide much tighter latency and better 
throughput, however
  # some virtualized environments may see a negative performance impact from 
changing this setting

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e99ee199/src/java/org/apache/cassandra/config/Config.java
--
diff --cc src/java/org/apache/cassandra/config/Config.java
index b49e14c,ede4560..2bd23b5
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -265,8 -254,12 +265,9 @@@ public class Confi
  public volatile Long index_summary_capacity_in_mb;
  public volatile int index_summary_resize_interval_in_minutes = 60;
  
+ public int gc_log_threshold_in_ms = 200;
  public int gc_warn_threshold_in_ms = 0;
  
 -private static final CsvPreference 
STANDARD_SURROUNDING_SPACES_NEED_QUOTES = new 
CsvPreference.Builder(CsvPreference.STANDARD_PREFERENCE)
 -  
.surroundingSpacesNeedQuotes(true).build();
 -
  // TTL for different types of trace events.
  public int tracetype_query_ttl = (int) TimeUnit.DAYS.toSeconds(1);
  public int tracetype_repair_ttl = (int) TimeUnit.DAYS.toSeconds(7);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e99ee199/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 2083e42f,f1acfc4..100bcf4
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -1934,51 -1801,16 +1939,56 @@@ public class DatabaseDescripto
  return conf.enable_user_defined_functions;
  }
  
 -public static int getWindowsTimerInterval()
 +

[21/50] cassandra git commit: Don't ignore deletion info in sstable on reverse queries

[aleksey]

Don't ignore deletion info in sstable on reverse queries

patch by Sylvain Lebresne; reviewed by Aleksey Yeschenko for CASSANDRA-11733


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

Branch: refs/heads/cassandra-3.8
Commit: 76e68e9b49b1fbcb601633e6e2b8d8e1f71c7402
Parents: 30f5d44
Author: Sylvain Lebresne 
Authored: Thu Jun 30 15:13:24 2016 +0200
Committer: Sylvain Lebresne 
Committed: Thu Jul 7 12:54:52 2016 +0200

--
 CHANGES.txt |  1 +
 .../columniterator/SSTableReversedIterator.java |  2 +-
 .../cql3/validation/operations/DeleteTest.java  | 26 
 3 files changed, 28 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/76e68e9b/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 8118de1..20ed6e0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.9
+ * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
  * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
  * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
  * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/76e68e9b/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
--
diff --git 
a/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java 
b/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
index 14cec36..3e49a3a 100644
--- 
a/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
+++ 
b/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
@@ -356,7 +356,7 @@ public class SSTableReversedIterator extends 
AbstractSSTableIterator
 {
 deletionInfo = deletionBuilder.build();
 built = new ImmutableBTreePartition(metadata, partitionKey, 
columns, Rows.EMPTY_STATIC_ROW, rowBuilder.build(),
-DeletionInfo.LIVE, 
EncodingStats.NO_STATS);
+deletionInfo, 
EncodingStats.NO_STATS);
 deletionBuilder = null;
 }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/76e68e9b/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java 
b/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
index 76351ee..814e822 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
@@ -1057,4 +1057,30 @@ public class DeleteTest extends CQLTester
 if (forceFlush)
 flush();
 }
+
+@Test
+public void testDeleteAndReverseQueries() throws Throwable
+{
+// This test insert rows in one sstable and a range tombstone covering 
some of those rows in another, and it
+// validates we correctly get only the non-removed rows when doing 
reverse queries.
+
+createTable("CREATE TABLE %s (k text, i int, PRIMARY KEY (k, i))");
+
+for (int i = 0; i < 10; i++)
+execute("INSERT INTO %s(k, i) values (?, ?)", "a", i);
+
+flush();
+
+execute("DELETE FROM %s WHERE k = ? AND i >= ? AND i <= ?", "a", 2, 7);
+
+assertRows(execute("SELECT i FROM %s WHERE k = ? ORDER BY i DESC", 
"a"),
+row(9), row(8), row(1), row(0)
+);
+
+flush();
+
+assertRows(execute("SELECT i FROM %s WHERE k = ? ORDER BY i DESC", 
"a"),
+row(9), row(8), row(1), row(0)
+);
+}
 }

[33/50] cassandra git commit: Fix migration of static thrift column names with non-text comparators

[aleksey]

Fix migration of static thrift column names with non-text comparators

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-12147


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

Branch: refs/heads/cassandra-3.8
Commit: 4d7141f75866939b8a55a0d3ee09153ee75f80f9
Parents: f37b6f1
Author: Aleksey Yeschenko 
Authored: Wed Jul 6 17:56:51 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Jul 11 14:36:24 2016 +0100

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/db/CompactTables.java | 7 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d7141f7/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index f2d11b9..4241da8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.9
+ * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
  * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
  * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 2.2.8

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d7141f7/src/java/org/apache/cassandra/db/CompactTables.java
--
diff --git a/src/java/org/apache/cassandra/db/CompactTables.java 
b/src/java/org/apache/cassandra/db/CompactTables.java
index a73b865..e31fda3 100644
--- a/src/java/org/apache/cassandra/db/CompactTables.java
+++ b/src/java/org/apache/cassandra/db/CompactTables.java
@@ -93,13 +93,10 @@ public abstract class CompactTables
 
 public static AbstractType columnDefinitionComparator(String kind, 
boolean isSuper, AbstractType rawComparator, AbstractType 
rawSubComparator)
 {
-if ("compact_value".equals(kind))
+if (!"regular".equals(kind))
 return UTF8Type.instance;
 
-if (isSuper)
-return "regular".equals(kind) ? rawSubComparator : 
UTF8Type.instance;
-
-return "static".equals(kind) ? rawComparator : UTF8Type.instance;
+return isSuper ? rawSubComparator : rawComparator;
 }
 
 public static boolean hasEmptyCompactValue(CFMetaData metadata)

[46/50] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.9

[aleksey]

Merge branch cassandra-3.0 into cassandra-3.9


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

Branch: refs/heads/cassandra-3.8
Commit: 2764e85a557c140f44ffc08c09e4b06a61e1ef4e
Parents: 90afc58 84426d1
Author: Benjamin Lerer 
Authored: Thu Jul 14 21:44:34 2016 +0200
Committer: Benjamin Lerer 
Committed: Thu Jul 14 21:44:34 2016 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/filter/DataLimits.java  |  3 +-
 .../validation/operations/SelectLimitTest.java  | 32 +++-
 3 files changed, 33 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2764e85a/CHANGES.txt
--
diff --cc CHANGES.txt
index ba8e299,59f0a5f..4c46695
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 -3.0.9
 +3.9
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 +Merged from 3.0:
+  * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
   * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
   * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
   * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2764e85a/src/java/org/apache/cassandra/db/filter/DataLimits.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2764e85a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectLimitTest.java
--
diff --cc 
test/unit/org/apache/cassandra/cql3/validation/operations/SelectLimitTest.java
index 528d9f6,aeb3d56..21c48dd
--- 
a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectLimitTest.java
+++ 
b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectLimitTest.java
@@@ -26,7 -26,7 +26,6 @@@ import org.junit.Test
  import org.apache.cassandra.config.DatabaseDescriptor;
  import org.apache.cassandra.cql3.CQLTester;
  import org.apache.cassandra.dht.ByteOrderedPartitioner;
--import org.apache.cassandra.exceptions.InvalidRequestException;
  
  public class SelectLimitTest extends CQLTester
  {
@@@ -135,114 -135,33 +134,145 @@@
  }
  
  @Test
 +public void testPerPartitionLimit() throws Throwable
 +{
 +perPartitionLimitTest(false);
 +}
 +
 +@Test
 +public void testPerPartitionLimitWithCompactStorage() throws Throwable
 +{
 +perPartitionLimitTest(true);
 +}
 +
 +private void perPartitionLimitTest(boolean withCompactStorage) throws 
Throwable
 +{
 +String query = "CREATE TABLE %s (a int, b int, c int, PRIMARY KEY (a, 
b))";
 +
 +if (withCompactStorage)
 +createTable(query + " WITH COMPACT STORAGE");
 +else
 +createTable(query);
 +
 +for (int i = 0; i < 5; i++)
 +{
 +for (int j = 0; j < 5; j++)
 +{
 +execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", i, j, j);
 +}
 +}
 +
 +assertInvalidMessage("LIMIT must be strictly positive",
 + "SELECT * FROM %s PER PARTITION LIMIT ?", 0);
 +assertInvalidMessage("LIMIT must be strictly positive",
 + "SELECT * FROM %s PER PARTITION LIMIT ?", -1);
 +
 +assertRowsIgnoringOrder(execute("SELECT * FROM %s PER PARTITION LIMIT 
?", 2),
 +row(0, 0, 0),
 +row(0, 1, 1),
 +row(1, 0, 0),
 +row(1, 1, 1),
 +row(2, 0, 0),
 +row(2, 1, 1),
 +row(3, 0, 0),
 +row(3, 1, 1),
 +row(4, 0, 0),
 +row(4, 1, 1));
 +
 +// Combined Per Partition and "global" limit
 +assertRowCount(execute("SELECT * FROM %s PER PARTITION LIMIT ? LIMIT 
?", 2, 6),
 +   6);
 +
 +// odd amount of results
 +assertRowCount(execute("SELECT * 

[28/50] 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/2fa44cd8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fa44cd8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fa44cd8

Branch: refs/heads/cassandra-3.8
Commit: 2fa44cd88119c24489836e0c0c91fd3eed86ce3c
Parents: a227cc6 e983590
Author: Yuki Morishita 
Authored: Fri Jul 8 19:05:46 2016 -0500
Committer: Yuki Morishita 
Committed: Fri Jul 8 19:05:46 2016 -0500

--
 src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[42/50] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.9

[aleksey]

Merge branch cassandra-3.0 into cassandra-3.9


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

Branch: refs/heads/cassandra-3.8
Commit: fb4eb5ac1898bb47fb0d3f5d608bee92df2c4256
Parents: 76188e9 fbd287a
Author: Benjamin Lerer 
Authored: Thu Jul 14 11:37:20 2016 +0200
Committer: Benjamin Lerer 
Committed: Thu Jul 14 11:37:20 2016 +0200

--
 CHANGES.txt |  5 ++
 .../cassandra/config/DatabaseDescriptor.java|  1 +
 .../cassandra/db/PartitionRangeReadCommand.java |  7 +--
 .../org/apache/cassandra/db/ReadCommand.java| 65 ++--
 .../org/apache/cassandra/db/ReadResponse.java   | 43 +
 .../db/SinglePartitionReadCommand.java  |  2 +-
 .../io/ForwardingVersionedSerializer.java   | 57 +
 .../apache/cassandra/net/MessagingService.java  |  6 +-
 8 files changed, 117 insertions(+), 69 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb4eb5ac/CHANGES.txt
--
diff --cc CHANGES.txt
index da8216f,3829046..bedba6d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,14 @@@
++<<< HEAD
 +3.9
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 +Merged from 3.0:
++===
+ 3.0.9
+  * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
++>>> asf/cassandra-3.0
   * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
   * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
   * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb4eb5ac/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb4eb5ac/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb4eb5ac/src/java/org/apache/cassandra/db/ReadCommand.java
--
diff --cc src/java/org/apache/cassandra/db/ReadCommand.java
index c842814,36969f8..68c9e3b
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@@ -56,14 -54,44 +57,44 @@@ import org.apache.cassandra.utils.Pair
   * 
   * This contains all the informations needed to do a local read.
   */
 -public abstract class ReadCommand implements ReadQuery
 +public abstract class ReadCommand extends MonitorableImpl implements ReadQuery
  {
 +private static final int TEST_ITERATION_DELAY_MILLIS = 
Integer.valueOf(System.getProperty("cassandra.test.read_iteration_delay_ms", 
"0"));
  protected static final Logger logger = 
LoggerFactory.getLogger(ReadCommand.class);
 -
  public static final IVersionedSerializer serializer = new 
Serializer();
+ 
+ // For READ verb: will either dispatch on 'serializer' for 3.0 or 
'legacyReadCommandSerializer' for earlier version.
+ // Can be removed (and replaced by 'serializer') once we drop pre-3.0 
backward compatibility.
+ public static final IVersionedSerializer readSerializer = 
new ForwardingVersionedSerializer()
+ {
+ protected IVersionedSerializer delegate(int version)
+ {
+ return version < MessagingService.VERSION_30
+ ? legacyReadCommandSerializer : serializer;
+ }
+ };
+ 
  // For RANGE_SLICE verb: will either dispatch on 'serializer' for 3.0 or 
'legacyRangeSliceCommandSerializer' for earlier version.
  // Can be removed (and replaced by 'serializer') once we drop pre-3.0 
backward compatibility.
- public static final IVersionedSerializer 
rangeSliceSerializer = new RangeSliceSerializer();
+ public static final IVersionedSerializer 
rangeSliceSerializer = new ForwardingVersionedSerializer()
+ {
+ protected IVersionedSerializer delegate(int version)
+ {
+ return version < MessagingService.VERSION_30
+ ? legacyRangeSliceCommandSerializer : serializer;
+ }
+ };
+ 
+ // For PAGED_RANGE verb: will 

[49/50] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/cassandra-3.8
Commit: 136f6b1c740184da6377ffc3afc9d3f03ba1a14e
Parents: b0ab12f 557c596
Author: Tyler Hobbs 
Authored: Fri Jul 15 17:56:32 2016 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 15 17:56:32 2016 -0500

--
 src/java/org/apache/cassandra/db/ReadResponse.java | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/136f6b1c/src/java/org/apache/cassandra/db/ReadResponse.java
--
diff --cc src/java/org/apache/cassandra/db/ReadResponse.java
index 140652d,2304cb4..05ebd00
--- a/src/java/org/apache/cassandra/db/ReadResponse.java
+++ b/src/java/org/apache/cassandra/db/ReadResponse.java
@@@ -282,12 -282,17 +282,17 @@@ public abstract class ReadRespons
  
  // Pre-3.0, we didn't have a way to express exclusivity 
for non-composite comparators, so all slices were
  // inclusive on both ends. If we have exclusive slice 
ends, we need to filter the results here.
+ UnfilteredRowIterator iterator;
  if (!command.metadata().isCompound())
- return ThriftResultsMerger.maybeWrap(
- 
partition.unfilteredIterator(command.columnFilter(), 
filter.getSlices(command.metadata()), filter.isReversed()), command.nowInSec());
- 
- return ThriftResultsMerger.maybeWrap(
- 
partition.unfilteredIterator(command.columnFilter(), Slices.ALL, 
filter.isReversed()), command.nowInSec());
 -iterator = 
filter.filter(partition.sliceableUnfilteredIterator(command.columnFilter(), 
filter.isReversed()));
++iterator = 
partition.unfilteredIterator(command.columnFilter(), 
filter.getSlices(command.metadata()), filter.isReversed());
+ else
+ iterator = 
partition.unfilteredIterator(command.columnFilter(), Slices.ALL, 
filter.isReversed());
+ 
+ // Wrap results with a ThriftResultMerger only if they're 
intended for the thrift command.
+ if (command.isForThrift())
+ return ThriftResultsMerger.maybeWrap(iterator, 
command.nowInSec());
+ else
+ return iterator;
  }
  };
  }

[43/50] cassandra git commit: Fix CHANGES.txt

[aleksey]

Fix CHANGES.txt


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

Branch: refs/heads/cassandra-3.8
Commit: e3f9b7a3b6ec5df1c65bd6324d2c312209183cf8
Parents: fb4eb5a
Author: Benjamin Lerer 
Authored: Thu Jul 14 11:46:14 2016 +0200
Committer: Benjamin Lerer 
Committed: Thu Jul 14 11:46:14 2016 +0200

--
 CHANGES.txt | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3f9b7a3/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index bedba6d..ba8e299 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,14 +1,10 @@
-<<< HEAD
 3.9
  * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
  * Fix hdr logging for single operation workloads (CASSANDRA-12145)
  * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)
  * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 Merged from 3.0:
-===
-3.0.9
  * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
->>> asf/cassandra-3.0
  * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
  * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
  * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)

[48/50] cassandra git commit: Avoid wrapping results with ThriftResultsMerger if command is not for thrift

[aleksey]

Avoid wrapping results with ThriftResultsMerger if command is not for thrift

Patch by Alex Petrov; reviewed by Tyler Hobbs for CASSANDRA-12193.


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

Branch: refs/heads/cassandra-3.8
Commit: 557c59607fa9eb2014a7905cfc0eb3dbcd043cab
Parents: 84426d1
Author: Alex Petrov 
Authored: Fri Jul 15 17:49:16 2016 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 15 17:49:16 2016 -0500

--
 src/java/org/apache/cassandra/db/ReadResponse.java | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/557c5960/src/java/org/apache/cassandra/db/ReadResponse.java
--
diff --git a/src/java/org/apache/cassandra/db/ReadResponse.java 
b/src/java/org/apache/cassandra/db/ReadResponse.java
index 12a200f..2304cb4 100644
--- a/src/java/org/apache/cassandra/db/ReadResponse.java
+++ b/src/java/org/apache/cassandra/db/ReadResponse.java
@@ -282,12 +282,17 @@ public abstract class ReadResponse
 
 // Pre-3.0, we didn't have a way to express exclusivity 
for non-composite comparators, so all slices were
 // inclusive on both ends. If we have exclusive slice 
ends, we need to filter the results here.
+UnfilteredRowIterator iterator;
 if (!command.metadata().isCompound())
-return ThriftResultsMerger.maybeWrap(
-
filter.filter(partition.sliceableUnfilteredIterator(command.columnFilter(), 
filter.isReversed())), command.nowInSec());
-
-return ThriftResultsMerger.maybeWrap(
-
partition.unfilteredIterator(command.columnFilter(), Slices.ALL, 
filter.isReversed()), command.nowInSec());
+iterator = 
filter.filter(partition.sliceableUnfilteredIterator(command.columnFilter(), 
filter.isReversed()));
+else
+iterator = 
partition.unfilteredIterator(command.columnFilter(), Slices.ALL, 
filter.isReversed());
+
+// Wrap results with a ThriftResultMerger only if they're 
intended for the thrift command.
+if (command.isForThrift())
+return ThriftResultsMerger.maybeWrap(iterator, 
command.nowInSec());
+else
+return iterator;
 }
 };
 }

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

Branch: refs/heads/cassandra-3.8
Commit: a227cc61c501ff81d5dfeba3f6f9c2f214d19c30
Parents: 76e68e9 f28409b
Author: Yuki Morishita 
Authored: Thu Jul 7 11:00:31 2016 -0500
Committer: Yuki Morishita 
Committed: Thu Jul 7 11:00:31 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a227cc61/CHANGES.txt
--
diff --cc CHANGES.txt
index 20ed6e0,9fef5a2..0e483f1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,16 +1,30 @@@
 +3.0.9
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
+ 2.2.8
+  * Use dedicated thread for JMX notifications (CASSANDRA-12146)
 - * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143)
   * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
   * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
  Merged from 2.1:
 - * Don't write shadowed range tombstone (CASSANDRA-12030)
 - * Improve digest calculation in the presence of overlapping tombstones 
(CASSANDRA-11349)
   * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
 - * Account for partition deletions in tombstone histogram (CASSANDRA-12112)
  
  
 -2.2.7
 +3.0.8
 + * Fix potential race in schema during new table creation (CASSANDRA-12083)
 + * cqlsh: fix error handling in rare COPY FROM failure scenario 
(CASSANDRA-12070)
 + * Disable autocompaction during drain (CASSANDRA-11878)
 + * Add a metrics timer to MemtablePool and use it to track time spent blocked 
on memory in MemtableAllocator (CASSANDRA-11327)
 + * Fix upgrading schema with super columns with non-text subcomparators 
(CASSANDRA-12023)
 + * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
 +Merged from 2.2:
   * Allow nodetool info to run with readonly JMX access (CASSANDRA-11755)
   * Validate bloom_filter_fp_chance against lowest supported
 value when the table is created (CASSANDRA-11920)

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

[32/50] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/cassandra-3.8
Commit: 314f60a44e969fb7da62a21275d94524277c4eb3
Parents: d20c765 f37b6f1
Author: Aleksey Yeschenko 
Authored: Mon Jul 11 14:32:30 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Jul 11 14:32:30 2016 +0100

--
 CHANGES.txt |  2 +
 .../cassandra/schema/LegacySchemaMigrator.java  | 81 ++--
 2 files changed, 59 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/314f60a4/CHANGES.txt
--
diff --cc CHANGES.txt
index 9df49f3,f2d11b9..44fe26c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,11 @@@
 +3.9
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 +Merged from 3.0:
+ 3.0.9
+  * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
   * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
  2.2.8
   * Use dedicated thread for JMX notifications (CASSANDRA-12146)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/314f60a4/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
--

[27/50] cassandra git commit: ninja fix condition to ensure close in ConnectionHandler

[aleksey]

ninja fix condition to ensure close in ConnectionHandler


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

Branch: refs/heads/cassandra-3.8
Commit: e983590d303c9c19577b3bd5b5c95adc9f5abb8a
Parents: f28409b
Author: Yuki Morishita 
Authored: Fri Jul 8 19:05:06 2016 -0500
Committer: Yuki Morishita 
Committed: Fri Jul 8 19:05:06 2016 -0500

--
 src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e983590d/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
--
diff --git a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java 
b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
index 364435e..d3d8ed2 100644
--- a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
+++ b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
@@ -233,7 +233,7 @@ public class ConnectionHandler
 
 protected void signalCloseDone()
 {
-if (closeFuture == null)
+if (!isClosed())
 close();
 
 closeFuture.get().set(null);

[40/50] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/cassandra-3.8
Commit: 76188e9520d0aed8da287cffd80122e1069ddcae
Parents: 56abaca e99ee19
Author: Josh McKenzie 
Authored: Mon Jul 11 16:29:58 2016 -0400
Committer: Josh McKenzie 
Committed: Mon Jul 11 16:29:58 2016 -0400

--
 conf/cassandra.yaml   |  6 ++
 src/java/org/apache/cassandra/config/Config.java  |  1 +
 .../org/apache/cassandra/config/DatabaseDescriptor.java   | 10 ++
 src/java/org/apache/cassandra/service/GCInspector.java|  2 +-
 4 files changed, 18 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/76188e95/conf/cassandra.yaml
--
diff --cc conf/cassandra.yaml
index 076a729,09d2094..d79423e
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@@ -1051,6 -924,16 +1051,12 @@@ inter_dc_tcp_nodelay: fals
  tracetype_query_ttl: 86400
  tracetype_repair_ttl: 604800
  
+ # By default, Cassandra logs GC Pauses greater than 200 ms at INFO level
+ # This threshold can be adjusted to minimize logging if necessary
+ # gc_log_threshold_in_ms: 200
+ 
 -# GC Pauses greater than gc_warn_threshold_in_ms will be logged at WARN level
+ # If unset, all GC Pauses greater than gc_log_threshold_in_ms will log at
+ # INFO level
 -# Adjust the threshold based on your application throughput requirement
 -gc_warn_threshold_in_ms: 1000
 -
  # UDFs (user defined functions) are disabled by default.
  # As of Cassandra 3.0 there is a sandbox in place that should prevent 
execution of evil code.
  enable_user_defined_functions: false

http://git-wip-us.apache.org/repos/asf/cassandra/blob/76188e95/src/java/org/apache/cassandra/config/Config.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/76188e95/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 1375a39,100bcf4..38dce11
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -2169,11 -1984,11 +2174,16 @@@ public class DatabaseDescripto
  conf.user_function_timeout_policy = userFunctionTimeoutPolicy;
  }
  
+ public static long getGCLogThreshold()
+ {
+ return conf.gc_log_threshold_in_ms;
+ }
+ 
 +public static EncryptionContext getEncryptionContext()
 +{
 +return encryptionContext;
 +}
 +
  public static long getGCWarnThreshold()
  {
  return conf.gc_warn_threshold_in_ms;

[06/50] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/cassandra-3.8
Commit: 574e8df207f46d1af361a4a651e6b6cdde18688c
Parents: 78f077d bc23632
Author: Marcus Eriksson 
Authored: Wed Jul 6 08:08:42 2016 +0200
Committer: Marcus Eriksson 
Committed: Wed Jul 6 08:08:42 2016 +0200

--
 CHANGES.txt |  2 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 14 +++
 .../cassandra/db/PartitionRangeReadCommand.java |  2 +-
 .../cassandra/db/SizeEstimatesRecorder.java |  8 +++-
 .../compaction/AbstractCompactionStrategy.java  |  2 +-
 .../db/compaction/CompactionController.java |  2 +-
 .../DateTieredCompactionStrategy.java   |  2 +-
 .../TimeWindowCompactionStrategy.java   |  2 +-
 .../apache/cassandra/db/lifecycle/Tracker.java  |  2 +-
 .../org/apache/cassandra/db/lifecycle/View.java | 36 +
 .../apache/cassandra/db/view/ViewBuilder.java   |  4 +-
 .../cassandra/index/SecondaryIndexManager.java  |  2 +-
 .../index/internal/CassandraIndex.java  |  2 +-
 .../io/sstable/IndexSummaryManager.java |  2 +-
 .../cassandra/streaming/StreamSession.java  | 12 --
 .../apache/cassandra/db/lifecycle/ViewTest.java |  8 ++--
 .../index/internal/CustomCassandraIndex.java|  2 +-
 .../io/sstable/SSTableRewriterTest.java | 41 +++-
 18 files changed, 100 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/CHANGES.txt
--
diff --cc CHANGES.txt
index aa3e939,b3063b4..afeef2c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,6 +1,9 @@@
 -3.0.9
 +3.9
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 +Merged from 3.0:
+  * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
+  * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
   * Fix column ordering of results with static columns for Thrift requests in
 a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 those static columns in query results (CASSANDRA-12123)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
--
diff --cc src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
index bca1877,842ad5f..a8959c2
--- a/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
+++ b/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
@@@ -173,9 -173,9 +173,9 @@@ public class PartitionRangeReadCommand 
  metric.rangeLatency.addNano(latencyNanos);
  }
  
 -protected UnfilteredPartitionIterator queryStorage(final 
ColumnFamilyStore cfs, ReadOrderGroup orderGroup)
 +protected UnfilteredPartitionIterator queryStorage(final 
ColumnFamilyStore cfs, ReadExecutionController executionController)
  {
- ColumnFamilyStore.ViewFragment view = 
cfs.select(View.select(SSTableSet.LIVE, dataRange().keyRange()));
+ ColumnFamilyStore.ViewFragment view = 
cfs.select(View.selectLive(dataRange().keyRange()));
  Tracing.trace("Executing seq scan across {} sstables for {}", 
view.sstables.size(), 
dataRange().keyRange().getString(metadata().getKeyValidator()));
  
  // fetch data from current memtable, historical memtables, and 
SSTables in the correct order.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/db/compaction/CompactionController.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategy.java

[26/50] cassandra git commit: Fix hdr logging for single operation workloads

[aleksey]

Fix hdr logging for single operation workloads

Patch by Nitsan Wakart; reviewed by tjake for CASSANDRA-12145


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

Branch: refs/heads/cassandra-3.8
Commit: c1dcc9ce46f53dd89b80a08d363d5eacac1b9e23
Parents: 8475f89
Author: nitsanw 
Authored: Wed Jul 6 14:45:18 2016 +0200
Committer: T Jake Luciani 
Committed: Fri Jul 8 10:38:40 2016 -0400

--
 CHANGES.txt|  1 +
 .../src/org/apache/cassandra/stress/StressMetrics.java | 13 -
 2 files changed, 9 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1dcc9ce/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 34e7587..b094b00 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.9
+ * Fix hdr logging for single operation workloads (CASSANDRA-12145)
  * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)
  * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 Merged from 3.0:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1dcc9ce/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
--
diff --git a/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java 
b/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
index 668518c..86e9a7a 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
@@ -191,15 +191,18 @@ public class StressMetrics
 rowRateUncertainty.update(current.adjustedRowRate());
 if (current.operationCount() != 0)
 {
-if (result.intervals.intervals().size() > 1)
+// if there's a single operation we only print the total
+final boolean logPerOpSummaryLine = 
result.intervals.intervals().size() > 1;
+
+for (Map.Entry type : 
result.intervals.intervals().entrySet())
 {
-for (Map.Entry type : 
result.intervals.intervals().entrySet())
+final String opName = type.getKey();
+final TimingInterval opInterval = type.getValue();
+if (logPerOpSummaryLine)
 {
-final String opName = type.getKey();
-final TimingInterval opInterval = type.getValue();
 printRow("", opName, opInterval, 
timing.getHistory().get(type.getKey()), result.extra, rowRateUncertainty, 
output);
-logHistograms(opName, opInterval);
 }
+logHistograms(opName, opInterval);
 }
 
 printRow("", "total", current, history, result.extra, 
rowRateUncertainty, output);

[10/50] cassandra git commit: Avoid potential race when rebuilding CFMetaData.columnMetadata

[aleksey]

Avoid potential race when rebuilding CFMetaData.columnMetadata

Patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-12098


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

Branch: refs/heads/cassandra-3.8
Commit: dd05e46f0cb5475edf72676230474e0ad0f9cdbf
Parents: 73c7167
Author: Sam Tunnicliffe 
Authored: Tue Jul 5 13:02:20 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Wed Jul 6 12:08:22 2016 +0100

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/config/CFMetaData.java | 16 +++-
 2 files changed, 8 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd05e46f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b3063b4..02786c5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.9
+ * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
  * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996)
  * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
  * Fix column ordering of results with static columns for Thrift requests in

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd05e46f/src/java/org/apache/cassandra/config/CFMetaData.java
--
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java 
b/src/java/org/apache/cassandra/config/CFMetaData.java
index e263697..5678ada 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -22,7 +22,6 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.ByteBuffer;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -53,9 +52,6 @@ import org.apache.cassandra.io.util.DataInputPlus;
 import org.apache.cassandra.io.util.DataOutputPlus;
 import org.apache.cassandra.schema.*;
 import org.apache.cassandra.utils.*;
-import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.Pair;
-import org.apache.cassandra.utils.UUIDGen;
 import org.github.jamm.Unmetered;
 
 /**
@@ -109,7 +105,7 @@ public final class CFMetaData
  * clustering key ones, those list are ordered by the "component index" of 
the
  * elements.
  */
-private final Map columnMetadata = new 
ConcurrentHashMap<>(); // not on any hot path
+private volatile Map columnMetadata = new 
HashMap<>();
 private volatile List partitionKeyColumns;  // Always of 
size keyValidator.componentsCount, null padded if necessary
 private volatile List clusteringColumns;// Of size 
comparator.componentsCount or comparator.componentsCount -1, null padded if 
necessary
 private volatile PartitionColumns partitionColumns;   // Always 
non-PK, non-clustering columns
@@ -298,16 +294,18 @@ public final class CFMetaData
 {
 this.comparator = new 
ClusteringComparator(extractTypes(clusteringColumns));
 
-this.columnMetadata.clear();
+Map newColumnMetadata = new HashMap<>();
 for (ColumnDefinition def : partitionKeyColumns)
-this.columnMetadata.put(def.name.bytes, def);
+newColumnMetadata.put(def.name.bytes, def);
 for (ColumnDefinition def : clusteringColumns)
 {
-this.columnMetadata.put(def.name.bytes, def);
+newColumnMetadata.put(def.name.bytes, def);
 def.type.checkComparable();
 }
 for (ColumnDefinition def : partitionColumns)
-this.columnMetadata.put(def.name.bytes, def);
+newColumnMetadata.put(def.name.bytes, def);
+
+this.columnMetadata = newColumnMetadata;
 
 List keyTypes = extractTypes(partitionKeyColumns);
 this.keyValidator = keyTypes.size() == 1 ? keyTypes.get(0) : 
CompositeType.getInstance(keyTypes);

[11/50] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/cassandra-3.8
Commit: 5ad17634a1fb75d09ab5a6cb234d7460fed0c3e0
Parents: 262cd38 dd05e46
Author: Sam Tunnicliffe 
Authored: Wed Jul 6 12:10:41 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Wed Jul 6 12:10:41 2016 +0100

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/config/CFMetaData.java | 16 +++-
 2 files changed, 8 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ad17634/CHANGES.txt
--
diff --cc CHANGES.txt
index afeef2c,02786c5..2861cf7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.9
 +3.9
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 +Merged from 3.0:
+  * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
   * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
   * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
   * Fix column ordering of results with static columns for Thrift requests in

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ad17634/src/java/org/apache/cassandra/config/CFMetaData.java
--
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index caa2059,5678ada..4708033
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -22,10 -22,8 +22,9 @@@ import java.lang.reflect.Constructor
  import java.lang.reflect.InvocationTargetException;
  import java.nio.ByteBuffer;
  import java.util.*;
- import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ThreadLocalRandom;
  import java.util.concurrent.TimeUnit;
 +import java.util.regex.Pattern;
  import java.util.stream.Collectors;
  
  import com.google.common.annotations.VisibleForTesting;

[41/50] cassandra git commit: Wait until the message is being send to decide which serializer must be used

[aleksey]

Wait until the message is being send to decide which serializer must be used

patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-11393


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

Branch: refs/heads/cassandra-3.8
Commit: fbd287ad2ed09190dd9c6e152b82215e81020847
Parents: e99ee19
Author: Benjamin Lerer 
Authored: Thu Jul 14 11:33:08 2016 +0200
Committer: Benjamin Lerer 
Committed: Thu Jul 14 11:33:08 2016 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/config/DatabaseDescriptor.java|  1 +
 .../cassandra/db/PartitionRangeReadCommand.java |  7 +--
 .../org/apache/cassandra/db/ReadCommand.java| 65 ++--
 .../org/apache/cassandra/db/ReadResponse.java   | 43 +
 .../db/SinglePartitionReadCommand.java  |  2 +-
 .../io/ForwardingVersionedSerializer.java   | 57 +
 .../apache/cassandra/net/MessagingService.java  |  6 +-
 8 files changed, 113 insertions(+), 69 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbd287ad/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 70210a8..3829046 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.9
+ * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
  * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
  * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
  * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbd287ad/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 100bcf4..b71ebf6 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1124,6 +1124,7 @@ public class DatabaseDescriptor
 case READ:
 return getReadRpcTimeout();
 case RANGE_SLICE:
+case PAGED_RANGE:
 return getRangeRpcTimeout();
 case TRUNCATE:
 return getTruncateRpcTimeout();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbd287ad/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
--
diff --git a/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java 
b/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
index 842ad5f..99e24c8 100644
--- a/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
+++ b/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
@@ -253,12 +253,9 @@ public class PartitionRangeReadCommand extends ReadCommand
 
 public MessageOut createMessage(int version)
 {
-if (version >= MessagingService.VERSION_30)
-return new MessageOut<>(MessagingService.Verb.RANGE_SLICE, this, 
serializer);
-
 return dataRange().isPaging()
- ? new MessageOut<>(MessagingService.Verb.PAGED_RANGE, this, 
legacyPagedRangeCommandSerializer)
- : new MessageOut<>(MessagingService.Verb.RANGE_SLICE, this, 
legacyRangeSliceCommandSerializer);
+ ? new MessageOut<>(MessagingService.Verb.PAGED_RANGE, this, 
pagedRangeSerializer)
+ : new MessageOut<>(MessagingService.Verb.RANGE_SLICE, this, 
rangeSliceSerializer);
 }
 
 protected void appendCQLWhereClause(StringBuilder sb)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbd287ad/src/java/org/apache/cassandra/db/ReadCommand.java
--
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java 
b/src/java/org/apache/cassandra/db/ReadCommand.java
index c792a5a..36969f8 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -34,6 +34,7 @@ import org.apache.cassandra.db.transform.Transformation;
 import org.apache.cassandra.dht.AbstractBounds;
 import org.apache.cassandra.index.Index;
 import org.apache.cassandra.index.IndexNotAvailableException;
+import org.apache.cassandra.io.ForwardingVersionedSerializer;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.io.util.DataInputPlus;
 import 

[16/50] 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/778f2a46
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/778f2a46
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/778f2a46

Branch: refs/heads/cassandra-3.8
Commit: 778f2a46e2df52aa8451aceaf17046e6b8c86ace
Parents: 9ed3b42 00e7ecf
Author: Yuki Morishita 
Authored: Wed Jul 6 12:33:54 2016 -0500
Committer: Yuki Morishita 
Committed: Wed Jul 6 12:33:54 2016 -0500

--
 CHANGES.txt |  1 +
 .../cassandra/streaming/ConnectionHandler.java  |  8 ++--
 .../cassandra/streaming/StreamReceiveTask.java  | 50 +++-
 .../cassandra/streaming/StreamSession.java  | 17 +--
 .../streaming/StreamingTransferTest.java| 30 ++--
 5 files changed, 83 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/778f2a46/CHANGES.txt
--
diff --cc CHANGES.txt
index 02786c5,7d62f97..8118de1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,14 +1,27 @@@
 -2.2.8
 +3.0.9
+  * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
   * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
  Merged from 2.1:
 - * Don't write shadowed range tombstone (CASSANDRA-12030)
 - * Improve digest calculation in the presence of overlapping tombstones 
(CASSANDRA-11349)
   * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
 - * Account for partition deletions in tombstone histogram (CASSANDRA-12112)
  
  
 -2.2.7
 +3.0.8
 + * Fix potential race in schema during new table creation (CASSANDRA-12083)
 + * cqlsh: fix error handling in rare COPY FROM failure scenario 
(CASSANDRA-12070)
 + * Disable autocompaction during drain (CASSANDRA-11878)
 + * Add a metrics timer to MemtablePool and use it to track time spent blocked 
on memory in MemtableAllocator (CASSANDRA-11327)
 + * Fix upgrading schema with super columns with non-text subcomparators 
(CASSANDRA-12023)
 + * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
 +Merged from 2.2:
   * Allow nodetool info to run with readonly JMX access (CASSANDRA-11755)
   * Validate bloom_filter_fp_chance against lowest supported
 value when the table is created (CASSANDRA-11920)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/778f2a46/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
--
diff --cc src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
index 6280f3a,b342edc..040906b
--- a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
+++ b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
@@@ -17,9 -17,7 +17,6 @@@
   */
  package org.apache.cassandra.streaming;
  
--import java.io.File;
- import java.io.IOError;
- import java.io.IOException;
  import java.util.ArrayList;
  import java.util.Collection;
  import java.util.List;
@@@ -36,19 -33,13 +33,20 @@@ import org.apache.cassandra.concurrent.
  import org.apache.cassandra.config.Schema;
  import org.apache.cassandra.db.ColumnFamilyStore;
  import org.apache.cassandra.db.Keyspace;
 +import org.apache.cassandra.db.Mutation;
 +import org.apache.cassandra.db.compaction.OperationType;
 +import org.apache.cassandra.db.lifecycle.LifecycleTransaction;
 +import org.apache.cassandra.db.partitions.PartitionUpdate;
 +import org.apache.cassandra.db.rows.UnfilteredRowIterator;
 +import org.apache.cassandra.db.view.View;
  import org.apache.cassandra.dht.Bounds;
  import org.apache.cassandra.dht.Token;
 +import org.apache.cassandra.io.sstable.ISSTableScanner;
 +import org.apache.cassandra.io.sstable.SSTableMultiWriter;
  import org.apache.cassandra.io.sstable.format.SSTableReader;
 -import org.apache.cassandra.io.sstable.format.SSTableWriter;
  import org.apache.cassandra.utils.JVMStabilityInspector;
  import org.apache.cassandra.utils.Pair;
 -
++import org.apache.cassandra.utils.Throwables;
  

[03/50] cassandra git commit: Revert "Update to Netty 4.0.37"

[aleksey]

Revert "Update to Netty 4.0.37"

This reverts commit e8d7fe8a289e16d18a83e598c589347ec080029f.


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

Branch: refs/heads/cassandra-3.8
Commit: 78f077de079d0b3760a06a7f944be070772b0c83
Parents: 32825a9
Author: Stefania Alborghetti 
Authored: Wed Jul 6 09:09:49 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Jul 6 12:58:06 2016 +0800

--
 build.xml   |   2 +-
 conf/cassandra-env.ps1  |   9 --
 conf/cassandra-env.sh   |   9 --
 lib/licenses/netty-all-4.0.36.Final.txt | 202 +++
 lib/licenses/netty-all-4.0.37.Final.txt | 202 ---
 lib/netty-all-4.0.36.Final.jar  | Bin 0 -> 2195921 bytes
 lib/netty-all-4.0.37.Final.jar  | Bin 2204062 -> 0 bytes
 7 files changed, 203 insertions(+), 221 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/78f077de/build.xml
--
diff --git a/build.xml b/build.xml
index 5ddf40d..d151431 100644
--- a/build.xml
+++ b/build.xml
@@ -426,7 +426,7 @@
   
   
   
-  
+  
   
   
   

http://git-wip-us.apache.org/repos/asf/cassandra/blob/78f077de/conf/cassandra-env.ps1
--
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 8c4311c..9373ba6 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -350,15 +350,6 @@ Function SetCassandraEnvironment
 #$env:HEAP_NEWSIZE="800M"
 CalculateHeapSizes
 
-# Direct memory used for native-protocol network I/O is no longer
-# managed by the JVM. Instead, Netty allows three options to
-# manage it via the system property io.netty.maxDirectMemory:
-# == 0  behavior as before, uses JVM to manage direct memory (slowest).
-# < 0   manages direct memory directly, max direct memory as 
-XX:MaxDirectMemorySize.
-# > 0   manages direct memory directly, max direct memory as specified.
-#   Note, that appreviations like 2g or 500m are NOT accepted.
-#$env:JVM_OPTS="$env:JVM_OPTS -Dio.netty.maxDirectMemory=2147483648"
-
 ParseJVMInfo
 
 # We only set -Xms and -Xmx if they were not defined on jvm.options file

http://git-wip-us.apache.org/repos/asf/cassandra/blob/78f077de/conf/cassandra-env.sh
--
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 6d5de21..93434c9 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -167,15 +167,6 @@ USING_G1=$?
 # Set this to control the amount of arenas per-thread in glibc
 #export MALLOC_ARENA_MAX=4
 
-# Direct memory used for native-protocol network I/O is no longer
-# managed by the JVM. Instead, Netty allows three options to
-# manage it via the system property io.netty.maxDirectMemory:
-# == 0  behavior as before, uses JVM to manage direct memory (slowest).
-# < 0   manages direct memory directly, max direct memory as 
-XX:MaxDirectMemorySize.
-# > 0   manages direct memory directly, max direct memory as specified.
-#   Note, that appreviations like 2g or 500m are NOT accepted.
-#export JVM_OPTS="$JVM_OPTS -Dio.netty.maxDirectMemory=2147483648"
-
 # only calculate the size if it's not set manually
 if [ "x$MAX_HEAP_SIZE" = "x" ] && [ "x$HEAP_NEWSIZE" = "x" -o $USING_G1 -eq 0 
]; then
 calculate_heap_sizes

http://git-wip-us.apache.org/repos/asf/cassandra/blob/78f077de/lib/licenses/netty-all-4.0.36.Final.txt
--
diff --git a/lib/licenses/netty-all-4.0.36.Final.txt 
b/lib/licenses/netty-all-4.0.36.Final.txt
new file mode 100644
index 000..d645695
--- /dev/null
+++ b/lib/licenses/netty-all-4.0.36.Final.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other 

[02/50] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.9

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/ReadResponse.java


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

Branch: refs/heads/cassandra-3.8
Commit: 32825a9b4d9b20620f0536e4acd0e43d7a1737c0
Parents: 237330a 2217695
Author: Tyler Hobbs 
Authored: Tue Jul 5 11:47:34 2016 -0500
Committer: Tyler Hobbs 
Committed: Tue Jul 5 11:47:34 2016 -0500

--
 CHANGES.txt| 3 +++
 src/java/org/apache/cassandra/db/ReadResponse.java | 7 +--
 2 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/32825a9b/CHANGES.txt
--
diff --cc CHANGES.txt
index 68854b3,7f8a3a1..aa3e939
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,7 +1,10 @@@
 -3.0.9
 +3.9
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 +Merged from 3.0:
+  * Fix column ordering of results with static columns for Thrift requests in
+a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
+those static columns in query results (CASSANDRA-12123)
   * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
   * Fix EOF exception when altering column type (CASSANDRA-11820)
  Merged from 2.2:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/32825a9b/src/java/org/apache/cassandra/db/ReadResponse.java
--
diff --cc src/java/org/apache/cassandra/db/ReadResponse.java
index 6d0b2e1,8bd1be6..3f21480
--- a/src/java/org/apache/cassandra/db/ReadResponse.java
+++ b/src/java/org/apache/cassandra/db/ReadResponse.java
@@@ -272,9 -273,11 +273,11 @@@ public abstract class ReadRespons
  // Pre-3.0, we didn't have a way to express exclusivity 
for non-composite comparators, so all slices were
  // inclusive on both ends. If we have exclusive slice 
ends, we need to filter the results here.
  if (!command.metadata().isCompound())
- return 
partition.unfilteredIterator(command.columnFilter(), 
filter.getSlices(command.metadata()), filter.isReversed());
+ return ThriftResultsMerger.maybeWrap(
 -
filter.filter(partition.sliceableUnfilteredIterator(command.columnFilter(), 
filter.isReversed())), command.nowInSec());
++
partition.unfilteredIterator(command.columnFilter(), 
filter.getSlices(command.metadata()), filter.isReversed()), command.nowInSec());
  
- return 
partition.unfilteredIterator(command.columnFilter(), Slices.ALL, 
filter.isReversed());
+ return ThriftResultsMerger.maybeWrap(
+ 
partition.unfilteredIterator(command.columnFilter(), Slices.ALL, 
filter.isReversed()), command.nowInSec());
  }
  };
  }

[09/50] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/cassandra-3.8
Commit: 262cd38b0179c8ff2b8a60509f10d669c21c8312
Parents: 574e8df 73c7167
Author: Marcus Eriksson 
Authored: Wed Jul 6 10:11:29 2016 +0200
Committer: Marcus Eriksson 
Committed: Wed Jul 6 10:11:29 2016 +0200

--
 .../cassandra/db/compaction/DateTieredCompactionStrategyTest.java   | 1 +
 1 file changed, 1 insertion(+)
--

[17/50] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/cassandra-3.8
Commit: 59ee46e55a15775a49edde86de81b9b79875731d
Parents: 5ad1763 778f2a4
Author: Yuki Morishita 
Authored: Wed Jul 6 12:34:22 2016 -0500
Committer: Yuki Morishita 
Committed: Wed Jul 6 12:34:22 2016 -0500

--
 CHANGES.txt |  1 +
 .../cassandra/streaming/ConnectionHandler.java  |  8 ++--
 .../cassandra/streaming/StreamReceiveTask.java  | 50 +++-
 .../cassandra/streaming/StreamSession.java  | 17 +--
 .../streaming/StreamingTransferTest.java| 30 ++--
 5 files changed, 83 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/59ee46e5/CHANGES.txt
--
diff --cc CHANGES.txt
index 2861cf7,8118de1..d459e34
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.9
 +3.9
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 +Merged from 3.0:
+  * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
   * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
   * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
   * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/59ee46e5/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/59ee46e5/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/59ee46e5/src/java/org/apache/cassandra/streaming/StreamSession.java
--