[jira] [Commented] (CASSANDRA-12666) dtest failure in paging_test.TestPagingData.test_paging_with_filtering_on_partition_key

2016-11-29 Thread Branimir Lambov (JIRA) 

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

Branimir Lambov commented on CASSANDRA-12666:
-

Pushed a trivial change here:
|[3.X|https://github.com/blambov/cassandra/tree/ifesdjeen-12666-3.X]|[utest|http://cassci.datastax.com/job/blambov-ifesdjeen-12666-3.X-testall/]|[dtest|http://cassci.datastax.com/job/blambov-ifesdjeen-12666-3.X-dtest/]|

Let me know if you are OK with it and I will commit the patch as soon as the 
tests complete.

> dtest failure in 
> paging_test.TestPagingData.test_paging_with_filtering_on_partition_key
> ---
>
> Key: CASSANDRA-12666
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12666
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>Assignee: Alex Petrov
>Priority: Critical
>  Labels: dtest
> Fix For: 3.10
>
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_novnode_dtest/480/testReport/paging_test/TestPagingData/test_paging_with_filtering_on_partition_key
> {code}
> Standard Output
> Unexpected error in node3 log, error: 
> ERROR [Native-Transport-Requests-3] 2016-09-17 00:50:11,543 Message.java:622 
> - Unexpected exception during request; channel = [id: 0x467a4afe, 
> L:/127.0.0.3:9042 - R:/127.0.0.1:59115]
> java.lang.AssertionError: null
>   at 
> org.apache.cassandra.dht.IncludingExcludingBounds.split(IncludingExcludingBounds.java:45)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageProxy.getRestrictedRanges(StorageProxy.java:2368)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageProxy$RangeIterator.(StorageProxy.java:1951)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageProxy.getRangeSlice(StorageProxy.java:2235)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.PartitionRangeReadCommand.execute(PartitionRangeReadCommand.java:184)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.pager.AbstractQueryPager.fetchPage(AbstractQueryPager.java:66)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.pager.PartitionRangeQueryPager.fetchPage(PartitionRangeQueryPager.java:36)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.statements.SelectStatement$Pager$NormalPager.fetchPage(SelectStatement.java:328)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.statements.SelectStatement.execute(SelectStatement.java:375)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.statements.SelectStatement.execute(SelectStatement.java:250)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.statements.SelectStatement.execute(SelectStatement.java:78)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.QueryProcessor.processStatement(QueryProcessor.java:216)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.QueryProcessor.process(QueryProcessor.java:247) 
> ~[main/:na]
>   at 
> org.apache.cassandra.cql3.QueryProcessor.process(QueryProcessor.java:232) 
> ~[main/:na]
>   at 
> org.apache.cassandra.transport.messages.QueryMessage.execute(QueryMessage.java:115)
>  ~[main/:na]
>   at 
> org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:516)
>  [main/:na]
>   at 
> org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:409)
>  [main/:na]
>   at 
> io.netty.channel.SimpleChannelInboundHandler.channelRead(SimpleChannelInboundHandler.java:105)
>  [netty-all-4.0.39.Final.jar:4.0.39.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:366)
>  [netty-all-4.0.39.Final.jar:4.0.39.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext.access$600(AbstractChannelHandlerContext.java:35)
>  [netty-all-4.0.39.Final.jar:4.0.39.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext$7.run(AbstractChannelHandlerContext.java:357)
>  [netty-all-4.0.39.Final.jar:4.0.39.Final]
>   at 
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) 
> [na:1.8.0_45]
>   at 
> org.apache.cassandra.concurrent.AbstractLocalAwareExecutorService$FutureTask.run(AbstractLocalAwareExecutorService.java:162)
>  [main/:na]
>   at org.apache.cassandra.concurrent.SEPWorker.run(SEPWorker.java:109) 
> [main/:na]
>   at java.lang.Thread.run(Thread.java:745) [na:1.8.0_45]
> {code}
> Related failures:
> http://cassci.datastax.com/job/trunk_novnode_dtest/480/testReport/paging_test/TestPagingData/test_paging_with_filtering_on_partition_key_on_clustering_columns/
>

[jira] [Updated] (CASSANDRA-12969) Index: index can significantly slow down boot

2016-11-29 Thread Corentin Chary (JIRA) 

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

Corentin Chary updated CASSANDRA-12969:
---
Fix Version/s: 3.x

> Index: index can significantly slow down boot
> -
>
> Key: CASSANDRA-12969
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12969
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core
>Reporter: Corentin Chary
> Fix For: 3.x
>
> Attachments: 0004-index-do-not-re-insert-values-in-IndexInfo.patch
>
>
> During startup, each existing index is opened and marked as built by adding 
> an entry in "IndexInfo" and forcing a flush. Because of that we end up 
> flushing one sstable per index. On systems on HDD this can take minutes for 
> nothing.
> Thw following patch allows to avoid creating useless new sstables if the 
> index was already marked as built and will greatly reduce the startup time 
> (and improve availability during restarts).



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

[jira] [Updated] (CASSANDRA-12910) SASI: calculatePrimary() always returns null

2016-11-29 Thread Corentin Chary (JIRA) 

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

Corentin Chary updated CASSANDRA-12910:
---
Fix Version/s: 3.x

> SASI: calculatePrimary() always returns null
> 
>
> Key: CASSANDRA-12910
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12910
> Project: Cassandra
>  Issue Type: Bug
>  Components: sasi
>Reporter: Corentin Chary
>Priority: Minor
> Fix For: 3.x
>
> Attachments: 0002-sasi-fix-calculatePrimary.patch
>
>
> While investigating performance issues with SASI  
> (https://github.com/criteo/biggraphite/issues/174 if you want to know more) I 
> ended finding calculatePrimary() in QueryController.java which apparently 
> should return the "primary index".
> It lacks documentation, and I'm unsure what the "primary index" should be, 
> but apparently this function never returns one because primaryIndexes.size() 
> is always 0.
> https://github.com/apache/cassandra/blob/81f6c784ce967fadb6ed7f58de1328e713eaf53c/src/java/org/apache/cassandra/index/sasi/plan/QueryController.java#L237
> I'm unsure if the proper fix is checking if the collection is empty or 
> reversing the operator (selecting the index with higher cardinality versus 
> the one with lower cardinality).



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

[jira] [Commented] (CASSANDRA-12915) SASI: Index intersection can be very inefficient

2016-11-29 Thread Corentin Chary (JIRA) 

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

Corentin Chary commented on CASSANDRA-12915:


Split the calculatePrimary() fix in CASSANDRA-12910

> SASI: Index intersection can be very inefficient
> 
>
> Key: CASSANDRA-12915
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12915
> Project: Cassandra
>  Issue Type: Improvement
>  Components: sasi
>Reporter: Corentin Chary
> Fix For: 3.x
>
>
> It looks like RangeIntersectionIterator.java and be pretty inefficient in 
> some cases. Let's take the following query:
> SELECT data FROM table WHERE index1 = 'foo' AND index2 = 'bar';
> In this case:
> * index1 = 'foo' will match 2 items
> * index2 = 'bar' will match ~300k items
> On my setup, the query will take ~1 sec, most of the time being spent in 
> disk.TokenTree.getTokenAt().
> if I patch RangeIntersectionIterator so that it doesn't try to do the 
> intersection (and effectively only use 'index1') the query will run in a few 
> tenth of milliseconds.
> I see multiple solutions for that:
> * Add a static thresold to avoid the use of the index for the intersection 
> when we know it will be slow. Probably when the range size factor is very 
> small and the range size is big.
> * CASSANDRA-10765



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

[jira] [Created] (CASSANDRA-12975) Exception (java.lang.RuntimeException) encountered during startup: org.codehaus.jackson.JsonParseException:

2016-11-29 Thread JianwenSun (JIRA) 
JianwenSun created CASSANDRA-12975:
--

 Summary: Exception (java.lang.RuntimeException) encountered during 
startup: org.codehaus.jackson.JsonParseException:
 Key: CASSANDRA-12975
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12975
 Project: Cassandra
  Issue Type: Bug
Reporter: JianwenSun


We upgrade our thrift tables from v1.2.4  --> 1.2.9  --> 2.0.9 --> v2.1.13 
without any problems, but when upgrade it to v3.9 something wrong.
any help?











[root@bj-dev-infra-001 cassandra]# apache-cassandra-3.9/bin/cassandra -R -f
CompilerOracle: dontinline 
org/apache/cassandra/db/Columns$Serializer.deserializeLargeSubset 
(Lorg/apache/cassandra/io/util/DataInputPlus;Lorg/apache/cassandra/db/Columns;I)Lorg/apache/cassandra/db/Columns;
CompilerOracle: dontinline 
org/apache/cassandra/db/Columns$Serializer.serializeLargeSubset 
(Ljava/util/Collection;ILorg/apache/cassandra/db/Columns;ILorg/apache/cassandra/io/util/DataOutputPlus;)V
CompilerOracle: dontinline 
org/apache/cassandra/db/Columns$Serializer.serializeLargeSubsetSize 
(Ljava/util/Collection;ILorg/apache/cassandra/db/Columns;I)I
CompilerOracle: dontinline 
org/apache/cassandra/db/transform/BaseIterator.tryGetMoreContents ()Z
CompilerOracle: dontinline 
org/apache/cassandra/db/transform/StoppingTransformation.stop ()V
CompilerOracle: dontinline 
org/apache/cassandra/db/transform/StoppingTransformation.stopInPartition ()V
CompilerOracle: dontinline 
org/apache/cassandra/io/util/BufferedDataOutputStreamPlus.doFlush (I)V
CompilerOracle: dontinline 
org/apache/cassandra/io/util/BufferedDataOutputStreamPlus.writeExcessSlow ()V
CompilerOracle: dontinline 
org/apache/cassandra/io/util/BufferedDataOutputStreamPlus.writeSlow (JI)V
CompilerOracle: dontinline 
org/apache/cassandra/io/util/RebufferingInputStream.readPrimitiveSlowly (I)J
CompilerOracle: inline 
org/apache/cassandra/db/rows/UnfilteredSerializer.serializeRowBody 
(Lorg/apache/cassandra/db/rows/Row;ILorg/apache/cassandra/db/SerializationHeader;Lorg/apache/cassandra/io/util/DataOutputPlus;)V
CompilerOracle: inline org/apache/cassandra/io/util/Memory.checkBounds (JJ)V
CompilerOracle: inline org/apache/cassandra/io/util/SafeMemory.checkBounds (JJ)V
CompilerOracle: inline 
org/apache/cassandra/utils/AsymmetricOrdering.selectBoundary 
(Lorg/apache/cassandra/utils/AsymmetricOrdering/Op;II)I
CompilerOracle: inline 
org/apache/cassandra/utils/AsymmetricOrdering.strictnessOfLessThan 
(Lorg/apache/cassandra/utils/AsymmetricOrdering/Op;)I
CompilerOracle: inline org/apache/cassandra/utils/BloomFilter.indexes 
(Lorg/apache/cassandra/utils/IFilter/FilterKey;)[J
CompilerOracle: inline org/apache/cassandra/utils/BloomFilter.setIndexes 
(JJIJ[J)V
CompilerOracle: inline org/apache/cassandra/utils/ByteBufferUtil.compare 
(Ljava/nio/ByteBuffer;[B)I
CompilerOracle: inline org/apache/cassandra/utils/ByteBufferUtil.compare 
([BLjava/nio/ByteBuffer;)I
CompilerOracle: inline 
org/apache/cassandra/utils/ByteBufferUtil.compareUnsigned 
(Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)I
CompilerOracle: inline 
org/apache/cassandra/utils/FastByteOperations$UnsafeOperations.compareTo 
(Ljava/lang/Object;JILjava/lang/Object;JI)I
CompilerOracle: inline 
org/apache/cassandra/utils/FastByteOperations$UnsafeOperations.compareTo 
(Ljava/lang/Object;JILjava/nio/ByteBuffer;)I
CompilerOracle: inline 
org/apache/cassandra/utils/FastByteOperations$UnsafeOperations.compareTo 
(Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)I
CompilerOracle: inline org/apache/cassandra/utils/vint/VIntCoding.encodeVInt 
(JI)[B
INFO  06:05:28 Configuration location: 
file:/usr/local/cassandra/apache-cassandra-3.9/conf/cassandra.yaml
INFO  06:05:28 Node configuration:[allocate_tokens_for_keyspace=null; 
authenticator=AllowAllAuthenticator; authorizer=AllowAllAuthorizer; 
auto_bootstrap=true; auto_snapshot=true; batch_size_fail_threshold_in_kb=50; 
batch_size_warn_threshold_in_kb=5; batchlog_replay_throttle_in_kb=1024; 
broadcast_address=null; broadcast_rpc_address=null; 
buffer_pool_use_heap_if_exhausted=true; cas_contention_timeout_in_ms=1000; 
cdc_enabled=false; cdc_free_space_check_interval_ms=250; 
cdc_raw_directory=/usr/local/cassandra/data/cdc_raw; 
cdc_total_space_in_mb=null; client_encryption_options=; 
cluster_name=TestCluster; column_index_cache_size_in_kb=2; 
column_index_size_in_kb=64; commit_failure_policy=stop; 
commitlog_compression=null; 
commitlog_directory=/usr/local/cassandra/data/commitlog; 
commitlog_max_compression_buffers_in_pool=3; commitlog_periodic_queue_size=-1; 
commitlog_segment_size_in_mb=32; commitlog_sync=periodic; 
commitlog_sync_batch_window_in_ms=null; commitlog_sync_period_in_ms=1; 
commitlog_total_space_in_mb=null; 
compaction_large_partition_warning_threshold_mb=100; 
compaction_throughput_mb_per_sec=0; concurrent_compactors=20; 
concurrent_counter_writes=32; concurrent_materialized_view_writes=32;

[jira] [Updated] (CASSANDRA-8217) Fail snapshot based repair if Merkle tree does not use the same snapshot

2016-11-29 Thread sankalp kohli (JIRA) 

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

sankalp kohli updated CASSANDRA-8217:
-
Assignee: (was: sankalp kohli)

> Fail snapshot based repair if Merkle tree does not use the same snapshot
> 
>
> Key: CASSANDRA-8217
> URL: https://issues.apache.org/jira/browse/CASSANDRA-8217
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Streaming and Messaging
>Reporter: sankalp kohli
>Priority: Minor
>
> Snapshot based repair rely on having a snapshot on each replica. If for some 
> reason, snapshot is not found or is different, we should fail the repair. 
> This will avoid streaming lot of data around.



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

[jira] [Commented] (CASSANDRA-11107) Add native_transport_address and native_transport_broadcast_address yaml options

2016-11-29 Thread Ariel Weisberg (JIRA) 

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

Ariel Weisberg commented on CASSANDRA-11107:


I already have code in that direction as part of 7544. I am adding 
default_native_port which is used when dealing with nodes that don't publish 
their native port. New version nodes gossip their native port along with the 
address and that is used. native_port now specifies just the native port of the 
instance using that yaml file and it doesn't need to match across the cluster. 
Once a rolling upgrade is complete the configurations can safely diverge across 
the cluster.

It works similarly for listen_address.

It's not going to happen quickly, and honestly it seems at risk for a Feb/March 
release. I have to do a large amount of additional work to get the storage port 
issue sorted out so it.

The incremental additional work for me to do the gossip and peers work is 
negligible. Native protocol and fixing the client driver side is a bigger 
issue. I have to update the java client anyways because it's not exposing the 
cluster metadata in a way that allows tools like sstableloader to work with 
multiple instances per node.

> Add native_transport_address and native_transport_broadcast_address yaml 
> options
> 
>
> Key: CASSANDRA-11107
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11107
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Configuration
>Reporter: n0rad
>Assignee: Joel Knighton
>Priority: Minor
>
> I'm starting cassandra on a container with this /etc/hosts
> {quote}
> 127.0.0.1rkt-235c219a-f0dc-4958-9e03-5afe2581bbe1 localhost
> ::1  rkt-235c219a-f0dc-4958-9e03-5afe2581bbe1 localhost
> {quote}
> I have the default configuration except :
> {quote}
>  - seeds: "10.1.1.1"
> listen_address : 10.1.1.1
> {quote}
> cassandra will start listening on *127.0.0.1:9042*
> if I set *rpc_address:10.1.1.1* , even if *start_rpc: false*, cassandra will 
> listen on 10.1.1.1
> Since rpc is not started, I assumed that *rpc_address* and 
> *broadcast_rpc_address* will be ignored
> It took me a while to figure that. There may be something to do around this



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

[jira] [Comment Edited] (CASSANDRA-11107) Add native_transport_address and native_transport_broadcast_address yaml options

2016-11-29 Thread Joel Knighton (JIRA) 

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

Joel Knighton edited comment on CASSANDRA-11107 at 11/29/16 11:28 PM:
--

That's correct - it's true that I could at least piggyback on those since those 
migrations/changes would already be necessary.

EDIT: That is, I would need to make additional changes, but I could time this 
for the same release to prevent the need for additional legacy tables.


was (Author: jkni):
That's correct - it's true that I could at least piggyback on those since those 
migrations/changes would already be necessary.

> Add native_transport_address and native_transport_broadcast_address yaml 
> options
> 
>
> Key: CASSANDRA-11107
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11107
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Configuration
>Reporter: n0rad
>Assignee: Joel Knighton
>Priority: Minor
>
> I'm starting cassandra on a container with this /etc/hosts
> {quote}
> 127.0.0.1rkt-235c219a-f0dc-4958-9e03-5afe2581bbe1 localhost
> ::1  rkt-235c219a-f0dc-4958-9e03-5afe2581bbe1 localhost
> {quote}
> I have the default configuration except :
> {quote}
>  - seeds: "10.1.1.1"
> listen_address : 10.1.1.1
> {quote}
> cassandra will start listening on *127.0.0.1:9042*
> if I set *rpc_address:10.1.1.1* , even if *start_rpc: false*, cassandra will 
> listen on 10.1.1.1
> Since rpc is not started, I assumed that *rpc_address* and 
> *broadcast_rpc_address* will be ignored
> It took me a while to figure that. There may be something to do around this



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

[jira] [Commented] (CASSANDRA-11107) Add native_transport_address and native_transport_broadcast_address yaml options

2016-11-29 Thread Joel Knighton (JIRA) 

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

Joel Knighton commented on CASSANDRA-11107:
---

That's correct - it's true that I could at least piggyback on those since those 
migrations/changes would already be necessary.

> Add native_transport_address and native_transport_broadcast_address yaml 
> options
> 
>
> Key: CASSANDRA-11107
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11107
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Configuration
>Reporter: n0rad
>Assignee: Joel Knighton
>Priority: Minor
>
> I'm starting cassandra on a container with this /etc/hosts
> {quote}
> 127.0.0.1rkt-235c219a-f0dc-4958-9e03-5afe2581bbe1 localhost
> ::1  rkt-235c219a-f0dc-4958-9e03-5afe2581bbe1 localhost
> {quote}
> I have the default configuration except :
> {quote}
>  - seeds: "10.1.1.1"
> listen_address : 10.1.1.1
> {quote}
> cassandra will start listening on *127.0.0.1:9042*
> if I set *rpc_address:10.1.1.1* , even if *start_rpc: false*, cassandra will 
> listen on 10.1.1.1
> Since rpc is not started, I assumed that *rpc_address* and 
> *broadcast_rpc_address* will be ignored
> It took me a while to figure that. There may be something to do around this



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

[jira] [Commented] (CASSANDRA-11107) Add native_transport_address and native_transport_broadcast_address yaml options

2016-11-29 Thread Jason Brown (JIRA) 

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

Jason Brown commented on CASSANDRA-11107:
-

[~jkni] I think [~aweisberg] is planning on addressing the {{peers}} table 
changes and new {{ApplicationState}} in gossip with some of his work in 
CASSANDRA-7544. Ariel?

> Add native_transport_address and native_transport_broadcast_address yaml 
> options
> 
>
> Key: CASSANDRA-11107
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11107
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Configuration
>Reporter: n0rad
>Assignee: Joel Knighton
>Priority: Minor
>
> I'm starting cassandra on a container with this /etc/hosts
> {quote}
> 127.0.0.1rkt-235c219a-f0dc-4958-9e03-5afe2581bbe1 localhost
> ::1  rkt-235c219a-f0dc-4958-9e03-5afe2581bbe1 localhost
> {quote}
> I have the default configuration except :
> {quote}
>  - seeds: "10.1.1.1"
> listen_address : 10.1.1.1
> {quote}
> cassandra will start listening on *127.0.0.1:9042*
> if I set *rpc_address:10.1.1.1* , even if *start_rpc: false*, cassandra will 
> listen on 10.1.1.1
> Since rpc is not started, I assumed that *rpc_address* and 
> *broadcast_rpc_address* will be ignored
> It took me a while to figure that. There may be something to do around this



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

[jira] [Comment Edited] (CASSANDRA-12907) Different data directories for SSDs and HDDs at configuration level

2016-11-29 Thread Natale Galioto (JIRA) 

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

Natale Galioto edited comment on CASSANDRA-12907 at 11/29/16 10:52 PM:
---

I got some basic stuff work, and I was able to map all non "-Data.db" files to 
another location. The code can be checked on my fork on github at:  
https://github.com/xmas79/cassandra/tree/CASSANDRA-12907
This is the commit: 
https://github.com/xmas79/cassandra/commit/c72d0ea284bd54877ac1f808e7333e6fbbba4c93

This currently works for one "ssd" directory, and one "data" directory only. 
The code changes the constructor of 
"src/java/org/apache/cassandra/io/sstable/Descriptor.java", the descriptor of 
the sstable, and mangles the "baseFilename" function based on the requested 
"Component".

It really requires a deep review by people that have much more understanding 
than me of the whole system. Indeed, I don't know what really happens with 
snapshots, backup, and many other things I cannot think about. I apologize if I 
got something really wrong.

Thanks.



was (Author: xmas79):
I got some basic stuff work, and I was able to map all non "-Data.db" files to 
another location. The code can be checked on my fork on github at:  
https://github.com/xmas79/cassandra/tree/CASSANDRA-12907
This is the commit: 
https://github.com/xmas79/cassandra/commit/c72d0ea284bd54877ac1f808e7333e6fbbba4c93

This currently works for one "ssd" directory, and one "data" directory only. 
The code changes the constructor of 
"src/java/org/apache/cassandra/io/sstable/Descriptor.java", the descriptor of 
the sstable, and mangles the "baseFilename" function based on the requested 
"Component".

It really requires a deep review by people that have much more understanding of 
the whole system.

Thanks.

> Different data directories for SSDs and HDDs at configuration level
> ---
>
> Key: CASSANDRA-12907
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12907
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Natale Galioto
>  Labels: performance
>
> Currently, users can speed up some CFs by symlinking its data directory to 
> fast media such as SSDs. In my opinion, instead, configuration file should 
> allow two different sets of directory: one dedicated to spindles, one 
> dedicated to SSDs. 
> This would allow a "once and for all mixed SSD & HDD configuration", instead 
> of continuously symlinking the "right" directory each time a CF is created 
> (due to the name mangling of the CF directories).
> And this in turn would allow a priori knowledge on disk structures, and would 
> allow to place indexes of all sort (lookup, partition, etc... everything that 
> is needed to "just" locate data) on fast SSDs, speeding up ALL the CFs 
> instead of only one, while the HDDs could be used just for data retrieval and 
> sequential reads. 



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

[jira] [Commented] (CASSANDRA-12907) Different data directories for SSDs and HDDs at configuration level

2016-11-29 Thread Natale Galioto (JIRA) 

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

Natale Galioto commented on CASSANDRA-12907:


I got some basic stuff work, and I was able to map all non "-Data.db" files to 
another location. The code can be checked on my fork on github at:  
https://github.com/xmas79/cassandra/tree/CASSANDRA-12907
This is the commit: 
https://github.com/xmas79/cassandra/commit/c72d0ea284bd54877ac1f808e7333e6fbbba4c93

This currently works for one "ssd" directory, and one "data" directory only. 
The code changes the constructor of 
"src/java/org/apache/cassandra/io/sstable/Descriptor.java", the descriptor of 
the sstable, and mangles the "baseFilename" function based on the requested 
"Component".

It really requires a deep review by people that have much more understanding of 
the whole system.

Thanks.

> Different data directories for SSDs and HDDs at configuration level
> ---
>
> Key: CASSANDRA-12907
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12907
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Natale Galioto
>  Labels: performance
>
> Currently, users can speed up some CFs by symlinking its data directory to 
> fast media such as SSDs. In my opinion, instead, configuration file should 
> allow two different sets of directory: one dedicated to spindles, one 
> dedicated to SSDs. 
> This would allow a "once and for all mixed SSD & HDD configuration", instead 
> of continuously symlinking the "right" directory each time a CF is created 
> (due to the name mangling of the CF directories).
> And this in turn would allow a priori knowledge on disk structures, and would 
> allow to place indexes of all sort (lookup, partition, etc... everything that 
> is needed to "just" locate data) on fast SSDs, speeding up ALL the CFs 
> instead of only one, while the HDDs could be used just for data retrieval and 
> sequential reads. 



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

[jira] [Commented] (CASSANDRA-11107) Add native_transport_address and native_transport_broadcast_address yaml options

2016-11-29 Thread Joel Knighton (JIRA) 

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

Joel Knighton commented on CASSANDRA-11107:
---

I've got a patch in progress that solves the easy parts of this. At this point, 
however, I am having second thoughts regarding the costs/benefits of this 
change.

At this point, to support separate rpc/native_transport configurations, changes 
would seem to include:
* updating the native protocol so that NEW_NODE events include rpc_address and 
native_transport_address (and other TopologyChangeEvents, since identifiers 
used by drivers might include both address configurations)
* updating the PEERS table to include rpc_address and native_transport_address
* adding an ApplicationState in Gossip for native_transport_address.

Drivers would also need to be updated to query native_transport_address 
appropriately. This seems like a fair amount of work when 4.0 will end up 
negating these changes on removing Thrift.

The other option that immediately presents itself is to allow these properties 
to be set in a 3.X yaml but require them to match the rpc configurations. I'm 
not sure this is worth it either.

Let me know what you think, [~slebresne].

> Add native_transport_address and native_transport_broadcast_address yaml 
> options
> 
>
> Key: CASSANDRA-11107
> URL: https://issues.apache.org/jira/browse/CASSANDRA-11107
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Configuration
>Reporter: n0rad
>Assignee: Joel Knighton
>Priority: Minor
>
> I'm starting cassandra on a container with this /etc/hosts
> {quote}
> 127.0.0.1rkt-235c219a-f0dc-4958-9e03-5afe2581bbe1 localhost
> ::1  rkt-235c219a-f0dc-4958-9e03-5afe2581bbe1 localhost
> {quote}
> I have the default configuration except :
> {quote}
>  - seeds: "10.1.1.1"
> listen_address : 10.1.1.1
> {quote}
> cassandra will start listening on *127.0.0.1:9042*
> if I set *rpc_address:10.1.1.1* , even if *start_rpc: false*, cassandra will 
> listen on 10.1.1.1
> Since rpc is not started, I assumed that *rpc_address* and 
> *broadcast_rpc_address* will be ignored
> It took me a while to figure that. There may be something to do around this



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

cassandra-builds git commit: Skip test-cdc on cassandra-2.2 and cassandra-3.0

2016-11-29 Thread mshuler 
Repository: cassandra-builds
Updated Branches:
  refs/heads/master b26ac0903 -> ce91316c1


Skip test-cdc on cassandra-2.2 and cassandra-3.0


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

Branch: refs/heads/master
Commit: ce91316c1510c2733d1647f9ba727934b4378155
Parents: b26ac09
Author: Michael Shuler 
Authored: Tue Nov 29 16:08:24 2016 -0600
Committer: Michael Shuler 
Committed: Tue Nov 29 16:08:24 2016 -0600

--
 jenkins-dsl/cassandra_job_dsl_seed.groovy | 21 +
 1 file changed, 13 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra-builds/blob/ce91316c/jenkins-dsl/cassandra_job_dsl_seed.groovy
--
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy 
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index d087226..c099c3f 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -198,14 +198,19 @@ cassandraBranches.each {
 testTargets.each {
 def targetName = it
 
-job("${jobNamePrefix}-${targetName}") {
-disabled(false)
-using('Cassandra-template-test')
-configure { node ->
-node / scm / branches / 'hudson.plugins.git.BranchSpec' / 
name(branchName)
-}
-steps {
-shell("./cassandra-builds/build-scripts/cassandra-unittest.sh 
${targetName}")
+// Skip test-cdc on cassandra-2.2 and cassandra-3.0 branches
+if ((targetName == 'test-cdc') && ((branchName == 'cassandra-2.2') || 
(branchName == 'cassandra-3.0'))) {
+println("Skipping ${targetName} on branch ${branchName}");
+} else {
+ job("${jobNamePrefix}-${targetName}") {
+disabled(false)
+using('Cassandra-template-test')
+configure { node ->
+node / scm / branches / 'hudson.plugins.git.BranchSpec' / 
name(branchName)
+}
+steps {
+
shell("./cassandra-builds/build-scripts/cassandra-unittest.sh ${targetName}")
+}
 }
 }
 }

[jira] [Updated] (CASSANDRA-12914) cqlsh describe fails with "list[i] not a string for i in..."

2016-11-29 Thread Tyler Hobbs (JIRA) 

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

Tyler Hobbs updated CASSANDRA-12914:

   Resolution: Fixed
Fix Version/s: (was: 3.0.x)
   (was: 2.2.x)
   (was: 3.x)
   3.10
   3.0.11
   2.2.9
Reproduced In: 3.8, 3.0.9, 2.2.7  (was: 2.2.7, 3.0.9, 3.8)
   Status: Resolved  (was: Patch Available)

The tests all ran perfectly, so +1 on the patch.

Committed to 2.2 as {{d38bf9faa47ebd4ea4edc9c6afa17abe48dbdc9e}} and merged up 
to 3.0, 3.11 (which will actually be the 3.10 release), 3.X, and trunk.

> cqlsh describe fails with "list[i] not a string for i in..."
> 
>
> Key: CASSANDRA-12914
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12914
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Adam Holmberg
>Assignee: Adam Holmberg
>Priority: Minor
> Fix For: 2.2.9, 3.0.11, 3.10
>
>
> repro:
> Create a keyspace and a few user types.
> {code}
> use keyspace;
> desc types;
> {code}
> This is caused by a limitation in {{cmd.Cmd.columnize}} in that it doesn't 
> accept unicode, which our identifiers are. Ending stack trace:
> {noformat}
> "...bin/cqlsh.py", ... in describe_usertypes
> cmd.Cmd.columnize(self, protect_names(ksmeta.user_types.keys()))
>   File "/Users/adamholmberg/.pyenv/versions/2.7.8/lib/python2.7/cmd.py", line 
> 363, in columnize
> ", ".join(map(str, nonstrings)))
> TypeError: list[i] not a string for i in 0, 1, 2, 3, 4
> {noformat}
> This was previously obscured because the driver was incorrectly encoding 
> identifiers in {{protect_name}}, which caused other problems for cqlsh schema 
> generation. With that 
> [change|https://github.com/datastax/python-driver/commit/0959b5dc1662d6957f2951738d0a4f053ac78f66],
>  we now must encode identifiers in cqlsh to avoid blowing up {{columnize}}.



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

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

2016-11-29 Thread tylerhobbs 
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/d70b336d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d70b336d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d70b336d

Branch: refs/heads/cassandra-3.0
Commit: d70b336de3f70e29858f7368e37bf7333fa1222c
Parents: 820e7a8 d38bf9f
Author: Tyler Hobbs 
Authored: Tue Nov 29 15:30:35 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Nov 29 15:30:35 2016 -0600

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 
 2 files changed, 17 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d70b336d/CHANGES.txt
--
diff --cc CHANGES.txt
index b77d84a,d951b07..32bd821
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,48 -1,7 +1,49 @@@
 -2.2.9
 +3.0.11
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 +Merged from 2.2:
+  * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
   * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
   * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
 +
 +
 +3.0.10
 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
 + * Fix partition count log during compaction (CASSANDRA-12184)
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d70b336d/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index f722236,a9c5ff1..c132592
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1647,9 -1563,19 +1641,19 @@@ class Shell(cmd.Cmd)
  usertype = ksmeta.user_types[typename]
  except KeyError:
  raise

[04/15] cassandra git commit: Fix cqlsh DESC TYPES errors

2016-11-29 Thread tylerhobbs 
Fix cqlsh DESC TYPES errors

Patch by Adam Holmberg; reviewed by Tyler Hobbs for CASSANDRA-12914


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

Branch: refs/heads/cassandra-3.11
Commit: d38bf9faa47ebd4ea4edc9c6afa17abe48dbdc9e
Parents: 4fff69f
Author: Adam Holmberg 
Authored: Tue Nov 29 11:24:33 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Nov 29 15:30:09 2016 -0600

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 
 2 files changed, 17 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d38bf9fa/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index cc8ef21..d951b07 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
  * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
  * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
  * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d38bf9fa/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 514fada..a9c5ff1 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1497,12 +1497,10 @@ class Shell(cmd.Cmd):
 name = protect_name(ksmeta.name)
 print 'Keyspace %s' % (name,)
 print '-%s' % ('-' * len(name))
-cmd.Cmd.columnize(self, protect_names(ksmeta.functions.keys()))
-print
+self._columnize_unicode(ksmeta.functions.keys())
 else:
 ksmeta = self.get_keyspace_meta(ksname)
-cmd.Cmd.columnize(self, protect_names(ksmeta.functions.keys()))
-print
+self._columnize_unicode(ksmeta.functions.keys())
 
 def describe_function(self, ksname, functionname):
 if ksname is None:
@@ -1524,12 +1522,10 @@ class Shell(cmd.Cmd):
 name = protect_name(ksmeta.name)
 print 'Keyspace %s' % (name,)
 print '-%s' % ('-' * len(name))
-cmd.Cmd.columnize(self, 
protect_names(ksmeta.aggregates.keys()))
-print
+self._columnize_unicode(ksmeta.aggregates.keys())
 else:
 ksmeta = self.get_keyspace_meta(ksname)
-cmd.Cmd.columnize(self, protect_names(ksmeta.aggregates.keys()))
-print
+self._columnize_unicode(ksmeta.aggregates.keys())
 
 def describe_aggregate(self, ksname, aggregatename):
 if ksname is None:
@@ -1551,12 +1547,10 @@ class Shell(cmd.Cmd):
 name = protect_name(ksmeta.name)
 print 'Keyspace %s' % (name,)
 print '-%s' % ('-' * len(name))
-cmd.Cmd.columnize(self, 
protect_names(ksmeta.user_types.keys()))
-print
+self._columnize_unicode(ksmeta.user_types.keys(), quote=True)
 else:
 ksmeta = self.get_keyspace_meta(ksname)
-cmd.Cmd.columnize(self, protect_names(ksmeta.user_types.keys()))
-print
+self._columnize_unicode(ksmeta.user_types.keys(), quote=True)
 
 def describe_usertype(self, ksname, typename):
 if ksname is None:
@@ -1572,6 +1566,16 @@ class Shell(cmd.Cmd):
 print usertype.as_cql_query(formatted=True)
 print
 
+def _columnize_unicode(self, name_list, quote=False):
+"""
+Used when columnizing identifiers that may contain unicode
+"""
+names = [n.encode('utf-8') for n in name_list]
+if quote:
+names = protect_names(names)
+cmd.Cmd.columnize(self, names)
+print
+
 def describe_cluster(self):
 print '\nCluster: %s' % self.get_cluster_name()
 p = trim_if_present(self.get_partitioner(), 
'org.apache.cassandra.dht.')

[14/15] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

2016-11-29 Thread tylerhobbs 
Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: 04759223878aadad355d35831a867e654998ed74
Parents: fff319b 8de24ca
Author: Tyler Hobbs 
Authored: Tue Nov 29 15:34:44 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Nov 29 15:34:44 2016 -0600

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 
 2 files changed, 17 insertions(+), 12 deletions(-)
--


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

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

2016-11-29 Thread tylerhobbs 
Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 3fabc33506f5d182022917ebbc30335d75b54b72
Parents: 54877fe 0475922
Author: Tyler Hobbs 
Authored: Tue Nov 29 15:35:01 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Nov 29 15:35:01 2016 -0600

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 
 2 files changed, 17 insertions(+), 12 deletions(-)
--


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

[03/15] cassandra git commit: Fix cqlsh DESC TYPES errors

2016-11-29 Thread tylerhobbs 
Fix cqlsh DESC TYPES errors

Patch by Adam Holmberg; reviewed by Tyler Hobbs for CASSANDRA-12914


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

Branch: refs/heads/trunk
Commit: d38bf9faa47ebd4ea4edc9c6afa17abe48dbdc9e
Parents: 4fff69f
Author: Adam Holmberg 
Authored: Tue Nov 29 11:24:33 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Nov 29 15:30:09 2016 -0600

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 
 2 files changed, 17 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d38bf9fa/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index cc8ef21..d951b07 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
  * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
  * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
  * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d38bf9fa/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 514fada..a9c5ff1 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1497,12 +1497,10 @@ class Shell(cmd.Cmd):
 name = protect_name(ksmeta.name)
 print 'Keyspace %s' % (name,)
 print '-%s' % ('-' * len(name))
-cmd.Cmd.columnize(self, protect_names(ksmeta.functions.keys()))
-print
+self._columnize_unicode(ksmeta.functions.keys())
 else:
 ksmeta = self.get_keyspace_meta(ksname)
-cmd.Cmd.columnize(self, protect_names(ksmeta.functions.keys()))
-print
+self._columnize_unicode(ksmeta.functions.keys())
 
 def describe_function(self, ksname, functionname):
 if ksname is None:
@@ -1524,12 +1522,10 @@ class Shell(cmd.Cmd):
 name = protect_name(ksmeta.name)
 print 'Keyspace %s' % (name,)
 print '-%s' % ('-' * len(name))
-cmd.Cmd.columnize(self, 
protect_names(ksmeta.aggregates.keys()))
-print
+self._columnize_unicode(ksmeta.aggregates.keys())
 else:
 ksmeta = self.get_keyspace_meta(ksname)
-cmd.Cmd.columnize(self, protect_names(ksmeta.aggregates.keys()))
-print
+self._columnize_unicode(ksmeta.aggregates.keys())
 
 def describe_aggregate(self, ksname, aggregatename):
 if ksname is None:
@@ -1551,12 +1547,10 @@ class Shell(cmd.Cmd):
 name = protect_name(ksmeta.name)
 print 'Keyspace %s' % (name,)
 print '-%s' % ('-' * len(name))
-cmd.Cmd.columnize(self, 
protect_names(ksmeta.user_types.keys()))
-print
+self._columnize_unicode(ksmeta.user_types.keys(), quote=True)
 else:
 ksmeta = self.get_keyspace_meta(ksname)
-cmd.Cmd.columnize(self, protect_names(ksmeta.user_types.keys()))
-print
+self._columnize_unicode(ksmeta.user_types.keys(), quote=True)
 
 def describe_usertype(self, ksname, typename):
 if ksname is None:
@@ -1572,6 +1566,16 @@ class Shell(cmd.Cmd):
 print usertype.as_cql_query(formatted=True)
 print
 
+def _columnize_unicode(self, name_list, quote=False):
+"""
+Used when columnizing identifiers that may contain unicode
+"""
+names = [n.encode('utf-8') for n in name_list]
+if quote:
+names = protect_names(names)
+cmd.Cmd.columnize(self, names)
+print
+
 def describe_cluster(self):
 print '\nCluster: %s' % self.get_cluster_name()
 p = trim_if_present(self.get_partitioner(), 
'org.apache.cassandra.dht.')

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

2016-11-29 Thread tylerhobbs 
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/d70b336d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d70b336d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d70b336d

Branch: refs/heads/cassandra-3.X
Commit: d70b336de3f70e29858f7368e37bf7333fa1222c
Parents: 820e7a8 d38bf9f
Author: Tyler Hobbs 
Authored: Tue Nov 29 15:30:35 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Nov 29 15:30:35 2016 -0600

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 
 2 files changed, 17 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d70b336d/CHANGES.txt
--
diff --cc CHANGES.txt
index b77d84a,d951b07..32bd821
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,48 -1,7 +1,49 @@@
 -2.2.9
 +3.0.11
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 +Merged from 2.2:
+  * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
   * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
   * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
 +
 +
 +3.0.10
 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
 + * Fix partition count log during compaction (CASSANDRA-12184)
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d70b336d/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index f722236,a9c5ff1..c132592
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1647,9 -1563,19 +1641,19 @@@ class Shell(cmd.Cmd)
  usertype = ksmeta.user_types[typename]
  except KeyError:
  raise

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

2016-11-29 Thread tylerhobbs 
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/d70b336d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d70b336d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d70b336d

Branch: refs/heads/cassandra-3.11
Commit: d70b336de3f70e29858f7368e37bf7333fa1222c
Parents: 820e7a8 d38bf9f
Author: Tyler Hobbs 
Authored: Tue Nov 29 15:30:35 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Nov 29 15:30:35 2016 -0600

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 
 2 files changed, 17 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d70b336d/CHANGES.txt
--
diff --cc CHANGES.txt
index b77d84a,d951b07..32bd821
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,48 -1,7 +1,49 @@@
 -2.2.9
 +3.0.11
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 +Merged from 2.2:
+  * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
   * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
   * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
 +
 +
 +3.0.10
 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
 + * Fix partition count log during compaction (CASSANDRA-12184)
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d70b336d/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index f722236,a9c5ff1..c132592
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1647,9 -1563,19 +1641,19 @@@ class Shell(cmd.Cmd)
  usertype = ksmeta.user_types[typename]
  except KeyError:
  raise

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

2016-11-29 Thread tylerhobbs 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: 8de24ca68adbee4078ea0d1cf18bd82d7bf050bb
Parents: c4cb915 d70b336
Author: Tyler Hobbs 
Authored: Tue Nov 29 15:34:26 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Nov 29 15:34:26 2016 -0600

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 
 2 files changed, 17 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8de24ca6/CHANGES.txt
--
diff --cc CHANGES.txt
index 9579781,32bd821..72d6a1f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -156,8 -44,6 +156,9 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
   * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
++ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
 + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8de24ca6/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index 0358c83,c132592..2387342
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1391,7 -1642,18 +1385,17 @@@ class Shell(cmd.Cmd)
  except KeyError:
  raise UserTypeNotFound("User type %r not found" % typename)
  print usertype.export_as_string()
 -print
  
+ def _columnize_unicode(self, name_list, quote=False):
+ """
+ Used when columnizing identifiers that may contain unicode
+ """
+ names = [n.encode('utf-8') for n in name_list]
+ if quote:
+ names = protect_names(names)
+ cmd.Cmd.columnize(self, names)
+ print
+ 
  def describe_cluster(self):
  print '\nCluster: %s' % self.get_cluster_name()
  p = trim_if_present(self.get_partitioner(), 
'org.apache.cassandra.dht.')

[13/15] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

2016-11-29 Thread tylerhobbs 
Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 04759223878aadad355d35831a867e654998ed74
Parents: fff319b 8de24ca
Author: Tyler Hobbs 
Authored: Tue Nov 29 15:34:44 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Nov 29 15:34:44 2016 -0600

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 
 2 files changed, 17 insertions(+), 12 deletions(-)
--


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

[01/15] cassandra git commit: Fix cqlsh DESC TYPES errors

2016-11-29 Thread tylerhobbs 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 4fff69fcb -> d38bf9faa
  refs/heads/cassandra-3.0 820e7a8d8 -> d70b336de
  refs/heads/cassandra-3.11 c4cb915ea -> 8de24ca68
  refs/heads/cassandra-3.X fff319bfd -> 047592238
  refs/heads/trunk 54877fef4 -> 3fabc3350


Fix cqlsh DESC TYPES errors

Patch by Adam Holmberg; reviewed by Tyler Hobbs for CASSANDRA-12914


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

Branch: refs/heads/cassandra-2.2
Commit: d38bf9faa47ebd4ea4edc9c6afa17abe48dbdc9e
Parents: 4fff69f
Author: Adam Holmberg 
Authored: Tue Nov 29 11:24:33 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Nov 29 15:30:09 2016 -0600

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 
 2 files changed, 17 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d38bf9fa/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index cc8ef21..d951b07 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
  * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
  * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
  * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d38bf9fa/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 514fada..a9c5ff1 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1497,12 +1497,10 @@ class Shell(cmd.Cmd):
 name = protect_name(ksmeta.name)
 print 'Keyspace %s' % (name,)
 print '-%s' % ('-' * len(name))
-cmd.Cmd.columnize(self, protect_names(ksmeta.functions.keys()))
-print
+self._columnize_unicode(ksmeta.functions.keys())
 else:
 ksmeta = self.get_keyspace_meta(ksname)
-cmd.Cmd.columnize(self, protect_names(ksmeta.functions.keys()))
-print
+self._columnize_unicode(ksmeta.functions.keys())
 
 def describe_function(self, ksname, functionname):
 if ksname is None:
@@ -1524,12 +1522,10 @@ class Shell(cmd.Cmd):
 name = protect_name(ksmeta.name)
 print 'Keyspace %s' % (name,)
 print '-%s' % ('-' * len(name))
-cmd.Cmd.columnize(self, 
protect_names(ksmeta.aggregates.keys()))
-print
+self._columnize_unicode(ksmeta.aggregates.keys())
 else:
 ksmeta = self.get_keyspace_meta(ksname)
-cmd.Cmd.columnize(self, protect_names(ksmeta.aggregates.keys()))
-print
+self._columnize_unicode(ksmeta.aggregates.keys())
 
 def describe_aggregate(self, ksname, aggregatename):
 if ksname is None:
@@ -1551,12 +1547,10 @@ class Shell(cmd.Cmd):
 name = protect_name(ksmeta.name)
 print 'Keyspace %s' % (name,)
 print '-%s' % ('-' * len(name))
-cmd.Cmd.columnize(self, 
protect_names(ksmeta.user_types.keys()))
-print
+self._columnize_unicode(ksmeta.user_types.keys(), quote=True)
 else:
 ksmeta = self.get_keyspace_meta(ksname)
-cmd.Cmd.columnize(self, protect_names(ksmeta.user_types.keys()))
-print
+self._columnize_unicode(ksmeta.user_types.keys(), quote=True)
 
 def describe_usertype(self, ksname, typename):
 if ksname is None:
@@ -1572,6 +1566,16 @@ class Shell(cmd.Cmd):
 print usertype.as_cql_query(formatted=True)
 print
 
+def _columnize_unicode(self, name_list, quote=False):
+"""
+Used when columnizing identifiers that may contain unicode
+"""
+names = [n.encode('utf-8') for n in name_list]
+if quote:
+names = protect_names(names)
+cmd.Cmd.columnize(self, names)
+print
+
 def describe_cluster(self):
 print '\nCluster: %s' % self.get_cluster_name()
 p = trim_if_present(self.get_partitioner(), 
'org.apache.cassandra.dht.')

[05/15] cassandra git commit: Fix cqlsh DESC TYPES errors

2016-11-29 Thread tylerhobbs 
Fix cqlsh DESC TYPES errors

Patch by Adam Holmberg; reviewed by Tyler Hobbs for CASSANDRA-12914


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

Branch: refs/heads/cassandra-3.X
Commit: d38bf9faa47ebd4ea4edc9c6afa17abe48dbdc9e
Parents: 4fff69f
Author: Adam Holmberg 
Authored: Tue Nov 29 11:24:33 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Nov 29 15:30:09 2016 -0600

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 
 2 files changed, 17 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d38bf9fa/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index cc8ef21..d951b07 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
  * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
  * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
  * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d38bf9fa/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 514fada..a9c5ff1 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1497,12 +1497,10 @@ class Shell(cmd.Cmd):
 name = protect_name(ksmeta.name)
 print 'Keyspace %s' % (name,)
 print '-%s' % ('-' * len(name))
-cmd.Cmd.columnize(self, protect_names(ksmeta.functions.keys()))
-print
+self._columnize_unicode(ksmeta.functions.keys())
 else:
 ksmeta = self.get_keyspace_meta(ksname)
-cmd.Cmd.columnize(self, protect_names(ksmeta.functions.keys()))
-print
+self._columnize_unicode(ksmeta.functions.keys())
 
 def describe_function(self, ksname, functionname):
 if ksname is None:
@@ -1524,12 +1522,10 @@ class Shell(cmd.Cmd):
 name = protect_name(ksmeta.name)
 print 'Keyspace %s' % (name,)
 print '-%s' % ('-' * len(name))
-cmd.Cmd.columnize(self, 
protect_names(ksmeta.aggregates.keys()))
-print
+self._columnize_unicode(ksmeta.aggregates.keys())
 else:
 ksmeta = self.get_keyspace_meta(ksname)
-cmd.Cmd.columnize(self, protect_names(ksmeta.aggregates.keys()))
-print
+self._columnize_unicode(ksmeta.aggregates.keys())
 
 def describe_aggregate(self, ksname, aggregatename):
 if ksname is None:
@@ -1551,12 +1547,10 @@ class Shell(cmd.Cmd):
 name = protect_name(ksmeta.name)
 print 'Keyspace %s' % (name,)
 print '-%s' % ('-' * len(name))
-cmd.Cmd.columnize(self, 
protect_names(ksmeta.user_types.keys()))
-print
+self._columnize_unicode(ksmeta.user_types.keys(), quote=True)
 else:
 ksmeta = self.get_keyspace_meta(ksname)
-cmd.Cmd.columnize(self, protect_names(ksmeta.user_types.keys()))
-print
+self._columnize_unicode(ksmeta.user_types.keys(), quote=True)
 
 def describe_usertype(self, ksname, typename):
 if ksname is None:
@@ -1572,6 +1566,16 @@ class Shell(cmd.Cmd):
 print usertype.as_cql_query(formatted=True)
 print
 
+def _columnize_unicode(self, name_list, quote=False):
+"""
+Used when columnizing identifiers that may contain unicode
+"""
+names = [n.encode('utf-8') for n in name_list]
+if quote:
+names = protect_names(names)
+cmd.Cmd.columnize(self, names)
+print
+
 def describe_cluster(self):
 print '\nCluster: %s' % self.get_cluster_name()
 p = trim_if_present(self.get_partitioner(), 
'org.apache.cassandra.dht.')

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

2016-11-29 Thread tylerhobbs 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 8de24ca68adbee4078ea0d1cf18bd82d7bf050bb
Parents: c4cb915 d70b336
Author: Tyler Hobbs 
Authored: Tue Nov 29 15:34:26 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Nov 29 15:34:26 2016 -0600

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 
 2 files changed, 17 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8de24ca6/CHANGES.txt
--
diff --cc CHANGES.txt
index 9579781,32bd821..72d6a1f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -156,8 -44,6 +156,9 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
   * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
++ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
 + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8de24ca6/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index 0358c83,c132592..2387342
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1391,7 -1642,18 +1385,17 @@@ class Shell(cmd.Cmd)
  except KeyError:
  raise UserTypeNotFound("User type %r not found" % typename)
  print usertype.export_as_string()
 -print
  
+ def _columnize_unicode(self, name_list, quote=False):
+ """
+ Used when columnizing identifiers that may contain unicode
+ """
+ names = [n.encode('utf-8') for n in name_list]
+ if quote:
+ names = protect_names(names)
+ cmd.Cmd.columnize(self, names)
+ print
+ 
  def describe_cluster(self):
  print '\nCluster: %s' % self.get_cluster_name()
  p = trim_if_present(self.get_partitioner(), 
'org.apache.cassandra.dht.')

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

2016-11-29 Thread tylerhobbs 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.X
Commit: 8de24ca68adbee4078ea0d1cf18bd82d7bf050bb
Parents: c4cb915 d70b336
Author: Tyler Hobbs 
Authored: Tue Nov 29 15:34:26 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Nov 29 15:34:26 2016 -0600

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 
 2 files changed, 17 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8de24ca6/CHANGES.txt
--
diff --cc CHANGES.txt
index 9579781,32bd821..72d6a1f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -156,8 -44,6 +156,9 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
   * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
++ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
 + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8de24ca6/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index 0358c83,c132592..2387342
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1391,7 -1642,18 +1385,17 @@@ class Shell(cmd.Cmd)
  except KeyError:
  raise UserTypeNotFound("User type %r not found" % typename)
  print usertype.export_as_string()
 -print
  
+ def _columnize_unicode(self, name_list, quote=False):
+ """
+ Used when columnizing identifiers that may contain unicode
+ """
+ names = [n.encode('utf-8') for n in name_list]
+ if quote:
+ names = protect_names(names)
+ cmd.Cmd.columnize(self, names)
+ print
+ 
  def describe_cluster(self):
  print '\nCluster: %s' % self.get_cluster_name()
  p = trim_if_present(self.get_partitioner(), 
'org.apache.cassandra.dht.')

[02/15] cassandra git commit: Fix cqlsh DESC TYPES errors

2016-11-29 Thread tylerhobbs 
Fix cqlsh DESC TYPES errors

Patch by Adam Holmberg; reviewed by Tyler Hobbs for CASSANDRA-12914


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

Branch: refs/heads/cassandra-3.0
Commit: d38bf9faa47ebd4ea4edc9c6afa17abe48dbdc9e
Parents: 4fff69f
Author: Adam Holmberg 
Authored: Tue Nov 29 11:24:33 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Nov 29 15:30:09 2016 -0600

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 
 2 files changed, 17 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d38bf9fa/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index cc8ef21..d951b07 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.9
+ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
  * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
  * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
  * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d38bf9fa/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 514fada..a9c5ff1 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1497,12 +1497,10 @@ class Shell(cmd.Cmd):
 name = protect_name(ksmeta.name)
 print 'Keyspace %s' % (name,)
 print '-%s' % ('-' * len(name))
-cmd.Cmd.columnize(self, protect_names(ksmeta.functions.keys()))
-print
+self._columnize_unicode(ksmeta.functions.keys())
 else:
 ksmeta = self.get_keyspace_meta(ksname)
-cmd.Cmd.columnize(self, protect_names(ksmeta.functions.keys()))
-print
+self._columnize_unicode(ksmeta.functions.keys())
 
 def describe_function(self, ksname, functionname):
 if ksname is None:
@@ -1524,12 +1522,10 @@ class Shell(cmd.Cmd):
 name = protect_name(ksmeta.name)
 print 'Keyspace %s' % (name,)
 print '-%s' % ('-' * len(name))
-cmd.Cmd.columnize(self, 
protect_names(ksmeta.aggregates.keys()))
-print
+self._columnize_unicode(ksmeta.aggregates.keys())
 else:
 ksmeta = self.get_keyspace_meta(ksname)
-cmd.Cmd.columnize(self, protect_names(ksmeta.aggregates.keys()))
-print
+self._columnize_unicode(ksmeta.aggregates.keys())
 
 def describe_aggregate(self, ksname, aggregatename):
 if ksname is None:
@@ -1551,12 +1547,10 @@ class Shell(cmd.Cmd):
 name = protect_name(ksmeta.name)
 print 'Keyspace %s' % (name,)
 print '-%s' % ('-' * len(name))
-cmd.Cmd.columnize(self, 
protect_names(ksmeta.user_types.keys()))
-print
+self._columnize_unicode(ksmeta.user_types.keys(), quote=True)
 else:
 ksmeta = self.get_keyspace_meta(ksname)
-cmd.Cmd.columnize(self, protect_names(ksmeta.user_types.keys()))
-print
+self._columnize_unicode(ksmeta.user_types.keys(), quote=True)
 
 def describe_usertype(self, ksname, typename):
 if ksname is None:
@@ -1572,6 +1566,16 @@ class Shell(cmd.Cmd):
 print usertype.as_cql_query(formatted=True)
 print
 
+def _columnize_unicode(self, name_list, quote=False):
+"""
+Used when columnizing identifiers that may contain unicode
+"""
+names = [n.encode('utf-8') for n in name_list]
+if quote:
+names = protect_names(names)
+cmd.Cmd.columnize(self, names)
+print
+
 def describe_cluster(self):
 print '\nCluster: %s' % self.get_cluster_name()
 p = trim_if_present(self.get_partitioner(), 
'org.apache.cassandra.dht.')

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

2016-11-29 Thread tylerhobbs 
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/d70b336d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d70b336d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d70b336d

Branch: refs/heads/trunk
Commit: d70b336de3f70e29858f7368e37bf7333fa1222c
Parents: 820e7a8 d38bf9f
Author: Tyler Hobbs 
Authored: Tue Nov 29 15:30:35 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Nov 29 15:30:35 2016 -0600

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 
 2 files changed, 17 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d70b336d/CHANGES.txt
--
diff --cc CHANGES.txt
index b77d84a,d951b07..32bd821
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,48 -1,7 +1,49 @@@
 -2.2.9
 +3.0.11
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 +Merged from 2.2:
+  * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
   * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
   * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
 +
 +
 +3.0.10
 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
 + * Fix partition count log during compaction (CASSANDRA-12184)
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d70b336d/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index f722236,a9c5ff1..c132592
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1647,9 -1563,19 +1641,19 @@@ class Shell(cmd.Cmd)
  usertype = ksmeta.user_types[typename]
  except KeyError:
  raise UserTypeNotFound("User type

[jira] [Resolved] (CASSANDRA-12918) Create hint directory in FailureDetectorTest

2016-11-29 Thread Jason Brown (JIRA) 

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

Jason Brown resolved CASSANDRA-12918.
-
Resolution: Duplicate

a semi dupe of CASSANDRA-12966

> Create hint directory in FailureDetectorTest
> 
>
> Key: CASSANDRA-12918
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12918
> Project: Cassandra
>  Issue Type: Bug
>Reporter: sankalp kohli
>Assignee: sankalp kohli
>Priority: Trivial
> Attachments: CASSANDRA-12918_trunk.diff
>
>
> We see the below exception while running the FailureDetectorTest
> FSReadError in build/test/cassandra/hints:181
>   at org.apache.cassandra.hints.HintsCatalog.load(HintsCatalog.java:70)
>   at org.apache.cassandra.hints.HintsService.(HintsService.java:88)
>   at 
> org.apache.cassandra.hints.HintsService.(HintsService.java:63)
>   at 
> org.apache.cassandra.service.StorageService.excise(StorageService.java:2239)
>   at 
> org.apache.cassandra.service.StorageService.excise(StorageService.java:2252)
>   at 
> org.apache.cassandra.service.StorageService.handleStateLeft(StorageService.java:2156)
>   at 
> org.apache.cassandra.service.StorageService.onChange(StorageService.java:1744)
>   at 
> org.apache.cassandra.gms.FailureDetectorTest.testConvictAfterLeft(FailureDetectorTest.java:75)
> Caused by: java.nio.file.NoSuchFileException: build/test/cassandra/hints:181
>   at 
> sun.nio.fs.UnixException.translateToIOException(UnixException.java:86)
>   at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:102)
>   at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:107)
>   at 
> sun.nio.fs.UnixFileSystemProvider.newDirectoryStream(UnixFileSystemProvider.java:427)
>   at java.nio.file.Files.newDirectoryStream(Files.java:457)
>   at java.nio.file.Files.list(Files.java:3451)
>   at org.apache.cassandra.hints.HintsCatalog.load(HintsCatalog.java:62)



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

[jira] [Updated] (CASSANDRA-12918) Create hint directory in FailureDetectorTest

2016-11-29 Thread Jason Brown (JIRA) 

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

Jason Brown updated CASSANDRA-12918:

Status: Open  (was: Patch Available)

This fix was necessitated due to our internal implementation of 
CASSANDRA-12966. Thus, I'm closing this patch as CASSANDRA-12966 which 
introduces the problem, should be responsible for resolving it.

> Create hint directory in FailureDetectorTest
> 
>
> Key: CASSANDRA-12918
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12918
> Project: Cassandra
>  Issue Type: Bug
>Reporter: sankalp kohli
>Assignee: sankalp kohli
>Priority: Trivial
> Attachments: CASSANDRA-12918_trunk.diff
>
>
> We see the below exception while running the FailureDetectorTest
> FSReadError in build/test/cassandra/hints:181
>   at org.apache.cassandra.hints.HintsCatalog.load(HintsCatalog.java:70)
>   at org.apache.cassandra.hints.HintsService.(HintsService.java:88)
>   at 
> org.apache.cassandra.hints.HintsService.(HintsService.java:63)
>   at 
> org.apache.cassandra.service.StorageService.excise(StorageService.java:2239)
>   at 
> org.apache.cassandra.service.StorageService.excise(StorageService.java:2252)
>   at 
> org.apache.cassandra.service.StorageService.handleStateLeft(StorageService.java:2156)
>   at 
> org.apache.cassandra.service.StorageService.onChange(StorageService.java:1744)
>   at 
> org.apache.cassandra.gms.FailureDetectorTest.testConvictAfterLeft(FailureDetectorTest.java:75)
> Caused by: java.nio.file.NoSuchFileException: build/test/cassandra/hints:181
>   at 
> sun.nio.fs.UnixException.translateToIOException(UnixException.java:86)
>   at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:102)
>   at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:107)
>   at 
> sun.nio.fs.UnixFileSystemProvider.newDirectoryStream(UnixFileSystemProvider.java:427)
>   at java.nio.file.Files.newDirectoryStream(Files.java:457)
>   at java.nio.file.Files.list(Files.java:3451)
>   at org.apache.cassandra.hints.HintsCatalog.load(HintsCatalog.java:62)



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

cassandra git commit: ninja fix CHANGES.txt

2016-11-29 Thread jasobrown 
Repository: cassandra
Updated Branches:
  refs/heads/trunk 6622f8730 -> 54877fef4


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

Branch: refs/heads/trunk
Commit: 54877fef463fececaf3cb9274bb4baae3994a692
Parents: 6622f87
Author: Jason Brown 
Authored: Tue Nov 29 11:21:54 2016 -0800
Committer: Jason Brown 
Committed: Tue Nov 29 11:21:54 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/54877fef/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 8e98260..d76bf8c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,13 +7,13 @@
 
 
 3.12
- * Remove timing window in test case (CASSANDRA-12875)
- * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
  * cqlsh auto completion: refactor definition of compaction strategy options 
(CASSANDRA-12946)
  * Add support for arithmetic operators (CASSANDRA-11935)
 
 
 3.10
+ * Remove timing window in test case (CASSANDRA-12875)
+ * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
  * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
  * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
  * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)

[2/3] cassandra git commit: ninja fix CHANGES.txt

2016-11-29 Thread jasobrown 
ninja 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/fff319bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fff319bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fff319bf

Branch: refs/heads/trunk
Commit: fff319bfd62d7f8652b71ff4eeaad8c0260e4427
Parents: 979f5f5
Author: Jason Brown 
Authored: Tue Nov 29 11:18:29 2016 -0800
Committer: Jason Brown 
Committed: Tue Nov 29 11:18:29 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fff319bf/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index fb85765..2aab0b2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,11 @@
 3.12
- * Remove timing window in test case (CASSANDRA-12875)
- * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
  * cqlsh auto completion: refactor definition of compaction strategy options 
(CASSANDRA-12946)
  * Add support for arithmetic operators (CASSANDRA-11935)
 
 
 3.10
+ * Remove timing window in test case (CASSANDRA-12875)
+ * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
  * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
  * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
  * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)

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

2016-11-29 Thread jasobrown 
Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 6622f8730cd92f6f270938227fd0cbf50020352f
Parents: db0be34 fff319b
Author: Jason Brown 
Authored: Tue Nov 29 11:18:56 2016 -0800
Committer: Jason Brown 
Committed: Tue Nov 29 11:19:13 2016 -0800

--

--

[1/3] cassandra git commit: ninja fix CHANGES.txt

2016-11-29 Thread jasobrown 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.X 979f5f58e -> fff319bfd
  refs/heads/trunk db0be3465 -> 6622f8730


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

Branch: refs/heads/cassandra-3.X
Commit: fff319bfd62d7f8652b71ff4eeaad8c0260e4427
Parents: 979f5f5
Author: Jason Brown 
Authored: Tue Nov 29 11:18:29 2016 -0800
Committer: Jason Brown 
Committed: Tue Nov 29 11:18:29 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fff319bf/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index fb85765..2aab0b2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,11 @@
 3.12
- * Remove timing window in test case (CASSANDRA-12875)
- * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
  * cqlsh auto completion: refactor definition of compaction strategy options 
(CASSANDRA-12946)
  * Add support for arithmetic operators (CASSANDRA-11935)
 
 
 3.10
+ * Remove timing window in test case (CASSANDRA-12875)
+ * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
  * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
  * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
  * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)

[jira] [Updated] (CASSANDRA-12875) testall failure in org.apache.cassandra.net.MessagingServiceTest.testDCLatency-compression

2016-11-29 Thread Jason Brown (JIRA) 

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

Jason Brown updated CASSANDRA-12875:

Fix Version/s: 3.10

> testall failure in 
> org.apache.cassandra.net.MessagingServiceTest.testDCLatency-compression
> --
>
> Key: CASSANDRA-12875
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12875
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>Assignee: Chris Lohfink
>  Labels: test-failure, testall
> Fix For: 3.10, 4.0, 3.12
>
> Attachments: 12875.patch
>
>
> example failure:
> http://cassci.datastax.com/job/cassandra-3.X_testall/54/testReport/org.apache.cassandra.net/MessagingServiceTest/testDCLatency_compression/
> {code}
> Error Message
> expected:<107964792> but was:<129557750>
> {code}{code}
> Stacktrace
> junit.framework.AssertionFailedError: expected:<107964792> but was:<129557750>
>   at 
> org.apache.cassandra.net.MessagingServiceTest.testDCLatency(MessagingServiceTest.java:115)
> {code}



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

[jira] [Comment Edited] (CASSANDRA-12945) Resolve unit testing without JCE security libraries installed

2016-11-29 Thread Jason Brown (JIRA) 

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

Jason Brown edited comment on CASSANDRA-12945 at 11/29/16 7:12 PM:
---

backported to cassandra-3.11 as c4cb915eaf18569266e9e5223c1a3029431b00dc


was (Author: jasobrown):
backported to cassandra-3.11 as f87d074cd2eadd34cc496d6267a8039e8a54cbd4

> Resolve unit testing without JCE security libraries installed
> -
>
> Key: CASSANDRA-12945
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12945
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core
>Reporter: Jason Brown
>Assignee: Stefan Podkowinski
> Fix For: 3.10, 4.0, 3.12
>
> Attachments: 12945-3.X.patch
>
>
> Running unit tests can fail on encryption-related tests if you don't have 
> something like the Oracle JCE libraries installed in your jdk. We can't 
> redistribute the Oracle JCE due to export laws, then we'd need to somehow get 
> it into the /jre/lib/security.
> One possibility is to ignore encryption-related tests if there is no 
> encryption lib available. Another is to ship something like bouncycastle.jar 
> in the test directory.



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

[jira] [Commented] (CASSANDRA-12875) testall failure in org.apache.cassandra.net.MessagingServiceTest.testDCLatency-compression

2016-11-29 Thread Jason Brown (JIRA) 

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

Jason Brown commented on CASSANDRA-12875:
-

backported to cassandra-3.11 as f87d074cd2eadd34cc496d6267a8039e8a54cbd4

> testall failure in 
> org.apache.cassandra.net.MessagingServiceTest.testDCLatency-compression
> --
>
> Key: CASSANDRA-12875
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12875
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>Assignee: Chris Lohfink
>  Labels: test-failure, testall
> Fix For: 3.10, 4.0, 3.12
>
> Attachments: 12875.patch
>
>
> example failure:
> http://cassci.datastax.com/job/cassandra-3.X_testall/54/testReport/org.apache.cassandra.net/MessagingServiceTest/testDCLatency_compression/
> {code}
> Error Message
> expected:<107964792> but was:<129557750>
> {code}{code}
> Stacktrace
> junit.framework.AssertionFailedError: expected:<107964792> but was:<129557750>
>   at 
> org.apache.cassandra.net.MessagingServiceTest.testDCLatency(MessagingServiceTest.java:115)
> {code}



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

[jira] [Updated] (CASSANDRA-12945) Resolve unit testing without JCE security libraries installed

2016-11-29 Thread Jason Brown (JIRA) 

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

Jason Brown updated CASSANDRA-12945:

Fix Version/s: 3.10

> Resolve unit testing without JCE security libraries installed
> -
>
> Key: CASSANDRA-12945
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12945
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core
>Reporter: Jason Brown
>Assignee: Stefan Podkowinski
> Fix For: 3.10, 4.0, 3.12
>
> Attachments: 12945-3.X.patch
>
>
> Running unit tests can fail on encryption-related tests if you don't have 
> something like the Oracle JCE libraries installed in your jdk. We can't 
> redistribute the Oracle JCE due to export laws, then we'd need to somehow get 
> it into the /jre/lib/security.
> One possibility is to ignore encryption-related tests if there is no 
> encryption lib available. Another is to ship something like bouncycastle.jar 
> in the test directory.



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

[jira] [Commented] (CASSANDRA-12945) Resolve unit testing without JCE security libraries installed

2016-11-29 Thread Jason Brown (JIRA) 

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

Jason Brown commented on CASSANDRA-12945:
-

backported to cassandra-3.11 as f87d074cd2eadd34cc496d6267a8039e8a54cbd4

> Resolve unit testing without JCE security libraries installed
> -
>
> Key: CASSANDRA-12945
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12945
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core
>Reporter: Jason Brown
>Assignee: Stefan Podkowinski
> Fix For: 3.10, 4.0, 3.12
>
> Attachments: 12945-3.X.patch
>
>
> Running unit tests can fail on encryption-related tests if you don't have 
> something like the Oracle JCE libraries installed in your jdk. We can't 
> redistribute the Oracle JCE due to export laws, then we'd need to somehow get 
> it into the /jre/lib/security.
> One possibility is to ignore encryption-related tests if there is no 
> encryption lib available. Another is to ship something like bouncycastle.jar 
> in the test directory.



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

[7/9] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

2016-11-29 Thread jasobrown 
Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 979f5f58ecd51e7a9a819faecd1c441d3cdad9ba
Parents: 4004302 c4cb915
Author: Jason Brown 
Authored: Tue Nov 29 11:07:03 2016 -0800
Committer: Jason Brown 
Committed: Tue Nov 29 11:07:03 2016 -0800

--

--

[1/9] cassandra git commit: Remove timing window in test case

2016-11-29 Thread jasobrown 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 d5dbd0c75 -> c4cb915ea
  refs/heads/cassandra-3.X 40043021b -> 979f5f58e
  refs/heads/trunk 50b8be4e7 -> db0be3465


Remove timing window in test case

patch by Chris Lohfink; reviewed by Stefan Podkowinski for CASSANDRA-12875


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

Branch: refs/heads/cassandra-3.11
Commit: f87d074cd2eadd34cc496d6267a8039e8a54cbd4
Parents: d5dbd0c
Author: Chris Lohfink 
Authored: Wed Nov 9 08:41:41 2016 -0600
Committer: Jason Brown 
Committed: Tue Nov 29 11:05:25 2016 -0800

--
 CHANGES.txt |  2 ++
 .../cassandra/net/IncomingTcpConnection.java|  5 +++--
 .../org/apache/cassandra/net/MessageIn.java |  4 +---
 .../cassandra/net/MessagingServiceTest.java | 20 
 4 files changed, 14 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f87d074c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 2cd0eb0..9579781 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 3.10
+ * Remove timing window in test case (CASSANDRA-12875)
+ * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
  * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
  * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
  * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f87d074c/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
--
diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java 
b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index 7d3c607..9878590 100644
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@ -39,6 +39,7 @@ import org.apache.cassandra.config.Config;
 import org.xerial.snappy.SnappyInputStream;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.UnknownColumnFamilyException;
+import org.apache.cassandra.db.monitoring.ApproximateTime;
 import org.apache.cassandra.io.util.DataInputPlus;
 import org.apache.cassandra.io.util.DataInputPlus.DataInputStreamPlus;
 import org.apache.cassandra.io.util.NIODataInputStream;
@@ -187,8 +188,8 @@ public class IncomingTcpConnection extends 
FastThreadLocalThread implements Clos
 id = Integer.parseInt(input.readUTF());
 else
 id = input.readInt();
-
-MessageIn message = MessageIn.read(input, version, id, 
MessageIn.readConstructionTime(from, input));
+long currentTime = ApproximateTime.currentTimeMillis();
+MessageIn message = MessageIn.read(input, version, id, 
MessageIn.readConstructionTime(from, input, currentTime));
 if (message == null)
 {
 // callback expired; nothing to do

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f87d074c/src/java/org/apache/cassandra/net/MessageIn.java
--
diff --git a/src/java/org/apache/cassandra/net/MessageIn.java 
b/src/java/org/apache/cassandra/net/MessageIn.java
index a254741..0de9520 100644
--- a/src/java/org/apache/cassandra/net/MessageIn.java
+++ b/src/java/org/apache/cassandra/net/MessageIn.java
@@ -124,10 +124,8 @@ public class MessageIn
 return MessageIn.create(from, payload, parameters, verb, version, 
constructionTime);
 }
 
-public static long readConstructionTime(InetAddress from, DataInputPlus 
input) throws IOException
+public static long readConstructionTime(InetAddress from, DataInputPlus 
input, long currentTime) throws IOException
 {
-long currentTime = ApproximateTime.currentTimeMillis();
-
 // Reconstruct the message construction time sent by the remote host 
(we sent only the lower 4 bytes, assuming the
 // higher 4 bytes wouldn't change between the sender and receiver)
 int partial = input.readInt(); // make sure to readInt, even if 
cross_node_to is not enabled

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f87d074c/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
--
diff --git a/test/unit/org/apache/cassandra/net/MessagingServiceTest.java

[4/9] cassandra git commit: Replace keystore for utests with non export restricted cipher keys

2016-11-29 Thread jasobrown 
Replace keystore for utests with non export restricted cipher keys

patch by Stefan Podkowinski; reviewed by Jason Brown for CASSANDRA-12945


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

Branch: refs/heads/cassandra-3.11
Commit: c4cb915eaf18569266e9e5223c1a3029431b00dc
Parents: f87d074
Author: Stefan Podkowinski 
Authored: Thu Nov 24 09:23:40 2016 +0100
Committer: Jason Brown 
Committed: Tue Nov 29 11:06:08 2016 -0800

--
 test/conf/cassandra.keystore | Bin 1004 -> 972 bytes
 .../3.4-encrypted/CommitLog-6-1452918948163.log  | Bin 872373 -> 0 bytes
 .../3.4-encrypted/CommitLog-6-1480001790338.log  | Bin 0 -> 1452357 bytes
 .../3.4-encrypted/CommitLog-6-1480001790339.log  | Bin 0 -> 137 bytes
 .../data/legacy-commitlog/3.4-encrypted/hash.txt |   8 
 5 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/conf/cassandra.keystore
--
diff --git a/test/conf/cassandra.keystore b/test/conf/cassandra.keystore
index 9a704ca..da88524 100644
Binary files a/test/conf/cassandra.keystore and b/test/conf/cassandra.keystore 
differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1452918948163.log
--
diff --git 
a/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1452918948163.log 
b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1452918948163.log
deleted file mode 100644
index 3be1fcf..000
Binary files 
a/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1452918948163.log and 
/dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790338.log
--
diff --git 
a/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790338.log 
b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790338.log
new file mode 100644
index 000..2a04c6f
Binary files /dev/null and 
b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790338.log differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790339.log
--
diff --git 
a/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790339.log 
b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790339.log
new file mode 100644
index 000..8606496
Binary files /dev/null and 
b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790339.log differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/data/legacy-commitlog/3.4-encrypted/hash.txt
--
diff --git a/test/data/legacy-commitlog/3.4-encrypted/hash.txt 
b/test/data/legacy-commitlog/3.4-encrypted/hash.txt
index d4cca55..36e29ce 100644
--- a/test/data/legacy-commitlog/3.4-encrypted/hash.txt
+++ b/test/data/legacy-commitlog/3.4-encrypted/hash.txt
@@ -1,5 +1,5 @@
 #CommitLog upgrade test, version 3.4-SNAPSHOT
-#Fri Jan 15 20:35:53 PST 2016
-cells=8777
-hash=-542543236
-cfid=9debf690-bc0a-11e5-9ac3-9fafc76bc377
+#Thu Nov 24 16:36:34 CET 2016
+cells=14561
+hash=2026350947
+cfid=c5b59a80-b25b-11e6-b205-bb359f887ad3

[6/9] cassandra git commit: Replace keystore for utests with non export restricted cipher keys

2016-11-29 Thread jasobrown 
Replace keystore for utests with non export restricted cipher keys

patch by Stefan Podkowinski; reviewed by Jason Brown for CASSANDRA-12945


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

Branch: refs/heads/trunk
Commit: c4cb915eaf18569266e9e5223c1a3029431b00dc
Parents: f87d074
Author: Stefan Podkowinski 
Authored: Thu Nov 24 09:23:40 2016 +0100
Committer: Jason Brown 
Committed: Tue Nov 29 11:06:08 2016 -0800

--
 test/conf/cassandra.keystore | Bin 1004 -> 972 bytes
 .../3.4-encrypted/CommitLog-6-1452918948163.log  | Bin 872373 -> 0 bytes
 .../3.4-encrypted/CommitLog-6-1480001790338.log  | Bin 0 -> 1452357 bytes
 .../3.4-encrypted/CommitLog-6-1480001790339.log  | Bin 0 -> 137 bytes
 .../data/legacy-commitlog/3.4-encrypted/hash.txt |   8 
 5 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/conf/cassandra.keystore
--
diff --git a/test/conf/cassandra.keystore b/test/conf/cassandra.keystore
index 9a704ca..da88524 100644
Binary files a/test/conf/cassandra.keystore and b/test/conf/cassandra.keystore 
differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1452918948163.log
--
diff --git 
a/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1452918948163.log 
b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1452918948163.log
deleted file mode 100644
index 3be1fcf..000
Binary files 
a/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1452918948163.log and 
/dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790338.log
--
diff --git 
a/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790338.log 
b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790338.log
new file mode 100644
index 000..2a04c6f
Binary files /dev/null and 
b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790338.log differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790339.log
--
diff --git 
a/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790339.log 
b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790339.log
new file mode 100644
index 000..8606496
Binary files /dev/null and 
b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790339.log differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/data/legacy-commitlog/3.4-encrypted/hash.txt
--
diff --git a/test/data/legacy-commitlog/3.4-encrypted/hash.txt 
b/test/data/legacy-commitlog/3.4-encrypted/hash.txt
index d4cca55..36e29ce 100644
--- a/test/data/legacy-commitlog/3.4-encrypted/hash.txt
+++ b/test/data/legacy-commitlog/3.4-encrypted/hash.txt
@@ -1,5 +1,5 @@
 #CommitLog upgrade test, version 3.4-SNAPSHOT
-#Fri Jan 15 20:35:53 PST 2016
-cells=8777
-hash=-542543236
-cfid=9debf690-bc0a-11e5-9ac3-9fafc76bc377
+#Thu Nov 24 16:36:34 CET 2016
+cells=14561
+hash=2026350947
+cfid=c5b59a80-b25b-11e6-b205-bb359f887ad3

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

2016-11-29 Thread jasobrown 
Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: db0be3465d80c66f206c41ae2fcf917fd6644f1b
Parents: 50b8be4 979f5f5
Author: Jason Brown 
Authored: Tue Nov 29 11:08:58 2016 -0800
Committer: Jason Brown 
Committed: Tue Nov 29 11:08:58 2016 -0800

--

--

[8/9] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

2016-11-29 Thread jasobrown 
Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: 979f5f58ecd51e7a9a819faecd1c441d3cdad9ba
Parents: 4004302 c4cb915
Author: Jason Brown 
Authored: Tue Nov 29 11:07:03 2016 -0800
Committer: Jason Brown 
Committed: Tue Nov 29 11:07:03 2016 -0800

--

--

[3/9] cassandra git commit: Remove timing window in test case

2016-11-29 Thread jasobrown 
Remove timing window in test case

patch by Chris Lohfink; reviewed by Stefan Podkowinski for CASSANDRA-12875


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

Branch: refs/heads/trunk
Commit: f87d074cd2eadd34cc496d6267a8039e8a54cbd4
Parents: d5dbd0c
Author: Chris Lohfink 
Authored: Wed Nov 9 08:41:41 2016 -0600
Committer: Jason Brown 
Committed: Tue Nov 29 11:05:25 2016 -0800

--
 CHANGES.txt |  2 ++
 .../cassandra/net/IncomingTcpConnection.java|  5 +++--
 .../org/apache/cassandra/net/MessageIn.java |  4 +---
 .../cassandra/net/MessagingServiceTest.java | 20 
 4 files changed, 14 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f87d074c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 2cd0eb0..9579781 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 3.10
+ * Remove timing window in test case (CASSANDRA-12875)
+ * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
  * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
  * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
  * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f87d074c/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
--
diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java 
b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index 7d3c607..9878590 100644
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@ -39,6 +39,7 @@ import org.apache.cassandra.config.Config;
 import org.xerial.snappy.SnappyInputStream;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.UnknownColumnFamilyException;
+import org.apache.cassandra.db.monitoring.ApproximateTime;
 import org.apache.cassandra.io.util.DataInputPlus;
 import org.apache.cassandra.io.util.DataInputPlus.DataInputStreamPlus;
 import org.apache.cassandra.io.util.NIODataInputStream;
@@ -187,8 +188,8 @@ public class IncomingTcpConnection extends 
FastThreadLocalThread implements Clos
 id = Integer.parseInt(input.readUTF());
 else
 id = input.readInt();
-
-MessageIn message = MessageIn.read(input, version, id, 
MessageIn.readConstructionTime(from, input));
+long currentTime = ApproximateTime.currentTimeMillis();
+MessageIn message = MessageIn.read(input, version, id, 
MessageIn.readConstructionTime(from, input, currentTime));
 if (message == null)
 {
 // callback expired; nothing to do

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f87d074c/src/java/org/apache/cassandra/net/MessageIn.java
--
diff --git a/src/java/org/apache/cassandra/net/MessageIn.java 
b/src/java/org/apache/cassandra/net/MessageIn.java
index a254741..0de9520 100644
--- a/src/java/org/apache/cassandra/net/MessageIn.java
+++ b/src/java/org/apache/cassandra/net/MessageIn.java
@@ -124,10 +124,8 @@ public class MessageIn
 return MessageIn.create(from, payload, parameters, verb, version, 
constructionTime);
 }
 
-public static long readConstructionTime(InetAddress from, DataInputPlus 
input) throws IOException
+public static long readConstructionTime(InetAddress from, DataInputPlus 
input, long currentTime) throws IOException
 {
-long currentTime = ApproximateTime.currentTimeMillis();
-
 // Reconstruct the message construction time sent by the remote host 
(we sent only the lower 4 bytes, assuming the
 // higher 4 bytes wouldn't change between the sender and receiver)
 int partial = input.readInt(); // make sure to readInt, even if 
cross_node_to is not enabled

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f87d074c/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
--
diff --git a/test/unit/org/apache/cassandra/net/MessagingServiceTest.java 
b/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
index ec27b7e..11d17b8 100644
--- a/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
+++ b/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
@@ -34,20

[5/9] cassandra git commit: Replace keystore for utests with non export restricted cipher keys

2016-11-29 Thread jasobrown 
Replace keystore for utests with non export restricted cipher keys

patch by Stefan Podkowinski; reviewed by Jason Brown for CASSANDRA-12945


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

Branch: refs/heads/cassandra-3.X
Commit: c4cb915eaf18569266e9e5223c1a3029431b00dc
Parents: f87d074
Author: Stefan Podkowinski 
Authored: Thu Nov 24 09:23:40 2016 +0100
Committer: Jason Brown 
Committed: Tue Nov 29 11:06:08 2016 -0800

--
 test/conf/cassandra.keystore | Bin 1004 -> 972 bytes
 .../3.4-encrypted/CommitLog-6-1452918948163.log  | Bin 872373 -> 0 bytes
 .../3.4-encrypted/CommitLog-6-1480001790338.log  | Bin 0 -> 1452357 bytes
 .../3.4-encrypted/CommitLog-6-1480001790339.log  | Bin 0 -> 137 bytes
 .../data/legacy-commitlog/3.4-encrypted/hash.txt |   8 
 5 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/conf/cassandra.keystore
--
diff --git a/test/conf/cassandra.keystore b/test/conf/cassandra.keystore
index 9a704ca..da88524 100644
Binary files a/test/conf/cassandra.keystore and b/test/conf/cassandra.keystore 
differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1452918948163.log
--
diff --git 
a/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1452918948163.log 
b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1452918948163.log
deleted file mode 100644
index 3be1fcf..000
Binary files 
a/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1452918948163.log and 
/dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790338.log
--
diff --git 
a/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790338.log 
b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790338.log
new file mode 100644
index 000..2a04c6f
Binary files /dev/null and 
b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790338.log differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790339.log
--
diff --git 
a/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790339.log 
b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790339.log
new file mode 100644
index 000..8606496
Binary files /dev/null and 
b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790339.log differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/data/legacy-commitlog/3.4-encrypted/hash.txt
--
diff --git a/test/data/legacy-commitlog/3.4-encrypted/hash.txt 
b/test/data/legacy-commitlog/3.4-encrypted/hash.txt
index d4cca55..36e29ce 100644
--- a/test/data/legacy-commitlog/3.4-encrypted/hash.txt
+++ b/test/data/legacy-commitlog/3.4-encrypted/hash.txt
@@ -1,5 +1,5 @@
 #CommitLog upgrade test, version 3.4-SNAPSHOT
-#Fri Jan 15 20:35:53 PST 2016
-cells=8777
-hash=-542543236
-cfid=9debf690-bc0a-11e5-9ac3-9fafc76bc377
+#Thu Nov 24 16:36:34 CET 2016
+cells=14561
+hash=2026350947
+cfid=c5b59a80-b25b-11e6-b205-bb359f887ad3

[2/9] cassandra git commit: Remove timing window in test case

2016-11-29 Thread jasobrown 
Remove timing window in test case

patch by Chris Lohfink; reviewed by Stefan Podkowinski for CASSANDRA-12875


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

Branch: refs/heads/cassandra-3.X
Commit: f87d074cd2eadd34cc496d6267a8039e8a54cbd4
Parents: d5dbd0c
Author: Chris Lohfink 
Authored: Wed Nov 9 08:41:41 2016 -0600
Committer: Jason Brown 
Committed: Tue Nov 29 11:05:25 2016 -0800

--
 CHANGES.txt |  2 ++
 .../cassandra/net/IncomingTcpConnection.java|  5 +++--
 .../org/apache/cassandra/net/MessageIn.java |  4 +---
 .../cassandra/net/MessagingServiceTest.java | 20 
 4 files changed, 14 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f87d074c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 2cd0eb0..9579781 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 3.10
+ * Remove timing window in test case (CASSANDRA-12875)
+ * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
  * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
  * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
  * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f87d074c/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
--
diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java 
b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index 7d3c607..9878590 100644
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@ -39,6 +39,7 @@ import org.apache.cassandra.config.Config;
 import org.xerial.snappy.SnappyInputStream;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.UnknownColumnFamilyException;
+import org.apache.cassandra.db.monitoring.ApproximateTime;
 import org.apache.cassandra.io.util.DataInputPlus;
 import org.apache.cassandra.io.util.DataInputPlus.DataInputStreamPlus;
 import org.apache.cassandra.io.util.NIODataInputStream;
@@ -187,8 +188,8 @@ public class IncomingTcpConnection extends 
FastThreadLocalThread implements Clos
 id = Integer.parseInt(input.readUTF());
 else
 id = input.readInt();
-
-MessageIn message = MessageIn.read(input, version, id, 
MessageIn.readConstructionTime(from, input));
+long currentTime = ApproximateTime.currentTimeMillis();
+MessageIn message = MessageIn.read(input, version, id, 
MessageIn.readConstructionTime(from, input, currentTime));
 if (message == null)
 {
 // callback expired; nothing to do

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f87d074c/src/java/org/apache/cassandra/net/MessageIn.java
--
diff --git a/src/java/org/apache/cassandra/net/MessageIn.java 
b/src/java/org/apache/cassandra/net/MessageIn.java
index a254741..0de9520 100644
--- a/src/java/org/apache/cassandra/net/MessageIn.java
+++ b/src/java/org/apache/cassandra/net/MessageIn.java
@@ -124,10 +124,8 @@ public class MessageIn
 return MessageIn.create(from, payload, parameters, verb, version, 
constructionTime);
 }
 
-public static long readConstructionTime(InetAddress from, DataInputPlus 
input) throws IOException
+public static long readConstructionTime(InetAddress from, DataInputPlus 
input, long currentTime) throws IOException
 {
-long currentTime = ApproximateTime.currentTimeMillis();
-
 // Reconstruct the message construction time sent by the remote host 
(we sent only the lower 4 bytes, assuming the
 // higher 4 bytes wouldn't change between the sender and receiver)
 int partial = input.readInt(); // make sure to readInt, even if 
cross_node_to is not enabled

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f87d074c/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
--
diff --git a/test/unit/org/apache/cassandra/net/MessagingServiceTest.java 
b/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
index ec27b7e..11d17b8 100644
--- a/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
+++ b/test/unit/org/apache/cassandra/net/MessagingServiceTest.java
@@

[jira] [Commented] (CASSANDRA-12966) Gossip thread slows down when using batch commit log

2016-11-29 Thread Jason Brown (JIRA) 

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

Jason Brown commented on CASSANDRA-12966:
-

I've chosen to solve this by updating {{SystemKeyspace}} in the following ways:
- remove the {{synchronized}} keyword from the functions that update the 
{{peers}} table
- on those same functions, execute the update to the {{peers}} asynchronously, 
on a mutation stage thread, instead of blocking the current thread (which is 
often the Gossip stage thread)
- return a {{Future}} from those functions so that tests can behave properly

||3.0||3.X||trunk||
|[branch|https://github.com/jasobrown/cassandra/tree/12966_3.0]|[branch|https://github.com/jasobrown/cassandra/tree/12966_3.X]|[branch|https://github.com/jasobrown/cassandra/tree/12966_trunk]|
|[dtest|http://cassci.datastax.com/view/Dev/view/jasobrown/job/jasobrown-12966_3.0-dtest/]|[dtest|http://cassci.datastax.com/view/Dev/view/jasobrown/job/jasobrown-12966_3.X-dtest/]|[dtest|http://cassci.datastax.com/view/Dev/view/jasobrown/job/jasobrown-12966_trunk-dtest/]|
|[testall|http://cassci.datastax.com/view/Dev/view/jasobrown/job/jasobrown-12966_3.0-testall/]|[testall|http://cassci.datastax.com/view/Dev/view/jasobrown/job/jasobrown-12966_3.X-testall/]|[testall|http://cassci.datastax.com/view/Dev/view/jasobrown/job/jasobrown-12966_trunk-testall/]|

> Gossip thread slows down when using batch commit log
> 
>
> Key: CASSANDRA-12966
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12966
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Jason Brown
>Assignee: Jason Brown
>Priority: Minor
>
> When using batch commit log mode, the Gossip thread slows down when peers 
> after a node bounces. This is because we perform a bunch of updates to the 
> peers table via {{SystemKeyspace.updatePeerInfo}}, which is a synchronized 
> method. How quickly each one of those individual updates takes depends on how 
> busy the system is at the time wrt write traffic. If the system is largely 
> quiescent, each update will be relatively quick (just waiting for the fsync). 
> If the system is getting a lot of writes, and depending on the 
> commitlog_sync_batch_window_in_ms, each of the Gossip thread's updates can 
> get stuck in the backlog, which causes the Gossip thread to stop processing. 
> We have observed in large clusters that a rolling restart causes triggers and 
> exacerbates this behavior. 



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

[jira] [Updated] (CASSANDRA-12966) Gossip thread slows down when using batch commit log

2016-11-29 Thread Jason Brown (JIRA) 

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

Jason Brown updated CASSANDRA-12966:

Status: Patch Available  (was: Open)

> Gossip thread slows down when using batch commit log
> 
>
> Key: CASSANDRA-12966
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12966
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Jason Brown
>Assignee: Jason Brown
>Priority: Minor
>
> When using batch commit log mode, the Gossip thread slows down when peers 
> after a node bounces. This is because we perform a bunch of updates to the 
> peers table via {{SystemKeyspace.updatePeerInfo}}, which is a synchronized 
> method. How quickly each one of those individual updates takes depends on how 
> busy the system is at the time wrt write traffic. If the system is largely 
> quiescent, each update will be relatively quick (just waiting for the fsync). 
> If the system is getting a lot of writes, and depending on the 
> commitlog_sync_batch_window_in_ms, each of the Gossip thread's updates can 
> get stuck in the backlog, which causes the Gossip thread to stop processing. 
> We have observed in large clusters that a rolling restart causes triggers and 
> exacerbates this behavior. 



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

[jira] [Commented] (CASSANDRA-8616) sstable tools may result in commit log segments be written

2016-11-29 Thread Tyler Hobbs (JIRA) 

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

Tyler Hobbs commented on CASSANDRA-8616:


I totally forgot about this, sorry about that.  The test results do look much 
better now.  If you can rebase again and do one final test run, I'm +1 on 
committing this if the test results still look good.

> sstable tools may result in commit log segments be written
> --
>
> Key: CASSANDRA-8616
> URL: https://issues.apache.org/jira/browse/CASSANDRA-8616
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Tyler Hobbs
>Assignee: Yuki Morishita
> Fix For: 2.2.x, 3.0.x, 3.x
>
> Attachments: 8161-2.0.txt
>
>
> There was a report of sstable2json causing commitlog segments to be written 
> out when run.  I haven't attempted to reproduce this yet, so that's all I 
> know for now.  Since sstable2json loads the conf and schema, I'm thinking 
> that it may inadvertently be triggering the commitlog code.
> sstablescrub, sstableverify, and other sstable tools have the same issue.



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

cassandra-builds git commit: Add cassandra-3.11 branch jobs

2016-11-29 Thread mshuler 
Repository: cassandra-builds
Updated Branches:
  refs/heads/master 92c37f78c -> b26ac0903


Add cassandra-3.11 branch jobs


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

Branch: refs/heads/master
Commit: b26ac0903ac952f2b0173ea3673a9f3029b0c10d
Parents: 92c37f7
Author: Michael Shuler 
Authored: Tue Nov 29 11:50:02 2016 -0600
Committer: Michael Shuler 
Committed: Tue Nov 29 11:50:02 2016 -0600

--
 jenkins-dsl/cassandra_job_dsl_seed.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra-builds/blob/b26ac090/jenkins-dsl/cassandra_job_dsl_seed.groovy
--
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy 
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 146b44d..d087226 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -11,7 +11,7 @@ def mainRepo = 
'https://git-wip-us.apache.org/repos/asf/cassandra.git'
 def buildsRepo = 'https://git.apache.org/cassandra-builds.git'
 def buildDescStr = 'REF = ${GIT_BRANCH}  COMMIT = ${GIT_COMMIT}'
 // Cassandra active branches
-def cassandraBranches = ['cassandra-2.2', 'cassandra-3.0', 'cassandra-3.X', 
'trunk']
+def cassandraBranches = ['cassandra-2.2', 'cassandra-3.0', 'cassandra-3.11', 
'cassandra-3.X', 'trunk']
 // Ant test targets
 def testTargets = ['test', 'test-all', 'test-burn', 'test-cdc', 
'test-compression']

[jira] [Updated] (CASSANDRA-12716) Remove pre-3.0 compatibility code for 4.0

2016-11-29 Thread Aleksey Yeschenko (JIRA) 

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

Aleksey Yeschenko updated CASSANDRA-12716:
--
Status: Ready to Commit  (was: Patch Available)

> Remove pre-3.0 compatibility code for 4.0
> -
>
> Key: CASSANDRA-12716
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12716
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Sylvain Lebresne
>Assignee: Sylvain Lebresne
> Fix For: 4.0
>
>
> CASSANDRA-8099 make subsequent changes to internal formats so that we have 
> quite a bit of backward compatibility code a bit over the place. Due to that, 
> but also as a natural evolution, I believe we always had a tacit agreement 
> that 3.0/3.X would be a mandatory step on the upgrade to 4.X, so that we can 
> remove pre-3.0 compatibility (that is, we won't support going from any 2.x 
> release directly to 4.0, you'll have to upgrade to at least some 3.0 release 
> first).
> I think it's time to create the 4.0 branch and remove that pre-3.0 backward 
> compatibility code, which should clean code quite a bit, and that's the goal 
> of this issue.



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

[jira] [Commented] (CASSANDRA-12716) Remove pre-3.0 compatibility code for 4.0

2016-11-29 Thread Aleksey Yeschenko (JIRA) 

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

Aleksey Yeschenko commented on CASSANDRA-12716:
---

bq. I wanted to make sure we properly rejecting early old sstables

{{StartupChecks.checkSSTablesFormat}} should be the place to do it, but I've 
seen reports of it not triggering early enough. The extra validation in 
{{Descriptor.fromFileName()}} isn't too ugly though, so ¯\_(ツ)_/¯ .

There are some unused methods/fields/constants here and there (starting with 
{{LegacyLayout}}), and instances where we can now reduce method visibility 
(e.g. many in {{SchemaKeyspace}} that no longer need to be visible as 
{{LegacySchemaMigrator(Test)}} are gone for good).

Doesn't look like anything is broken, or obviously present that should and can 
also be removed - until Thrift is gone too. +1.

> Remove pre-3.0 compatibility code for 4.0
> -
>
> Key: CASSANDRA-12716
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12716
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Sylvain Lebresne
>Assignee: Sylvain Lebresne
> Fix For: 4.0
>
>
> CASSANDRA-8099 make subsequent changes to internal formats so that we have 
> quite a bit of backward compatibility code a bit over the place. Due to that, 
> but also as a natural evolution, I believe we always had a tacit agreement 
> that 3.0/3.X would be a mandatory step on the upgrade to 4.X, so that we can 
> remove pre-3.0 compatibility (that is, we won't support going from any 2.x 
> release directly to 4.0, you'll have to upgrade to at least some 3.0 release 
> first).
> I think it's time to create the 4.0 branch and remove that pre-3.0 backward 
> compatibility code, which should clean code quite a bit, and that's the goal 
> of this issue.



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

[11/13] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

2016-11-29 Thread samt 
Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 40043021ba80314d4d095363fc6fa4b2d14a8f7c
Parents: bf97b85 d5dbd0c
Author: Sam Tunnicliffe 
Authored: Tue Nov 29 17:15:13 2016 +
Committer: Sam Tunnicliffe 
Committed: Tue Nov 29 17:15:13 2016 +

--
 CHANGES.txt | 11 +--
 src/java/org/apache/cassandra/dht/LocalPartitioner.java | 10 --
 2 files changed, 13 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/40043021/CHANGES.txt
--
diff --cc CHANGES.txt
index 42d82d9,2cd0eb0..fb85765
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,6 +1,13 @@@
 +3.12
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * cqlsh auto completion: refactor definition of compaction strategy options 
(CASSANDRA-12946)
 + * Add support for arithmetic operators (CASSANDRA-11935)
 +
- 3.11
-  * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
-  * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
-  * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
- Merged from 2.2:
-  * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 +
  3.10
+  * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
+  * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
   * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
   * Fix Murmur3PartitionerTest (CASSANDRA-12858)
   * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)

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

2016-11-29 Thread samt 
Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 50b8be4e7da5ac9be931cf7f76ce88ec24b0d47f
Parents: b7ccd51 4004302
Author: Sam Tunnicliffe 
Authored: Tue Nov 29 17:21:10 2016 +
Committer: Sam Tunnicliffe 
Committed: Tue Nov 29 17:21:10 2016 +

--
 CHANGES.txt | 11 +--
 src/java/org/apache/cassandra/dht/LocalPartitioner.java | 10 --
 2 files changed, 13 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/50b8be4e/CHANGES.txt
--
diff --cc CHANGES.txt
index f203419,fb85765..8e98260
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,3 +1,11 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
++
  3.12
   * Remove timing window in test case (CASSANDRA-12875)
   * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
@@@ -121,8 -110,9 +118,9 @@@
   * Remove pre-startup check for open JMX port (CASSANDRA-12074)
   * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
   * Restore resumable hints delivery (CASSANDRA-11960)
 - * Properly report LWT contention (CASSANDRA-12626)
 + * Properly record CAS contention (CASSANDRA-12626)
  Merged from 3.0:
+  * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
   * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
   * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
   * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)

[jira] [Resolved] (CASSANDRA-12590) Segfault reading secondary index

2016-11-29 Thread Sam Tunnicliffe (JIRA) 

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

Sam Tunnicliffe resolved CASSANDRA-12590.
-
   Resolution: Fixed
Reproduced In: 3.7, 3.5  (was: 3.5, 3.7)

Fix for CASSANDRA-12651 has been committed (in 
{{820e7a8d810828d29f98a68dc35be33b40a5de62}}) and as discussed, that very 
likely also fixes this issue. So, I'm closing this now but we should definitely 
re-open if it still manifests down the line.

> Segfault reading secondary index
> 
>
> Key: CASSANDRA-12590
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12590
> Project: Cassandra
>  Issue Type: Bug
>  Components: Local Write-Read Paths
> Environment: Occurs on Cassandra 3.5 and 3.7
>Reporter: Cameron Zemek
>Assignee: Sam Tunnicliffe
>Priority: Critical
> Fix For: 3.10
>
>
> Getting segfaults when reading secondary index as follows:
> {code}
> J 9272 C2 
> org.apache.cassandra.dht.LocalPartitioner$LocalToken.compareTo(Lorg/apache/cassandra/dht/Token;)I
>  (53 bytes) @ 0x7fd7354749b7 [0x7fd735474840+0x177]
> J 5661 C2 org.apache.cassandra.db.DecoratedKey.compareTo(Ljava/lang/Object;)I 
> (9 bytes) @ 0x7fd7351b35b8 [0x7fd7351b3440+0x178]
> J 14205 C2 
> java.util.concurrent.ConcurrentSkipListMap.doGet(Ljava/lang/Object;)Ljava/lang/Object;
>  (142 bytes) @ 0x7fd736404dd8 [0x7fd736404cc0+0x118]
> J 17764 C2 
> org.apache.cassandra.db.SinglePartitionReadCommand.queryMemtableAndDiskInternal(Lorg/apache/cassandra/db/ColumnFamilyStore;)Lorg/apache/cassandra/db/rows/UnfilteredRowIterator;
>  (635 bytes) @ 0x7fd736e09638 [0x7fd736e08720+0xf18]
> J 17808 C2 
> org.apache.cassandra.index.internal.CassandraIndexSearcher.search(Lorg/apache/cassandra/db/ReadExecutionController;)Lorg/apache/cassandra/db/partitions/UnfilteredPartitionIterator;
>  (68 bytes) @ 0x7fd736e01a48 [0x7fd736e012a0+0x7a8]
> J 14217 C2 
> org.apache.cassandra.db.ReadCommand.executeLocally(Lorg/apache/cassandra/db/ReadExecutionController;)Lorg/apache/cassandra/db/partitions/UnfilteredPartitionIterator;
>  (219 bytes) @ 0x7fd736417c1c [0x7fd736416fa0+0xc7c]
> J 14585 C2 
> org.apache.cassandra.service.StorageProxy$LocalReadRunnable.runMayThrow()V 
> (337 bytes) @ 0x7fd736541e6c [0x7fd736541d60+0x10c]
> J 14584 C2 org.apache.cassandra.service.StorageProxy$DroppableRunnable.run()V 
> (48 bytes) @ 0x7fd7357957b4 [0x7fd735795760+0x54]
> J 9648% C2 org.apache.cassandra.concurrent.SEPWorker.run()V (253 bytes) @ 
> 0x7fd735938d8c [0x7fd7359356e0+0x36ac]
> {code}
> Which I have translated to the codepath:
> org.apache.cassandra.dht.LocalPartitioner (Line 139)
> org.apache.cassandra.db.DecoratedKey (Line 85)
> java.util.concurrent.ConcurrentSkipListMap (Line 794)
> org.apache.cassandra.db.SinglePartitionReadCommand (Line 498)
> org.apache.cassandra.index.internal.CassandraIndexSearcher (Line 60)
> org.apache.cassandra.db.ReadCommand (Line 367)



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

[jira] [Updated] (CASSANDRA-12914) cqlsh describe fails with "list[i] not a string for i in..."

2016-11-29 Thread Tyler Hobbs (JIRA) 

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

Tyler Hobbs updated CASSANDRA-12914:

Reproduced In: 3.8, 3.0.9, 2.2.7
 Priority: Minor  (was: Major)
Fix Version/s: 3.x
   3.0.x
   2.2.x
  Component/s: Tools

> cqlsh describe fails with "list[i] not a string for i in..."
> 
>
> Key: CASSANDRA-12914
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12914
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Adam Holmberg
>Assignee: Adam Holmberg
>Priority: Minor
> Fix For: 2.2.x, 3.0.x, 3.x
>
>
> repro:
> Create a keyspace and a few user types.
> {code}
> use keyspace;
> desc types;
> {code}
> This is caused by a limitation in {{cmd.Cmd.columnize}} in that it doesn't 
> accept unicode, which our identifiers are. Ending stack trace:
> {noformat}
> "...bin/cqlsh.py", ... in describe_usertypes
> cmd.Cmd.columnize(self, protect_names(ksmeta.user_types.keys()))
>   File "/Users/adamholmberg/.pyenv/versions/2.7.8/lib/python2.7/cmd.py", line 
> 363, in columnize
> ", ".join(map(str, nonstrings)))
> TypeError: list[i] not a string for i in 0, 1, 2, 3, 4
> {noformat}
> This was previously obscured because the driver was incorrectly encoding 
> identifiers in {{protect_name}}, which caused other problems for cqlsh schema 
> generation. With that 
> [change|https://github.com/datastax/python-driver/commit/0959b5dc1662d6957f2951738d0a4f053ac78f66],
>  we now must encode identifiers in cqlsh to avoid blowing up {{columnize}}.



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

[jira] [Commented] (CASSANDRA-12914) cqlsh describe fails with "list[i] not a string for i in..."

2016-11-29 Thread Tyler Hobbs (JIRA) 

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

Tyler Hobbs commented on CASSANDRA-12914:
-

The patch looks good to me, thank you.  It looks like this also exists in 2.2 
and 3.0, but the patch backports cleanly.  I've started cqlsh test runs for the 
branches here:

* 
[2.2|http://cassci.datastax.com/view/Dev/view/thobbs/job/thobbs-CASSANDRA-12914-2.2-cqlsh-cqlsh-tests/]
* 
[3.0|http://cassci.datastax.com/view/Dev/view/thobbs/job/thobbs-CASSANDRA-12914-3.0-cqlsh-cqlsh-tests/]
* 
[3.X|http://cassci.datastax.com/view/Dev/view/thobbs/job/thobbs-CASSANDRA-12914-3.X-cqlsh-cqlsh-tests/]
* 
[trunk|http://cassci.datastax.com/view/Dev/view/thobbs/job/thobbs-CASSANDRA-12914-trunk-cqlsh-cqlsh-tests/]

> cqlsh describe fails with "list[i] not a string for i in..."
> 
>
> Key: CASSANDRA-12914
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12914
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Adam Holmberg
>Assignee: Adam Holmberg
>
> repro:
> Create a keyspace and a few user types.
> {code}
> use keyspace;
> desc types;
> {code}
> This is caused by a limitation in {{cmd.Cmd.columnize}} in that it doesn't 
> accept unicode, which our identifiers are. Ending stack trace:
> {noformat}
> "...bin/cqlsh.py", ... in describe_usertypes
> cmd.Cmd.columnize(self, protect_names(ksmeta.user_types.keys()))
>   File "/Users/adamholmberg/.pyenv/versions/2.7.8/lib/python2.7/cmd.py", line 
> 363, in columnize
> ", ".join(map(str, nonstrings)))
> TypeError: list[i] not a string for i in 0, 1, 2, 3, 4
> {noformat}
> This was previously obscured because the driver was incorrectly encoding 
> identifiers in {{protect_name}}, which caused other problems for cqlsh schema 
> generation. With that 
> [change|https://github.com/datastax/python-driver/commit/0959b5dc1662d6957f2951738d0a4f053ac78f66],
>  we now must encode identifiers in cqlsh to avoid blowing up {{columnize}}.



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

[09/13] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2016-11-29 Thread samt 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: d5dbd0c7566ff82997a33316eb0db8aed5211ab6
Parents: 0cbcd13 820e7a8
Author: Sam Tunnicliffe 
Authored: Tue Nov 29 17:07:10 2016 +
Committer: Sam Tunnicliffe 
Committed: Tue Nov 29 17:07:10 2016 +

--
 CHANGES.txt |  3 ++-
 src/java/org/apache/cassandra/dht/LocalPartitioner.java | 10 --
 2 files changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5dbd0c7/CHANGES.txt
--
diff --cc CHANGES.txt
index cee49bf,b77d84a..2cd0eb0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,118 -1,22 +1,119 @@@
 -3.0.11
 +3.10
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
-  * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
 + * Add hint delivery metrics (CASSANDRA-12693)
 + * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
 + * ColumnIndex does not reuse buffer (CASSANDRA-12502)
 + * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
 + * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
 + * Tune compaction thread count via nodetool (CASSANDRA-12248)
 + * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
 + * Include repair session IDs in repair start message (CASSANDRA-12532)
 + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
 + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
 + * Support optional backpressure strategies at the coordinator 
(CASSANDRA-9318)
 + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
 + * Fix cassandra-stress graphing (CASSANDRA-12237)
 + * Allow filtering on partition key columns for queries without secondary 
indexes (CASSANDRA-11031)
 + * Fix Cassandra Stress reporting thread model and precision (CASSANDRA-12585)
 + * Add JMH benchmarks.jar (CASSANDRA-12586)
 + * Cleanup uses of AlterTableStatementColumn (CASSANDRA-12567)
 + * Add keep-alive to streaming (CASSANDRA-11841)
 + * Tracing payload is passed through

[01/13] cassandra git commit: LocalToken ensures object buffer is on heap

2016-11-29 Thread samt 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 7dd609c8f -> 820e7a8d8
  refs/heads/cassandra-3.11 2b65b0d8b -> d5dbd0c75
  refs/heads/cassandra-3.X bf97b8507 -> 40043021b
  refs/heads/trunk b7ccd518c -> 50b8be4e7


LocalToken ensures object buffer is on heap

Patch by Sam Tunnicliffe; reviewed by Alex Petrov for CASSANDRA-12651


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

Branch: refs/heads/cassandra-3.0
Commit: 820e7a8d810828d29f98a68dc35be33b40a5de62
Parents: 7dd609c
Author: Sam Tunnicliffe 
Authored: Thu Nov 17 16:42:19 2016 +
Committer: Sam Tunnicliffe 
Committed: Tue Nov 29 16:56:37 2016 +

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/dht/LocalPartitioner.java | 10 --
 2 files changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/820e7a8d/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a2c552e..b77d84a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.11
+ * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
  * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
  * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 Merged from 2.2:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/820e7a8d/src/java/org/apache/cassandra/dht/LocalPartitioner.java
--
diff --git a/src/java/org/apache/cassandra/dht/LocalPartitioner.java 
b/src/java/org/apache/cassandra/dht/LocalPartitioner.java
index f9421c5..aaf2569 100644
--- a/src/java/org/apache/cassandra/dht/LocalPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/LocalPartitioner.java
@@ -27,10 +27,11 @@ import org.apache.cassandra.db.CachedHashDecoratedKey;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.apache.cassandra.utils.ObjectSizes;
+import org.apache.cassandra.utils.memory.HeapAllocator;
 
 public class LocalPartitioner implements IPartitioner
 {
-private static final long EMPTY_SIZE = ObjectSizes.measure(new 
LocalPartitioner(null).new LocalToken(null));
+private static final long EMPTY_SIZE = ObjectSizes.measure(new 
LocalPartitioner(null).new LocalToken());
 
 final AbstractType comparator;   // package-private to avoid access 
workarounds in embedded LocalToken.
 
@@ -121,9 +122,14 @@ public class LocalPartitioner implements IPartitioner
 {
 static final long serialVersionUID = 8437543776403014875L;
 
+private LocalToken()
+{
+super(null);
+}
+
 public LocalToken(ByteBuffer token)
 {
-super(token);
+super(HeapAllocator.instance.clone(token));
 }
 
 @Override

[03/13] cassandra git commit: LocalToken ensures object buffer is on heap

2016-11-29 Thread samt 
LocalToken ensures object buffer is on heap

Patch by Sam Tunnicliffe; reviewed by Alex Petrov for CASSANDRA-12651


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

Branch: refs/heads/cassandra-3.11
Commit: 820e7a8d810828d29f98a68dc35be33b40a5de62
Parents: 7dd609c
Author: Sam Tunnicliffe 
Authored: Thu Nov 17 16:42:19 2016 +
Committer: Sam Tunnicliffe 
Committed: Tue Nov 29 16:56:37 2016 +

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/dht/LocalPartitioner.java | 10 --
 2 files changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/820e7a8d/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a2c552e..b77d84a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.11
+ * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
  * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
  * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 Merged from 2.2:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/820e7a8d/src/java/org/apache/cassandra/dht/LocalPartitioner.java
--
diff --git a/src/java/org/apache/cassandra/dht/LocalPartitioner.java 
b/src/java/org/apache/cassandra/dht/LocalPartitioner.java
index f9421c5..aaf2569 100644
--- a/src/java/org/apache/cassandra/dht/LocalPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/LocalPartitioner.java
@@ -27,10 +27,11 @@ import org.apache.cassandra.db.CachedHashDecoratedKey;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.apache.cassandra.utils.ObjectSizes;
+import org.apache.cassandra.utils.memory.HeapAllocator;
 
 public class LocalPartitioner implements IPartitioner
 {
-private static final long EMPTY_SIZE = ObjectSizes.measure(new 
LocalPartitioner(null).new LocalToken(null));
+private static final long EMPTY_SIZE = ObjectSizes.measure(new 
LocalPartitioner(null).new LocalToken());
 
 final AbstractType comparator;   // package-private to avoid access 
workarounds in embedded LocalToken.
 
@@ -121,9 +122,14 @@ public class LocalPartitioner implements IPartitioner
 {
 static final long serialVersionUID = 8437543776403014875L;
 
+private LocalToken()
+{
+super(null);
+}
+
 public LocalToken(ByteBuffer token)
 {
-super(token);
+super(HeapAllocator.instance.clone(token));
 }
 
 @Override

[jira] [Updated] (CASSANDRA-12651) Failure in SecondaryIndexTest.testAllowFilteringOnPartitionKeyWithSecondaryIndex

2016-11-29 Thread Sam Tunnicliffe (JIRA) 

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

Sam Tunnicliffe updated CASSANDRA-12651:

   Resolution: Fixed
Fix Version/s: (was: 3.0.x)
   3.0.11
   Status: Resolved  (was: Ready to Commit)

Thanks, committed to 3.0.x in {{820e7a8d810828d29f98a68dc35be33b40a5de62}} and 
merged up to trunk

> Failure in 
> SecondaryIndexTest.testAllowFilteringOnPartitionKeyWithSecondaryIndex
> 
>
> Key: CASSANDRA-12651
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12651
> Project: Cassandra
>  Issue Type: Bug
>  Components: Testing
>Reporter: Joel Knighton
>Assignee: Sam Tunnicliffe
>Priority: Critical
>  Labels: test-failure
> Fix For: 3.0.11, 3.10
>
>
> This has failed with/without compression.
> Stacktrace:
> {code}
> junit.framework.AssertionFailedError: Got less rows than expected. Expected 2 
> but got 0
>   at org.apache.cassandra.cql3.CQLTester.assertRows(CQLTester.java:909)
>   at 
> org.apache.cassandra.cql3.validation.entities.SecondaryIndexTest.lambda$testAllowFilteringOnPartitionKeyWithSecondaryIndex$78(SecondaryIndexTest.java:1228)
>   at 
> org.apache.cassandra.cql3.validation.entities.SecondaryIndexTest$$Lambda$293/218688965.apply(Unknown
>  Source)
>   at 
> org.apache.cassandra.cql3.CQLTester.beforeAndAfterFlush(CQLTester.java:1215)
>   at 
> org.apache.cassandra.cql3.validation.entities.SecondaryIndexTest.testAllowFilteringOnPartitionKeyWithSecondaryIndex(SecondaryIndexTest.java:1218)
> {code}
> Examples:
> http://cassci.datastax.com/job/trunk_testall/1176/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> http://cassci.datastax.com/job/trunk_testall/1176/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex_compression/
> http://cassci.datastax.com/job/trunk_testall/1219/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> http://cassci.datastax.com/job/trunk_testall/1216/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> http://cassci.datastax.com/job/trunk_testall/1208/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> http://cassci.datastax.com/job/trunk_testall/1176/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> http://cassci.datastax.com/job/trunk_testall/1175/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> May or may not be related, but there's a test failure (index duplicate):
> http://cassci.datastax.com/view/Dev/view/carlyeks/job/carlyeks-ticket-11803-3.X-testall/lastCompletedBuild/testReport/org.apache.cassandra.index.internal/CassandraIndexTest/indexOnFirstClusteringColumn_compression/
> http://cassci.datastax.com/job/ifesdjeen-11803-test-fix-trunk-testall/1/testReport/junit/org.apache.cassandra.index.internal/CassandraIndexTest/indexOnFirstClusteringColumn_compression/



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

[06/13] cassandra git commit: Fix CHANGES.txt

2016-11-29 Thread samt 
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/0cbcd130
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cbcd130
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cbcd130

Branch: refs/heads/trunk
Commit: 0cbcd1301fb5973d70ab8698e7d448c8f41c3414
Parents: 2b65b0d
Author: Sam Tunnicliffe 
Authored: Tue Nov 29 16:59:55 2016 +
Committer: Sam Tunnicliffe 
Committed: Tue Nov 29 16:59:55 2016 +

--
 CHANGES.txt | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cbcd130/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 080de28..cee49bf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,7 @@
-3.11
+3.10
  * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
  * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
  * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
-Merged from 2.2:
- * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
-
-3.10
  * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
  * Fix Murmur3PartitionerTest (CASSANDRA-12858)
  * Move cqlsh syntax rules into separate module and allow easier customization 
(CASSANDRA-12897)
@@ -157,6 +153,7 @@ Merged from 3.0:
  * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
  * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 Merged from 2.2:
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
  * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
  * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
  * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)

[04/13] cassandra git commit: LocalToken ensures object buffer is on heap

2016-11-29 Thread samt 
LocalToken ensures object buffer is on heap

Patch by Sam Tunnicliffe; reviewed by Alex Petrov for CASSANDRA-12651


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

Branch: refs/heads/cassandra-3.X
Commit: 820e7a8d810828d29f98a68dc35be33b40a5de62
Parents: 7dd609c
Author: Sam Tunnicliffe 
Authored: Thu Nov 17 16:42:19 2016 +
Committer: Sam Tunnicliffe 
Committed: Tue Nov 29 16:56:37 2016 +

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/dht/LocalPartitioner.java | 10 --
 2 files changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/820e7a8d/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a2c552e..b77d84a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.11
+ * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
  * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
  * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 Merged from 2.2:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/820e7a8d/src/java/org/apache/cassandra/dht/LocalPartitioner.java
--
diff --git a/src/java/org/apache/cassandra/dht/LocalPartitioner.java 
b/src/java/org/apache/cassandra/dht/LocalPartitioner.java
index f9421c5..aaf2569 100644
--- a/src/java/org/apache/cassandra/dht/LocalPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/LocalPartitioner.java
@@ -27,10 +27,11 @@ import org.apache.cassandra.db.CachedHashDecoratedKey;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.apache.cassandra.utils.ObjectSizes;
+import org.apache.cassandra.utils.memory.HeapAllocator;
 
 public class LocalPartitioner implements IPartitioner
 {
-private static final long EMPTY_SIZE = ObjectSizes.measure(new 
LocalPartitioner(null).new LocalToken(null));
+private static final long EMPTY_SIZE = ObjectSizes.measure(new 
LocalPartitioner(null).new LocalToken());
 
 final AbstractType comparator;   // package-private to avoid access 
workarounds in embedded LocalToken.
 
@@ -121,9 +122,14 @@ public class LocalPartitioner implements IPartitioner
 {
 static final long serialVersionUID = 8437543776403014875L;
 
+private LocalToken()
+{
+super(null);
+}
+
 public LocalToken(ByteBuffer token)
 {
-super(token);
+super(HeapAllocator.instance.clone(token));
 }
 
 @Override

[12/13] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X

2016-11-29 Thread samt 
Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: 40043021ba80314d4d095363fc6fa4b2d14a8f7c
Parents: bf97b85 d5dbd0c
Author: Sam Tunnicliffe 
Authored: Tue Nov 29 17:15:13 2016 +
Committer: Sam Tunnicliffe 
Committed: Tue Nov 29 17:15:13 2016 +

--
 CHANGES.txt | 11 +--
 src/java/org/apache/cassandra/dht/LocalPartitioner.java | 10 --
 2 files changed, 13 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/40043021/CHANGES.txt
--
diff --cc CHANGES.txt
index 42d82d9,2cd0eb0..fb85765
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,6 +1,13 @@@
 +3.12
 + * Remove timing window in test case (CASSANDRA-12875)
 + * Resolve unit testing without JCE security libraries installed 
(CASSANDRA-12945)
 + * cqlsh auto completion: refactor definition of compaction strategy options 
(CASSANDRA-12946)
 + * Add support for arithmetic operators (CASSANDRA-11935)
 +
- 3.11
-  * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
-  * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
-  * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
- Merged from 2.2:
-  * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 +
  3.10
+  * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
+  * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
   * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
   * Fix Murmur3PartitionerTest (CASSANDRA-12858)
   * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)

[02/13] cassandra git commit: LocalToken ensures object buffer is on heap

2016-11-29 Thread samt 
LocalToken ensures object buffer is on heap

Patch by Sam Tunnicliffe; reviewed by Alex Petrov for CASSANDRA-12651


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

Branch: refs/heads/trunk
Commit: 820e7a8d810828d29f98a68dc35be33b40a5de62
Parents: 7dd609c
Author: Sam Tunnicliffe 
Authored: Thu Nov 17 16:42:19 2016 +
Committer: Sam Tunnicliffe 
Committed: Tue Nov 29 16:56:37 2016 +

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/dht/LocalPartitioner.java | 10 --
 2 files changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/820e7a8d/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a2c552e..b77d84a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.11
+ * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
  * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
  * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 Merged from 2.2:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/820e7a8d/src/java/org/apache/cassandra/dht/LocalPartitioner.java
--
diff --git a/src/java/org/apache/cassandra/dht/LocalPartitioner.java 
b/src/java/org/apache/cassandra/dht/LocalPartitioner.java
index f9421c5..aaf2569 100644
--- a/src/java/org/apache/cassandra/dht/LocalPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/LocalPartitioner.java
@@ -27,10 +27,11 @@ import org.apache.cassandra.db.CachedHashDecoratedKey;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.apache.cassandra.utils.ObjectSizes;
+import org.apache.cassandra.utils.memory.HeapAllocator;
 
 public class LocalPartitioner implements IPartitioner
 {
-private static final long EMPTY_SIZE = ObjectSizes.measure(new 
LocalPartitioner(null).new LocalToken(null));
+private static final long EMPTY_SIZE = ObjectSizes.measure(new 
LocalPartitioner(null).new LocalToken());
 
 final AbstractType comparator;   // package-private to avoid access 
workarounds in embedded LocalToken.
 
@@ -121,9 +122,14 @@ public class LocalPartitioner implements IPartitioner
 {
 static final long serialVersionUID = 8437543776403014875L;
 
+private LocalToken()
+{
+super(null);
+}
+
 public LocalToken(ByteBuffer token)
 {
-super(token);
+super(HeapAllocator.instance.clone(token));
 }
 
 @Override

[07/13] cassandra git commit: Fix CHANGES.txt

2016-11-29 Thread samt 
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/0cbcd130
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cbcd130
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cbcd130

Branch: refs/heads/cassandra-3.11
Commit: 0cbcd1301fb5973d70ab8698e7d448c8f41c3414
Parents: 2b65b0d
Author: Sam Tunnicliffe 
Authored: Tue Nov 29 16:59:55 2016 +
Committer: Sam Tunnicliffe 
Committed: Tue Nov 29 16:59:55 2016 +

--
 CHANGES.txt | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cbcd130/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 080de28..cee49bf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,7 @@
-3.11
+3.10
  * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
  * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
  * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
-Merged from 2.2:
- * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
-
-3.10
  * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
  * Fix Murmur3PartitionerTest (CASSANDRA-12858)
  * Move cqlsh syntax rules into separate module and allow easier customization 
(CASSANDRA-12897)
@@ -157,6 +153,7 @@ Merged from 3.0:
  * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
  * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 Merged from 2.2:
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
  * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
  * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
  * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)

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

2016-11-29 Thread samt 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: d5dbd0c7566ff82997a33316eb0db8aed5211ab6
Parents: 0cbcd13 820e7a8
Author: Sam Tunnicliffe 
Authored: Tue Nov 29 17:07:10 2016 +
Committer: Sam Tunnicliffe 
Committed: Tue Nov 29 17:07:10 2016 +

--
 CHANGES.txt |  3 ++-
 src/java/org/apache/cassandra/dht/LocalPartitioner.java | 10 --
 2 files changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5dbd0c7/CHANGES.txt
--
diff --cc CHANGES.txt
index cee49bf,b77d84a..2cd0eb0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,118 -1,22 +1,119 @@@
 -3.0.11
 +3.10
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
-  * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
 + * Add hint delivery metrics (CASSANDRA-12693)
 + * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
 + * ColumnIndex does not reuse buffer (CASSANDRA-12502)
 + * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
 + * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
 + * Tune compaction thread count via nodetool (CASSANDRA-12248)
 + * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
 + * Include repair session IDs in repair start message (CASSANDRA-12532)
 + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
 + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
 + * Support optional backpressure strategies at the coordinator 
(CASSANDRA-9318)
 + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
 + * Fix cassandra-stress graphing (CASSANDRA-12237)
 + * Allow filtering on partition key columns for queries without secondary 
indexes (CASSANDRA-11031)
 + * Fix Cassandra Stress reporting thread model and precision (CASSANDRA-12585)
 + * Add JMH benchmarks.jar (CASSANDRA-12586)
 + * Cleanup uses of AlterTableStatementColumn (CASSANDRA-12567)
 + * Add keep-alive to streaming (CASSANDRA-11841)
 + * Tracing payload is passed through

[08/13] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2016-11-29 Thread samt 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.X
Commit: d5dbd0c7566ff82997a33316eb0db8aed5211ab6
Parents: 0cbcd13 820e7a8
Author: Sam Tunnicliffe 
Authored: Tue Nov 29 17:07:10 2016 +
Committer: Sam Tunnicliffe 
Committed: Tue Nov 29 17:07:10 2016 +

--
 CHANGES.txt |  3 ++-
 src/java/org/apache/cassandra/dht/LocalPartitioner.java | 10 --
 2 files changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5dbd0c7/CHANGES.txt
--
diff --cc CHANGES.txt
index cee49bf,b77d84a..2cd0eb0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,118 -1,22 +1,119 @@@
 -3.0.11
 +3.10
 + * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
 + * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
-  * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
 + * Fix Murmur3PartitionerTest (CASSANDRA-12858)
 + * Move cqlsh syntax rules into separate module and allow easier 
customization (CASSANDRA-12897)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Fix cassandra-stress truncate option (CASSANDRA-12695)
 + * Fix crossNode value when receiving messages (CASSANDRA-12791)
 + * Don't load MX4J beans twice (CASSANDRA-12869)
 + * Extend native protocol request flags, add versions to SUPPORTED, and 
introduce ProtocolVersion enum (CASSANDRA-12838)
 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
 + * Properly format IPv6 addresses when logging JMX service URL 
(CASSANDRA-12454)
 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
 + * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
 + * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
 + * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
 + * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)
 + * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster 
(CASSANDRA-12812)
 + * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
 + * Add duration data type (CASSANDRA-11873)
 + * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
 + * Improve sum aggregate functions (CASSANDRA-12417)
 + * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)
 + * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
 + * Check for hash conflicts in prepared statements (CASSANDRA-12733)
 + * Exit query parsing upon first error (CASSANDRA-12598)
 + * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
 + * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
 + * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)
 + * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
 + * Add hint delivery metrics (CASSANDRA-12693)
 + * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
 + * ColumnIndex does not reuse buffer (CASSANDRA-12502)
 + * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
 + * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
 + * Tune compaction thread count via nodetool (CASSANDRA-12248)
 + * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
 + * Include repair session IDs in repair start message (CASSANDRA-12532)
 + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
 + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
 + * Support optional backpressure strategies at the coordinator 
(CASSANDRA-9318)
 + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
 + * Fix cassandra-stress graphing (CASSANDRA-12237)
 + * Allow filtering on partition key columns for queries without secondary 
indexes (CASSANDRA-11031)
 + * Fix Cassandra Stress reporting thread model and precision (CASSANDRA-12585)
 + * Add JMH benchmarks.jar (CASSANDRA-12586)
 + * Cleanup uses of AlterTableStatementColumn (CASSANDRA-12567)
 + * Add keep-alive to streaming (CASSANDRA-11841)
 + * Tracing payload is passed through

[05/13] cassandra git commit: Fix CHANGES.txt

2016-11-29 Thread samt 
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/0cbcd130
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cbcd130
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cbcd130

Branch: refs/heads/cassandra-3.X
Commit: 0cbcd1301fb5973d70ab8698e7d448c8f41c3414
Parents: 2b65b0d
Author: Sam Tunnicliffe 
Authored: Tue Nov 29 16:59:55 2016 +
Committer: Sam Tunnicliffe 
Committed: Tue Nov 29 16:59:55 2016 +

--
 CHANGES.txt | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cbcd130/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 080de28..cee49bf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,7 @@
-3.11
+3.10
  * Fix inconsistencies in cassandra-stress load balancing policy 
(CASSANDRA-12919)
  * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
  * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
-Merged from 2.2:
- * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
-
-3.10
  * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
  * Fix Murmur3PartitionerTest (CASSANDRA-12858)
  * Move cqlsh syntax rules into separate module and allow easier customization 
(CASSANDRA-12897)
@@ -157,6 +153,7 @@ Merged from 3.0:
  * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
  * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 Merged from 2.2:
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
  * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
  * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
  * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)

[jira] [Updated] (CASSANDRA-12934) AnticompactionRequestSerializer serializedSize is incorrect

2016-11-29 Thread Sam Tunnicliffe (JIRA) 

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

Sam Tunnicliffe updated CASSANDRA-12934:

Fix Version/s: (was: 3.x)
   3.10

> AnticompactionRequestSerializer serializedSize is incorrect
> ---
>
> Key: CASSANDRA-12934
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12934
> Project: Cassandra
>  Issue Type: Bug
>  Components: Core
>Reporter: Jason Brown
>Assignee: Jason Brown
> Fix For: 3.0.11, 3.10, 4.0
>
>
> {{AnticompactionRequestSerializer#serializedSize}} does not add the size of 
> the {{#successfulRanges}} list to the total byte count.
> This incorrectly calculated size shouldn't affect anything in the current 
> release AFAICT, but it is a blocker for CASSANDRA-8457.



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

[jira] [Commented] (CASSANDRA-12894) testall failure in org.apache.cassandra.hints.HintsBufferPoolTest.testBackpressure-compression

2016-11-29 Thread Michael Shuler (JIRA) 

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

Michael Shuler commented on CASSANDRA-12894:


3.0 -> 3.11 -> 3.X -> trunk

Marking this with fixver 3.10 (which will be pulled from 3.11 branch), since it 
has not been released, yet.

> testall failure in 
> org.apache.cassandra.hints.HintsBufferPoolTest.testBackpressure-compression
> --
>
> Key: CASSANDRA-12894
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12894
> Project: Cassandra
>  Issue Type: Test
>Reporter: Michael Shuler
>Assignee: Ariel Weisberg
>  Labels: test-failure
> Fix For: 3.10, 4.0, 3.0.x
>
>
> example failure:
> http://cassci.datastax.com/job/cassandra-3.0_testall/720/testReport/org.apache.cassandra.hints/HintsBufferPoolTest/testBackpressure_compression
> {noformat}
> Error Message
> null
> Stacktrace
> junit.framework.AssertionFailedError: null
>   at 
> org.apache.cassandra.hints.HintsBufferPoolTest.testBackpressure(HintsBufferPoolTest.java:73)
>   at 
> org.jboss.byteman.contrib.bmunit.BMUnitRunner$10.evaluate(BMUnitRunner.java:371)
>   at 
> org.jboss.byteman.contrib.bmunit.BMUnitRunner$6.evaluate(BMUnitRunner.java:241)
>   at 
> org.jboss.byteman.contrib.bmunit.BMUnitRunner$1.evaluate(BMUnitRunner.java:75)
> Standard Output
> ERROR 16:26:27 SLF4J: stderr
> INFO  16:26:27 Configuration location: 
> file:/home/automaton/cassandra/test/conf/cassandra.yaml
> INFO  16:26:27 Node configuration:[allocate_tokens_for_keyspace=null; 
> authenticator=null; authorizer=null; auto_bootstrap=true; auto_snapshot=true; 
> batch_size_fail_threshold_in_kb=50; batch_size_warn_threshold_in_kb=5; 
> batchlog_replay_throttle_in_kb=1024; broadcast_address=null; 
> broadcast_rpc_address=null; buffer_pool_use_heap_if_exhausted=true; 
> cas_contention_timeout_in_ms
> ...[truncated 8324 chars]...
> NA OS native malloc/free
> INFO  16:26:30 Initializing counter cache with capacity of 6 MBs
> INFO  16:26:30 Scheduling counter cache save to every 7200 seconds (going to 
> save all keys).
> INFO  16:26:31 Global buffer pool is enabled, when pool is exahusted (max is 
> 512 mb) it will allocate on heap
> INFO  16:26:31 Initializing hints_buffer_test.table
> INFO  16:26:31 byteman jar is 
> /home/automaton/cassandra/build/lib/jars/byteman-3.0.3.jar
> INFO  16:26:31 Setting org.jboss.byteman.allow.config.update=true
> {noformat}



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

[jira] [Updated] (CASSANDRA-12894) testall failure in org.apache.cassandra.hints.HintsBufferPoolTest.testBackpressure-compression

2016-11-29 Thread Michael Shuler (JIRA) 

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

Michael Shuler updated CASSANDRA-12894:
---
Fix Version/s: (was: 3.11)
   3.10

> testall failure in 
> org.apache.cassandra.hints.HintsBufferPoolTest.testBackpressure-compression
> --
>
> Key: CASSANDRA-12894
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12894
> Project: Cassandra
>  Issue Type: Test
>Reporter: Michael Shuler
>Assignee: Ariel Weisberg
>  Labels: test-failure
> Fix For: 3.10, 4.0, 3.0.x
>
>
> example failure:
> http://cassci.datastax.com/job/cassandra-3.0_testall/720/testReport/org.apache.cassandra.hints/HintsBufferPoolTest/testBackpressure_compression
> {noformat}
> Error Message
> null
> Stacktrace
> junit.framework.AssertionFailedError: null
>   at 
> org.apache.cassandra.hints.HintsBufferPoolTest.testBackpressure(HintsBufferPoolTest.java:73)
>   at 
> org.jboss.byteman.contrib.bmunit.BMUnitRunner$10.evaluate(BMUnitRunner.java:371)
>   at 
> org.jboss.byteman.contrib.bmunit.BMUnitRunner$6.evaluate(BMUnitRunner.java:241)
>   at 
> org.jboss.byteman.contrib.bmunit.BMUnitRunner$1.evaluate(BMUnitRunner.java:75)
> Standard Output
> ERROR 16:26:27 SLF4J: stderr
> INFO  16:26:27 Configuration location: 
> file:/home/automaton/cassandra/test/conf/cassandra.yaml
> INFO  16:26:27 Node configuration:[allocate_tokens_for_keyspace=null; 
> authenticator=null; authorizer=null; auto_bootstrap=true; auto_snapshot=true; 
> batch_size_fail_threshold_in_kb=50; batch_size_warn_threshold_in_kb=5; 
> batchlog_replay_throttle_in_kb=1024; broadcast_address=null; 
> broadcast_rpc_address=null; buffer_pool_use_heap_if_exhausted=true; 
> cas_contention_timeout_in_ms
> ...[truncated 8324 chars]...
> NA OS native malloc/free
> INFO  16:26:30 Initializing counter cache with capacity of 6 MBs
> INFO  16:26:30 Scheduling counter cache save to every 7200 seconds (going to 
> save all keys).
> INFO  16:26:31 Global buffer pool is enabled, when pool is exahusted (max is 
> 512 mb) it will allocate on heap
> INFO  16:26:31 Initializing hints_buffer_test.table
> INFO  16:26:31 byteman jar is 
> /home/automaton/cassandra/build/lib/jars/byteman-3.0.3.jar
> INFO  16:26:31 Setting org.jboss.byteman.allow.config.update=true
> {noformat}



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

[jira] [Updated] (CASSANDRA-12916) Broken UDT muitations loading from CommitLog

2016-11-29 Thread Michael Shuler (JIRA) 

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

Michael Shuler updated CASSANDRA-12916:
---
Fix Version/s: (was: 3.11)
   3.10

> Broken UDT muitations loading from CommitLog
> 
>
> Key: CASSANDRA-12916
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12916
> Project: Cassandra
>  Issue Type: Bug
>  Components: Local Write-Read Paths
> Environment: Cassandra 3.9
>Reporter: Sergey Dobrodey
>Assignee: Sam Tunnicliffe
>Priority: Critical
>  Labels: patch
> Fix For: 3.10
>
> Attachments: patch.diff, udt.cql
>
>
> UDT mutatitions seems to be broken. Simple example is attached. After steps 
> from it, restart cassandra and during commit log reading it will fail with 
> error:
> ERROR 09:34:46 Exiting due to error while processing commit log during 
> initialization.
> org.apache.cassandra.db.commitlog.CommitLogReadHandler$CommitLogReadException:
>  Unexpected error deserializing mutation; saved to 
> /tmp/mutation6087238241614604390dat.  This may be caused by replaying a 
> mutation against a table with the same name but incompatible schema.  
> Exception follows: org.apache.cassandra.serializers.MarshalException: Not 
> enough bytes to read 0th field data
> I resolved this problem, so my patch is in attachment.



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

[jira] [Updated] (CASSANDRA-12899) stand alone sstableupgrade prints LEAK DETECTED warnings some times

2016-11-29 Thread Michael Shuler (JIRA) 

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

Michael Shuler updated CASSANDRA-12899:
---
Fix Version/s: (was: 3.11)
   3.10

> stand alone sstableupgrade prints LEAK DETECTED warnings some times
> ---
>
> Key: CASSANDRA-12899
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12899
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Jeremiah Jordan
>Assignee: Yuki Morishita
> Fix For: 2.2.9, 3.0.11, 3.10
>
>
> the stand alone sstableupgrade prints LEAK DETECTED warnings some times.
> {code}
> sstableupgrade keyspace1 standard1
> WARN  04:22:41,942 Small commitlog volume detected at 
> /var/lib/cassandra/commitlog; setting commitlog_total_space_in_mb to 8047.  
> You can override this in cassandra.yaml
> WARN  04:22:41,948 Small cdc volume detected at /var/lib/cassandra/cdc_raw; 
> setting cdc_total_space_in_mb to 4023.  You can override this in 
> cassandra.yaml
> WARN  04:22:41,950 Only 29.016GiB free across all data volumes. Consider 
> adding more capacity to your cluster or removing obsolete snapshots
> Found 0 sstables that need upgrading.
> ERROR 04:22:45,472 LEAK DETECTED: a reference 
> (org.apache.cassandra.utils.concurrent.Ref$State@7b135bd7) to class 
> org.apache.cassandra.io.sstable.format.SSTableReader$InstanceTidier@2080155253:/var/lib/cassandra/data/keyspace1/standard1-24e490e1a6fb11e68ebe232ff1b97ca7/mc-17-big
>  was not released before the reference was garbage collected
> ERROR 04:22:45,472 Allocate trace 
> org.apache.cassandra.utils.concurrent.Ref$State@7b135bd7:
> Thread[main,5,main]
>   at java.lang.Thread.getStackTrace(Thread.java:1552)
>   at org.apache.cassandra.utils.concurrent.Ref$Debug.(Ref.java:245)
>   at org.apache.cassandra.utils.concurrent.Ref$State.(Ref.java:175)
>   at org.apache.cassandra.utils.concurrent.Ref.(Ref.java:97)
>   at 
> org.apache.cassandra.io.sstable.format.SSTableReader.(SSTableReader.java:237)
>   at 
> org.apache.cassandra.io.sstable.format.big.BigTableReader.(BigTableReader.java:57)
>   at 
> org.apache.cassandra.io.sstable.format.big.BigFormat$ReaderFactory.open(BigFormat.java:101)
>   at 
> org.apache.cassandra.io.sstable.format.SSTableReader.internalOpen(SSTableReader.java:638)
>   at 
> org.apache.cassandra.io.sstable.format.SSTableReader.open(SSTableReader.java:506)
>   at 
> org.apache.cassandra.io.sstable.format.SSTableReader.openNoValidation(SSTableReader.java:401)
>   at 
> org.apache.cassandra.tools.StandaloneUpgrader.main(StandaloneUpgrader.java:85)
>   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>   at 
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
>   at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:497)
>   at 
> com.datastax.bdp.tools.ShellToolWrapper.main(ShellToolWrapper.java:34)
> {code}



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

[jira] [Updated] (CASSANDRA-12919) Fix inconsistencies in cassandra-stress load balancing policy

2016-11-29 Thread Michael Shuler (JIRA) 

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

Michael Shuler updated CASSANDRA-12919:
---
Fix Version/s: (was: 3.11)
   3.10

> Fix inconsistencies in cassandra-stress load balancing policy
> -
>
> Key: CASSANDRA-12919
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12919
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Stefania
>Assignee: Stefania
>Priority: Minor
> Fix For: 3.10
>
>
> The default load balancing policy in cassandra-stress is null, which means 
> that the driver will currently wrap {{DCAwareRoundRobinPolicy}} with 
> {{TokenAwarePolicy}}. 
> However, when a white list of nodes or a data center are specified in the 
> command line options, then either {{WhiteListPolicy}} or 
> {{DCAwareRoundRobinPolicy}} are used respectively, without wrapping them in a 
> {{TokenAwarePolicy}}.
> This means that in the default case token aware routing is applied, but in 
> some cases it is not. Token aware routing could give a performance boost of 
> up to 2.5 times on bare metal, making comparisons of workloads problematic, 
> if it is applied inconsistently.



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

[jira] [Created] (CASSANDRA-12974) Stress-tool: print total operation rate on each row.

2016-11-29 Thread Vladimir Yudovin (JIRA) 
Vladimir Yudovin created CASSANDRA-12974:


 Summary: Stress-tool: print total operation rate on each row.
 Key: CASSANDRA-12974
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12974
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Reporter: Vladimir Yudovin
Assignee: Vladimir Yudovin
Priority: Minor


Now operation rate is printed for latest second, value that can fluctuate and 
hard to estimate from the glance. For more handy usage we can print total (from 
test starting) on each row.

Patch is available.




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

[jira] [Assigned] (CASSANDRA-12104) Handle coalesce efforts for inter-dc traffic discretely from intra-dc traffic

2016-11-29 Thread Ariel Weisberg (JIRA) 

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

Ariel Weisberg reassigned CASSANDRA-12104:
--

Assignee: Ariel Weisberg

> Handle coalesce efforts for inter-dc traffic discretely from intra-dc traffic
> -
>
> Key: CASSANDRA-12104
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12104
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Thom Valley
>Assignee: Ariel Weisberg
>Priority: Minor
>
> In relationship to CASSANDRA-8692, we have discovered that pushing coalescing 
> windows to the point where they have a positive impact on inter-dc traffic 
> overhead appears to have causes delays in intra-dc traffic (namely, quorum 
> requests between nodes).  Having the same coalescing strategy apply to all 
> messages (especially intra-dc request/response messages) seems like a bad 
> idea.
> This was in a 5 DC environment with from 30 to 130 ms of latency between the 
> DCs.  Local network was entirely unrestricted 10G ethernet.
> Being able to apply different coalescing rules to those two classifications 
> of traffic would allow much more effective tuning of the coalescing 
> strategies, save inter-dc bandwidth while not having any impact on intra-dc 
> message handling.



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

[jira] [Commented] (CASSANDRA-12894) testall failure in org.apache.cassandra.hints.HintsBufferPoolTest.testBackpressure-compression

2016-11-29 Thread Ariel Weisberg (JIRA) 

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

Ariel Weisberg commented on CASSANDRA-12894:


Confirming this is still in progress and making progress.

> testall failure in 
> org.apache.cassandra.hints.HintsBufferPoolTest.testBackpressure-compression
> --
>
> Key: CASSANDRA-12894
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12894
> Project: Cassandra
>  Issue Type: Test
>Reporter: Michael Shuler
>Assignee: Ariel Weisberg
>  Labels: test-failure
> Fix For: 4.0, 3.0.x, 3.11
>
>
> example failure:
> http://cassci.datastax.com/job/cassandra-3.0_testall/720/testReport/org.apache.cassandra.hints/HintsBufferPoolTest/testBackpressure_compression
> {noformat}
> Error Message
> null
> Stacktrace
> junit.framework.AssertionFailedError: null
>   at 
> org.apache.cassandra.hints.HintsBufferPoolTest.testBackpressure(HintsBufferPoolTest.java:73)
>   at 
> org.jboss.byteman.contrib.bmunit.BMUnitRunner$10.evaluate(BMUnitRunner.java:371)
>   at 
> org.jboss.byteman.contrib.bmunit.BMUnitRunner$6.evaluate(BMUnitRunner.java:241)
>   at 
> org.jboss.byteman.contrib.bmunit.BMUnitRunner$1.evaluate(BMUnitRunner.java:75)
> Standard Output
> ERROR 16:26:27 SLF4J: stderr
> INFO  16:26:27 Configuration location: 
> file:/home/automaton/cassandra/test/conf/cassandra.yaml
> INFO  16:26:27 Node configuration:[allocate_tokens_for_keyspace=null; 
> authenticator=null; authorizer=null; auto_bootstrap=true; auto_snapshot=true; 
> batch_size_fail_threshold_in_kb=50; batch_size_warn_threshold_in_kb=5; 
> batchlog_replay_throttle_in_kb=1024; broadcast_address=null; 
> broadcast_rpc_address=null; buffer_pool_use_heap_if_exhausted=true; 
> cas_contention_timeout_in_ms
> ...[truncated 8324 chars]...
> NA OS native malloc/free
> INFO  16:26:30 Initializing counter cache with capacity of 6 MBs
> INFO  16:26:30 Scheduling counter cache save to every 7200 seconds (going to 
> save all keys).
> INFO  16:26:31 Global buffer pool is enabled, when pool is exahusted (max is 
> 512 mb) it will allocate on heap
> INFO  16:26:31 Initializing hints_buffer_test.table
> INFO  16:26:31 byteman jar is 
> /home/automaton/cassandra/build/lib/jars/byteman-3.0.3.jar
> INFO  16:26:31 Setting org.jboss.byteman.allow.config.update=true
> {noformat}



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

[jira] [Updated] (CASSANDRA-12666) dtest failure in paging_test.TestPagingData.test_paging_with_filtering_on_partition_key

2016-11-29 Thread Michael Shuler (JIRA) 

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

Michael Shuler updated CASSANDRA-12666:
---
Fix Version/s: (was: 3.x)
   3.10

> dtest failure in 
> paging_test.TestPagingData.test_paging_with_filtering_on_partition_key
> ---
>
> Key: CASSANDRA-12666
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12666
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>Assignee: Alex Petrov
>Priority: Critical
>  Labels: dtest
> Fix For: 3.10
>
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_novnode_dtest/480/testReport/paging_test/TestPagingData/test_paging_with_filtering_on_partition_key
> {code}
> Standard Output
> Unexpected error in node3 log, error: 
> ERROR [Native-Transport-Requests-3] 2016-09-17 00:50:11,543 Message.java:622 
> - Unexpected exception during request; channel = [id: 0x467a4afe, 
> L:/127.0.0.3:9042 - R:/127.0.0.1:59115]
> java.lang.AssertionError: null
>   at 
> org.apache.cassandra.dht.IncludingExcludingBounds.split(IncludingExcludingBounds.java:45)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageProxy.getRestrictedRanges(StorageProxy.java:2368)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageProxy$RangeIterator.(StorageProxy.java:1951)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageProxy.getRangeSlice(StorageProxy.java:2235)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.PartitionRangeReadCommand.execute(PartitionRangeReadCommand.java:184)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.pager.AbstractQueryPager.fetchPage(AbstractQueryPager.java:66)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.pager.PartitionRangeQueryPager.fetchPage(PartitionRangeQueryPager.java:36)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.statements.SelectStatement$Pager$NormalPager.fetchPage(SelectStatement.java:328)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.statements.SelectStatement.execute(SelectStatement.java:375)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.statements.SelectStatement.execute(SelectStatement.java:250)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.statements.SelectStatement.execute(SelectStatement.java:78)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.QueryProcessor.processStatement(QueryProcessor.java:216)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.QueryProcessor.process(QueryProcessor.java:247) 
> ~[main/:na]
>   at 
> org.apache.cassandra.cql3.QueryProcessor.process(QueryProcessor.java:232) 
> ~[main/:na]
>   at 
> org.apache.cassandra.transport.messages.QueryMessage.execute(QueryMessage.java:115)
>  ~[main/:na]
>   at 
> org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:516)
>  [main/:na]
>   at 
> org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:409)
>  [main/:na]
>   at 
> io.netty.channel.SimpleChannelInboundHandler.channelRead(SimpleChannelInboundHandler.java:105)
>  [netty-all-4.0.39.Final.jar:4.0.39.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:366)
>  [netty-all-4.0.39.Final.jar:4.0.39.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext.access$600(AbstractChannelHandlerContext.java:35)
>  [netty-all-4.0.39.Final.jar:4.0.39.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext$7.run(AbstractChannelHandlerContext.java:357)
>  [netty-all-4.0.39.Final.jar:4.0.39.Final]
>   at 
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) 
> [na:1.8.0_45]
>   at 
> org.apache.cassandra.concurrent.AbstractLocalAwareExecutorService$FutureTask.run(AbstractLocalAwareExecutorService.java:162)
>  [main/:na]
>   at org.apache.cassandra.concurrent.SEPWorker.run(SEPWorker.java:109) 
> [main/:na]
>   at java.lang.Thread.run(Thread.java:745) [na:1.8.0_45]
> {code}
> Related failures:
> http://cassci.datastax.com/job/trunk_novnode_dtest/480/testReport/paging_test/TestPagingData/test_paging_with_filtering_on_partition_key_on_clustering_columns/
> http://cassci.datastax.com/job/trunk_novnode_dtest/480/testReport/paging_test/TestPagingData/test_paging_with_filtering_on_partition_key_on_clustering_columns_with_contains/
> http://cassci.datastax.com/job/trunk_novnode_dtest/480/testReport/paging_test/TestPagingData/test_paging_with_filtering_on_partition_key_on_counter_columns/



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

[jira] [Updated] (CASSANDRA-12651) Failure in SecondaryIndexTest.testAllowFilteringOnPartitionKeyWithSecondaryIndex

2016-11-29 Thread Michael Shuler (JIRA) 

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

Michael Shuler updated CASSANDRA-12651:
---
Fix Version/s: (was: 3.x)
   3.10

> Failure in 
> SecondaryIndexTest.testAllowFilteringOnPartitionKeyWithSecondaryIndex
> 
>
> Key: CASSANDRA-12651
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12651
> Project: Cassandra
>  Issue Type: Bug
>  Components: Testing
>Reporter: Joel Knighton
>Assignee: Sam Tunnicliffe
>Priority: Critical
>  Labels: test-failure
> Fix For: 3.10, 3.0.x
>
>
> This has failed with/without compression.
> Stacktrace:
> {code}
> junit.framework.AssertionFailedError: Got less rows than expected. Expected 2 
> but got 0
>   at org.apache.cassandra.cql3.CQLTester.assertRows(CQLTester.java:909)
>   at 
> org.apache.cassandra.cql3.validation.entities.SecondaryIndexTest.lambda$testAllowFilteringOnPartitionKeyWithSecondaryIndex$78(SecondaryIndexTest.java:1228)
>   at 
> org.apache.cassandra.cql3.validation.entities.SecondaryIndexTest$$Lambda$293/218688965.apply(Unknown
>  Source)
>   at 
> org.apache.cassandra.cql3.CQLTester.beforeAndAfterFlush(CQLTester.java:1215)
>   at 
> org.apache.cassandra.cql3.validation.entities.SecondaryIndexTest.testAllowFilteringOnPartitionKeyWithSecondaryIndex(SecondaryIndexTest.java:1218)
> {code}
> Examples:
> http://cassci.datastax.com/job/trunk_testall/1176/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> http://cassci.datastax.com/job/trunk_testall/1176/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex_compression/
> http://cassci.datastax.com/job/trunk_testall/1219/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> http://cassci.datastax.com/job/trunk_testall/1216/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> http://cassci.datastax.com/job/trunk_testall/1208/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> http://cassci.datastax.com/job/trunk_testall/1176/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> http://cassci.datastax.com/job/trunk_testall/1175/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> May or may not be related, but there's a test failure (index duplicate):
> http://cassci.datastax.com/view/Dev/view/carlyeks/job/carlyeks-ticket-11803-3.X-testall/lastCompletedBuild/testReport/org.apache.cassandra.index.internal/CassandraIndexTest/indexOnFirstClusteringColumn_compression/
> http://cassci.datastax.com/job/ifesdjeen-11803-test-fix-trunk-testall/1/testReport/junit/org.apache.cassandra.index.internal/CassandraIndexTest/indexOnFirstClusteringColumn_compression/



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

[jira] [Updated] (CASSANDRA-12590) Segfault reading secondary index

2016-11-29 Thread Michael Shuler (JIRA) 

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

Michael Shuler updated CASSANDRA-12590:
---
Priority: Critical  (was: Major)

> Segfault reading secondary index
> 
>
> Key: CASSANDRA-12590
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12590
> Project: Cassandra
>  Issue Type: Bug
>  Components: Local Write-Read Paths
> Environment: Occurs on Cassandra 3.5 and 3.7
>Reporter: Cameron Zemek
>Assignee: Sam Tunnicliffe
>Priority: Critical
> Fix For: 3.10
>
>
> Getting segfaults when reading secondary index as follows:
> {code}
> J 9272 C2 
> org.apache.cassandra.dht.LocalPartitioner$LocalToken.compareTo(Lorg/apache/cassandra/dht/Token;)I
>  (53 bytes) @ 0x7fd7354749b7 [0x7fd735474840+0x177]
> J 5661 C2 org.apache.cassandra.db.DecoratedKey.compareTo(Ljava/lang/Object;)I 
> (9 bytes) @ 0x7fd7351b35b8 [0x7fd7351b3440+0x178]
> J 14205 C2 
> java.util.concurrent.ConcurrentSkipListMap.doGet(Ljava/lang/Object;)Ljava/lang/Object;
>  (142 bytes) @ 0x7fd736404dd8 [0x7fd736404cc0+0x118]
> J 17764 C2 
> org.apache.cassandra.db.SinglePartitionReadCommand.queryMemtableAndDiskInternal(Lorg/apache/cassandra/db/ColumnFamilyStore;)Lorg/apache/cassandra/db/rows/UnfilteredRowIterator;
>  (635 bytes) @ 0x7fd736e09638 [0x7fd736e08720+0xf18]
> J 17808 C2 
> org.apache.cassandra.index.internal.CassandraIndexSearcher.search(Lorg/apache/cassandra/db/ReadExecutionController;)Lorg/apache/cassandra/db/partitions/UnfilteredPartitionIterator;
>  (68 bytes) @ 0x7fd736e01a48 [0x7fd736e012a0+0x7a8]
> J 14217 C2 
> org.apache.cassandra.db.ReadCommand.executeLocally(Lorg/apache/cassandra/db/ReadExecutionController;)Lorg/apache/cassandra/db/partitions/UnfilteredPartitionIterator;
>  (219 bytes) @ 0x7fd736417c1c [0x7fd736416fa0+0xc7c]
> J 14585 C2 
> org.apache.cassandra.service.StorageProxy$LocalReadRunnable.runMayThrow()V 
> (337 bytes) @ 0x7fd736541e6c [0x7fd736541d60+0x10c]
> J 14584 C2 org.apache.cassandra.service.StorageProxy$DroppableRunnable.run()V 
> (48 bytes) @ 0x7fd7357957b4 [0x7fd735795760+0x54]
> J 9648% C2 org.apache.cassandra.concurrent.SEPWorker.run()V (253 bytes) @ 
> 0x7fd735938d8c [0x7fd7359356e0+0x36ac]
> {code}
> Which I have translated to the codepath:
> org.apache.cassandra.dht.LocalPartitioner (Line 139)
> org.apache.cassandra.db.DecoratedKey (Line 85)
> java.util.concurrent.ConcurrentSkipListMap (Line 794)
> org.apache.cassandra.db.SinglePartitionReadCommand (Line 498)
> org.apache.cassandra.index.internal.CassandraIndexSearcher (Line 60)
> org.apache.cassandra.db.ReadCommand (Line 367)



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

[jira] [Updated] (CASSANDRA-12651) Failure in SecondaryIndexTest.testAllowFilteringOnPartitionKeyWithSecondaryIndex

2016-11-29 Thread Michael Shuler (JIRA) 

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

Michael Shuler updated CASSANDRA-12651:
---
Priority: Critical  (was: Major)

> Failure in 
> SecondaryIndexTest.testAllowFilteringOnPartitionKeyWithSecondaryIndex
> 
>
> Key: CASSANDRA-12651
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12651
> Project: Cassandra
>  Issue Type: Bug
>  Components: Testing
>Reporter: Joel Knighton
>Assignee: Sam Tunnicliffe
>Priority: Critical
>  Labels: test-failure
> Fix For: 3.0.x, 3.x
>
>
> This has failed with/without compression.
> Stacktrace:
> {code}
> junit.framework.AssertionFailedError: Got less rows than expected. Expected 2 
> but got 0
>   at org.apache.cassandra.cql3.CQLTester.assertRows(CQLTester.java:909)
>   at 
> org.apache.cassandra.cql3.validation.entities.SecondaryIndexTest.lambda$testAllowFilteringOnPartitionKeyWithSecondaryIndex$78(SecondaryIndexTest.java:1228)
>   at 
> org.apache.cassandra.cql3.validation.entities.SecondaryIndexTest$$Lambda$293/218688965.apply(Unknown
>  Source)
>   at 
> org.apache.cassandra.cql3.CQLTester.beforeAndAfterFlush(CQLTester.java:1215)
>   at 
> org.apache.cassandra.cql3.validation.entities.SecondaryIndexTest.testAllowFilteringOnPartitionKeyWithSecondaryIndex(SecondaryIndexTest.java:1218)
> {code}
> Examples:
> http://cassci.datastax.com/job/trunk_testall/1176/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> http://cassci.datastax.com/job/trunk_testall/1176/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex_compression/
> http://cassci.datastax.com/job/trunk_testall/1219/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> http://cassci.datastax.com/job/trunk_testall/1216/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> http://cassci.datastax.com/job/trunk_testall/1208/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> http://cassci.datastax.com/job/trunk_testall/1176/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> http://cassci.datastax.com/job/trunk_testall/1175/testReport/org.apache.cassandra.cql3.validation.entities/SecondaryIndexTest/testAllowFilteringOnPartitionKeyWithSecondaryIndex/
> May or may not be related, but there's a test failure (index duplicate):
> http://cassci.datastax.com/view/Dev/view/carlyeks/job/carlyeks-ticket-11803-3.X-testall/lastCompletedBuild/testReport/org.apache.cassandra.index.internal/CassandraIndexTest/indexOnFirstClusteringColumn_compression/
> http://cassci.datastax.com/job/ifesdjeen-11803-test-fix-trunk-testall/1/testReport/junit/org.apache.cassandra.index.internal/CassandraIndexTest/indexOnFirstClusteringColumn_compression/



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

[jira] [Updated] (CASSANDRA-12905) Retry acquire MV lock on failure instead of throwing WTE on streaming

2016-11-29 Thread Michael Shuler (JIRA) 

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

Michael Shuler updated CASSANDRA-12905:
---
Fix Version/s: (was: 3.9)
   3.10

> Retry acquire MV lock on failure instead of throwing WTE on streaming
> -
>
> Key: CASSANDRA-12905
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12905
> Project: Cassandra
>  Issue Type: Bug
>  Components: Streaming and Messaging
> Environment: centos 6.7 x86_64
>Reporter: Nir Zilka
>Priority: Critical
> Fix For: 3.10
>
>
> Hello,
> I performed two upgrades to the current cluster (currently 15 nodes, 1 DC, 
> private VLAN),
> first it was 2.2.5.1 and repair worked flawlessly,
> second upgrade was to 3.0.9 (with upgradesstables) and also repair worked 
> well,
> then i upgraded 2 weeks ago to 3.9 - and the repair problems started.
> there are several errors types from the system.log (different nodes) :
> - Sync failed between /xxx.xxx.xxx.xxx and /xxx.xxx.xxx.xxx
> - Streaming error occurred on session with peer xxx.xxx.xxx.xxx Operation 
> timed out - received only 0 responses
> - Remote peer xxx.xxx.xxx.xxx failed stream session
> - Session completed with the following error
> org.apache.cassandra.streaming.StreamException: Stream failed
> 
> i use 3.9 default configuration with the cluster settings adjustments (3 
> seeds, GossipingPropertyFileSnitch).
> streaming_socket_timeout_in_ms is the default (8640).
> i'm afraid from consistency problems while i'm not performing repair.
> Any ideas?
> Thanks,
> Nir.



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

[jira] [Updated] (CASSANDRA-12590) Segfault reading secondary index

2016-11-29 Thread Michael Shuler (JIRA) 

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

Michael Shuler updated CASSANDRA-12590:
---
Fix Version/s: 3.10

> Segfault reading secondary index
> 
>
> Key: CASSANDRA-12590
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12590
> Project: Cassandra
>  Issue Type: Bug
>  Components: Local Write-Read Paths
> Environment: Occurs on Cassandra 3.5 and 3.7
>Reporter: Cameron Zemek
>Assignee: Sam Tunnicliffe
>Priority: Critical
> Fix For: 3.10
>
>
> Getting segfaults when reading secondary index as follows:
> {code}
> J 9272 C2 
> org.apache.cassandra.dht.LocalPartitioner$LocalToken.compareTo(Lorg/apache/cassandra/dht/Token;)I
>  (53 bytes) @ 0x7fd7354749b7 [0x7fd735474840+0x177]
> J 5661 C2 org.apache.cassandra.db.DecoratedKey.compareTo(Ljava/lang/Object;)I 
> (9 bytes) @ 0x7fd7351b35b8 [0x7fd7351b3440+0x178]
> J 14205 C2 
> java.util.concurrent.ConcurrentSkipListMap.doGet(Ljava/lang/Object;)Ljava/lang/Object;
>  (142 bytes) @ 0x7fd736404dd8 [0x7fd736404cc0+0x118]
> J 17764 C2 
> org.apache.cassandra.db.SinglePartitionReadCommand.queryMemtableAndDiskInternal(Lorg/apache/cassandra/db/ColumnFamilyStore;)Lorg/apache/cassandra/db/rows/UnfilteredRowIterator;
>  (635 bytes) @ 0x7fd736e09638 [0x7fd736e08720+0xf18]
> J 17808 C2 
> org.apache.cassandra.index.internal.CassandraIndexSearcher.search(Lorg/apache/cassandra/db/ReadExecutionController;)Lorg/apache/cassandra/db/partitions/UnfilteredPartitionIterator;
>  (68 bytes) @ 0x7fd736e01a48 [0x7fd736e012a0+0x7a8]
> J 14217 C2 
> org.apache.cassandra.db.ReadCommand.executeLocally(Lorg/apache/cassandra/db/ReadExecutionController;)Lorg/apache/cassandra/db/partitions/UnfilteredPartitionIterator;
>  (219 bytes) @ 0x7fd736417c1c [0x7fd736416fa0+0xc7c]
> J 14585 C2 
> org.apache.cassandra.service.StorageProxy$LocalReadRunnable.runMayThrow()V 
> (337 bytes) @ 0x7fd736541e6c [0x7fd736541d60+0x10c]
> J 14584 C2 org.apache.cassandra.service.StorageProxy$DroppableRunnable.run()V 
> (48 bytes) @ 0x7fd7357957b4 [0x7fd735795760+0x54]
> J 9648% C2 org.apache.cassandra.concurrent.SEPWorker.run()V (253 bytes) @ 
> 0x7fd735938d8c [0x7fd7359356e0+0x36ac]
> {code}
> Which I have translated to the codepath:
> org.apache.cassandra.dht.LocalPartitioner (Line 139)
> org.apache.cassandra.db.DecoratedKey (Line 85)
> java.util.concurrent.ConcurrentSkipListMap (Line 794)
> org.apache.cassandra.db.SinglePartitionReadCommand (Line 498)
> org.apache.cassandra.index.internal.CassandraIndexSearcher (Line 60)
> org.apache.cassandra.db.ReadCommand (Line 367)



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

[jira] [Updated] (CASSANDRA-12666) dtest failure in paging_test.TestPagingData.test_paging_with_filtering_on_partition_key

2016-11-29 Thread Michael Shuler (JIRA) 

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

Michael Shuler updated CASSANDRA-12666:
---
Priority: Critical  (was: Major)

> dtest failure in 
> paging_test.TestPagingData.test_paging_with_filtering_on_partition_key
> ---
>
> Key: CASSANDRA-12666
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12666
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sean McCarthy
>Assignee: Alex Petrov
>Priority: Critical
>  Labels: dtest
> Fix For: 3.x
>
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/trunk_novnode_dtest/480/testReport/paging_test/TestPagingData/test_paging_with_filtering_on_partition_key
> {code}
> Standard Output
> Unexpected error in node3 log, error: 
> ERROR [Native-Transport-Requests-3] 2016-09-17 00:50:11,543 Message.java:622 
> - Unexpected exception during request; channel = [id: 0x467a4afe, 
> L:/127.0.0.3:9042 - R:/127.0.0.1:59115]
> java.lang.AssertionError: null
>   at 
> org.apache.cassandra.dht.IncludingExcludingBounds.split(IncludingExcludingBounds.java:45)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageProxy.getRestrictedRanges(StorageProxy.java:2368)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageProxy$RangeIterator.(StorageProxy.java:1951)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageProxy.getRangeSlice(StorageProxy.java:2235)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.PartitionRangeReadCommand.execute(PartitionRangeReadCommand.java:184)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.pager.AbstractQueryPager.fetchPage(AbstractQueryPager.java:66)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.pager.PartitionRangeQueryPager.fetchPage(PartitionRangeQueryPager.java:36)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.statements.SelectStatement$Pager$NormalPager.fetchPage(SelectStatement.java:328)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.statements.SelectStatement.execute(SelectStatement.java:375)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.statements.SelectStatement.execute(SelectStatement.java:250)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.statements.SelectStatement.execute(SelectStatement.java:78)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.QueryProcessor.processStatement(QueryProcessor.java:216)
>  ~[main/:na]
>   at 
> org.apache.cassandra.cql3.QueryProcessor.process(QueryProcessor.java:247) 
> ~[main/:na]
>   at 
> org.apache.cassandra.cql3.QueryProcessor.process(QueryProcessor.java:232) 
> ~[main/:na]
>   at 
> org.apache.cassandra.transport.messages.QueryMessage.execute(QueryMessage.java:115)
>  ~[main/:na]
>   at 
> org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:516)
>  [main/:na]
>   at 
> org.apache.cassandra.transport.Message$Dispatcher.channelRead0(Message.java:409)
>  [main/:na]
>   at 
> io.netty.channel.SimpleChannelInboundHandler.channelRead(SimpleChannelInboundHandler.java:105)
>  [netty-all-4.0.39.Final.jar:4.0.39.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:366)
>  [netty-all-4.0.39.Final.jar:4.0.39.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext.access$600(AbstractChannelHandlerContext.java:35)
>  [netty-all-4.0.39.Final.jar:4.0.39.Final]
>   at 
> io.netty.channel.AbstractChannelHandlerContext$7.run(AbstractChannelHandlerContext.java:357)
>  [netty-all-4.0.39.Final.jar:4.0.39.Final]
>   at 
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) 
> [na:1.8.0_45]
>   at 
> org.apache.cassandra.concurrent.AbstractLocalAwareExecutorService$FutureTask.run(AbstractLocalAwareExecutorService.java:162)
>  [main/:na]
>   at org.apache.cassandra.concurrent.SEPWorker.run(SEPWorker.java:109) 
> [main/:na]
>   at java.lang.Thread.run(Thread.java:745) [na:1.8.0_45]
> {code}
> Related failures:
> http://cassci.datastax.com/job/trunk_novnode_dtest/480/testReport/paging_test/TestPagingData/test_paging_with_filtering_on_partition_key_on_clustering_columns/
> http://cassci.datastax.com/job/trunk_novnode_dtest/480/testReport/paging_test/TestPagingData/test_paging_with_filtering_on_partition_key_on_clustering_columns_with_contains/
> http://cassci.datastax.com/job/trunk_novnode_dtest/480/testReport/paging_test/TestPagingData/test_paging_with_filtering_on_partition_key_on_counter_columns/



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

[jira] [Created] (CASSANDRA-12973) Set amount of tables for stress-tool test

2016-11-29 Thread Vladimir Yudovin (JIRA) 
Vladimir Yudovin created CASSANDRA-12973:


 Summary: Set amount of tables for stress-tool test
 Key: CASSANDRA-12973
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12973
 Project: Cassandra
  Issue Type: New Feature
  Components: Tools
Reporter: Vladimir Yudovin
Assignee: Vladimir Yudovin


Currently all test are performed with single table standard1. It can be useful 
to allow setting any numbers of tables, for both WRITE and READ operations.

Can go on with patch if this feature is needed.



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

[jira] [Created] (CASSANDRA-12972) Print stress-tool ouput header about each 30 secs.

2016-11-29 Thread Vladimir Yudovin (JIRA) 
Vladimir Yudovin created CASSANDRA-12972:


 Summary: Print stress-tool ouput header about each 30 secs.
 Key: CASSANDRA-12972
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12972
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Reporter: Vladimir Yudovin
Assignee: Vladimir Yudovin
Priority: Minor


Currently header with columns meaning is printed only on test beginning. If 
test is long it's not handy to interpret rows with numbers only.

I propose to repeatably print headers each half-minute or so.

Path is available, is this improvement needed?

Thanks.



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

[jira] [Updated] (CASSANDRA-12970) Use conf.d style: combine cassandra.yaml with conf.d/*.yaml files

2016-11-29 Thread Vladimir Yudovin (JIRA) 

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

Vladimir Yudovin updated CASSANDRA-12970:
-
Summary: Use conf.d style: combine cassandra.yaml with conf.d/*.yaml files  
(was: Use conf.d style: combine cassandra.yaml with conf.d/*yaml files)

> Use conf.d style: combine cassandra.yaml with conf.d/*.yaml files
> -
>
> Key: CASSANDRA-12970
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12970
> Project: Cassandra
>  Issue Type: New Feature
>  Components: Configuration
>Reporter: Vladimir Yudovin
>Assignee: Vladimir Yudovin
>Priority: Minor
>
> Read and merge main cassandra.yaml with YAMLs from folder conf/conf.d
> First cassandra.yaml is read, than files from conf/conf.d are read in 
> alphabetical order. This allows handy creation/edit of host/deployment 
> specific configurations.
> I already have implementation, if this feature is needed, I go on with patch.



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

[jira] [Created] (CASSANDRA-12971) Add CAS option to WRITE test to stress tool

2016-11-29 Thread Vladimir Yudovin (JIRA) 
Vladimir Yudovin created CASSANDRA-12971:


 Summary: Add CAS option to WRITE test to stress tool
 Key: CASSANDRA-12971
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12971
 Project: Cassandra
  Issue Type: New Feature
  Components: Tools
Reporter: Vladimir Yudovin
Assignee: Vladimir Yudovin


If -cas option is present each UPDATE is performed with true IF condition, thus 
data is inserted anyway.

It's implemented, if it's needed I proceed with the patch.



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

[jira] [Created] (CASSANDRA-12970) Use conf.d style: combine cassandra.yaml with conf.d/*yaml files

2016-11-29 Thread Vladimir Yudovin (JIRA) 
Vladimir Yudovin created CASSANDRA-12970:


 Summary: Use conf.d style: combine cassandra.yaml with 
conf.d/*yaml files
 Key: CASSANDRA-12970
 URL: https://issues.apache.org/jira/browse/CASSANDRA-12970
 Project: Cassandra
  Issue Type: New Feature
  Components: Configuration
Reporter: Vladimir Yudovin
Assignee: Vladimir Yudovin
Priority: Minor


Read and merge main cassandra.yaml with YAMLs from folder conf/conf.d

First cassandra.yaml is read, than files from conf/conf.d are read in 
alphabetical order. This allows handy creation/edit of host/deployment specific 
configurations.

I already have implementation, if this feature is needed, I go on with patch.



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

[jira] [Commented] (CASSANDRA-12443) Remove alter type support

2016-11-29 Thread Benjamin Lerer (JIRA) 

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

Benjamin Lerer commented on CASSANDRA-12443:


bq. I retriggered the build.

It seems that the problem is caused by some {{NPE}}, I will stop the builds. 
[~carlyeks] can you investigate?

> Remove alter type support
> -
>
> Key: CASSANDRA-12443
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12443
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Carl Yeksigian
>Assignee: Carl Yeksigian
> Fix For: 3.x
>
>
> Currently, we allow altering of types. However, because we no longer store 
> the length for all types anymore, switching from a fixed-width to 
> variable-width type causes issues. commitlog playback breaking startup, 
> queries currently in flight getting back bad results, and special casing 
> required to handle the changes. In addition, this would solve 
> CASSANDRA-10309, as there is no possibility of the types changing while an 
> SSTableReader is open.
> For fixed-length, compatible types, the alter also doesn't add much over a 
> cast, so users could use that in order to retrieve the altered type.



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

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

2016-11-29 Thread Sean McCarthy (JIRA) 

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

Sean McCarthy resolved CASSANDRA-12939.
---
Resolution: Fixed

> dtest failure in 
> cqlsh_tests.cqlsh_copy_tests.CqlshCopyTest.test_bulk_round_trip_with_backoff
> -
>
> Key: CASSANDRA-12939
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12939
> Project: Cassandra
>  Issue Type: Test
>Reporter: Sean McCarthy
>Assignee: Sean McCarthy
>  Labels: dtest, test-failure
> Attachments: node1.log, node1_debug.log, node1_gc.log, node2.log, 
> node2_debug.log, node2_gc.log, node3.log, node3_debug.log, node3_gc.log
>
>
> example failure:
> http://cassci.datastax.com/job/cassandra-3.X_dtest/40/testReport/cqlsh_tests.cqlsh_copy_tests/CqlshCopyTest/test_bulk_round_trip_with_backoff
> {code}
> Error Message
> 25 != 244475
> ...
> dtest: DEBUG: Errors:
> Using CQL driver:  '/home/automaton/cassandra/bin/../lib/cassandra-driver-internal-only-3.7.0.post0-2481531.zip/cassandra-driver-3.7.0.post0-2481531/cassandra/__init__.py'>
> Using connect timeout: 5 seconds
> Using 'utf-8' encoding
> Using ssl: False
> :3:Error for (2730718820402670492, 3207787379576163567): 
> OperationTimedOut - errors={'127.0.0.1': 'Client request timeout. See 
> Session.execute[_async](timeout)'}, last_host=127.0.0.1 (permanently given up 
> after 1000 rows and 1 attempts)
> :3:Exported 96 ranges out of 97 total ranges, some records might be 
> missing
> {code}{code}
> Stacktrace
>   File "/usr/lib/python2.7/unittest/case.py", line 329, in run
> testMethod()
>   File "/home/automaton/cassandra-dtest/dtest.py", line 1099, in wrapped
> f(obj)
>   File "/home/automaton/cassandra-dtest/tools/decorators.py", line 46, in 
> wrapped
> f(obj)
>   File "/home/automaton/cassandra-dtest/cqlsh_tests/cqlsh_copy_tests.py", 
> line 2613, in test_bulk_round_trip_with_backoff
> copy_from_options={'MAXINFLIGHTMESSAGES': 64, 'MAXPENDINGCHUNKS': 1})
>   File "/home/automaton/cassandra-dtest/cqlsh_tests/cqlsh_copy_tests.py", 
> line 2508, in _test_bulk_round_trip
> sum(1 for _ in open(tempfile2.name)))
>   File "/usr/lib/python2.7/unittest/case.py", line 513, in assertEqual
> assertion_func(first, second, msg=msg)
>   File "/usr/lib/python2.7/unittest/case.py", line 506, in _baseAssertEqual
> raise self.failureException(msg)
> {code}



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

[jira] [Commented] (CASSANDRA-12443) Remove alter type support

2016-11-29 Thread Benjamin Lerer (JIRA) 

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

Benjamin Lerer commented on CASSANDRA-12443:


There was obviously a problem with the last CI runs for {{3.X}} and {{trunk}}. 
I retriggered the build.
If the tests pass I am +1 with the patches.

> Remove alter type support
> -
>
> Key: CASSANDRA-12443
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12443
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Carl Yeksigian
>Assignee: Carl Yeksigian
> Fix For: 3.x
>
>
> Currently, we allow altering of types. However, because we no longer store 
> the length for all types anymore, switching from a fixed-width to 
> variable-width type causes issues. commitlog playback breaking startup, 
> queries currently in flight getting back bad results, and special casing 
> required to handle the changes. In addition, this would solve 
> CASSANDRA-10309, as there is no possibility of the types changing while an 
> SSTableReader is open.
> For fixed-length, compatible types, the alter also doesn't add much over a 
> cast, so users could use that in order to retrieve the altered type.



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

[jira] [Commented] (CASSANDRA-12900) Resurrect or remove HeapPool (unslabbed_heap_buffers)

2016-11-29 Thread Branimir Lambov (JIRA) 

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

Branimir Lambov commented on CASSANDRA-12900:
-

LGTM

> Resurrect or remove HeapPool (unslabbed_heap_buffers)
> -
>
> Key: CASSANDRA-12900
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12900
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Marcus Eriksson
>Assignee: Marcus Eriksson
> Fix For: 3.0.x, 3.x
>
>
> Seems this code has been commented out since CASSANDRA-8099 - we should 
> either remove the option or fix the code



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

[jira] [Updated] (CASSANDRA-12649) Add BATCH metrics

2016-11-29 Thread Benjamin Lerer (JIRA) 

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

Benjamin Lerer updated CASSANDRA-12649:
---
Assignee: Alwyn Davis

> Add BATCH metrics
> -
>
> Key: CASSANDRA-12649
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12649
> Project: Cassandra
>  Issue Type: Wish
>Reporter: Alwyn Davis
>Assignee: Alwyn Davis
>Priority: Minor
> Fix For: 3.x
>
> Attachments: 12649-3.x-v2.patch, 12649-3.x.patch, 
> stress-batch-metrics.tar.gz, stress-trunk.tar.gz, trunk-12649.txt
>
>
> To identify causes of load on a cluster, it would be useful to have some 
> additional metrics:
> * *Mutation size distribution:* I believe this would be relevant when 
> tracking the performance of unlogged batches.
> * *Logged / Unlogged Partitions per batch distribution:* This would also give 
> a count of batch types processed. Multiple distinct tables in batch would 
> just be considered as separate partitions.



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

[jira] [Commented] (CASSANDRA-12900) Resurrect or remove HeapPool (unslabbed_heap_buffers)

2016-11-29 Thread Marcus Eriksson (JIRA) 

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

Marcus Eriksson commented on CASSANDRA-12900:
-

Good point - rebased and pushed a new commit to remove DataReclaimer and 
triggered new builds.

> Resurrect or remove HeapPool (unslabbed_heap_buffers)
> -
>
> Key: CASSANDRA-12900
> URL: https://issues.apache.org/jira/browse/CASSANDRA-12900
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Marcus Eriksson
>Assignee: Marcus Eriksson
> Fix For: 3.0.x, 3.x
>
>
> Seems this code has been commented out since CASSANDRA-8099 - we should 
> either remove the option or fix the code



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

  1   2   >