[jira] [Commented] (CASSANDRA-10485) Missing host ID on hinted handoff write

[Ariel Weisberg (JIRA)]

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

Ariel Weisberg commented on CASSANDRA-10485:


Can you update the comment HintedHandoffManager.hintFor so that it says that 
getEndpointForHostId can return null in regular operation and not just test? 
Wouldn't want that check to get removed.

Another thing that is weird is that we convert from InetAddr to host id and 
then HintedHandoffManager converts that back into an InetAddr (although maybe 
not the same one?).

I am not sure how big these things are or how often we rebuild them, but 
constructing a copy of every map as we iterate even when we aren't going to 
modify it is more work. If it's not too much churn it's fine I just want to 
make sure it doesn't end up biting us.

I looked at the 3.0 code and it looks good.

> Missing host ID on hinted handoff write
> ---
>
> Key: CASSANDRA-10485
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10485
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Paulo Motta
>Assignee: Paulo Motta
> Fix For: 2.1.x, 2.2.x, 3.0.x
>
>
> when I restart one of them I receive the error "Missing host ID":
> {noformat}
> WARN  [SharedPool-Worker-1] 2015-10-08 13:15:33,882 
> AbstractTracingAwareExecutorService.java:169 - Uncaught exception on thread 
> Thread[SharedPool-Worker-1,5,main]: {}
> java.lang.AssertionError: Missing host ID for 63.251.156.141
> at 
> org.apache.cassandra.service.StorageProxy.writeHintForMutation(StorageProxy.java:978)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at 
> org.apache.cassandra.service.StorageProxy$6.runMayThrow(StorageProxy.java:950)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at 
> org.apache.cassandra.service.StorageProxy$HintRunnable.run(StorageProxy.java:2235)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at 
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) 
> ~[na:1.8.0_60]
> at 
> org.apache.cassandra.concurrent.AbstractTracingAwareExecutorService$FutureTask.run(AbstractTracingAwareExecutorService.java:164)
>  ~[apache-cassandra-2.1.3.jar:2.1.3]
> at org.apache.cassandra.concurrent.SEPWorker.run(SEPWorker.java:105) 
> [apache-cassandra-2.1.3.jar:2.1.3]
> at java.lang.Thread.run(Thread.java:745) [na:1.8.0_60]
> {noformat}
> If I made nodetool status, the problematic node has ID:
> {noformat}
> UN  10.10.10.12  1.3 TB 1   ?   
> 4d5c8fd2-a909-4f09-a23c-4cd6040f338a  rack3
> {noformat}



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

[jira] [Updated] (CASSANDRA-10649) Cassandra 2.1 start failed with exception:Exception encountered during startup

[Jim Witschey (JIRA)]

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

Jim Witschey updated CASSANDRA-10649:
-
Description: 
I am trying to setup cassandra single node cluster. i've downloaded below build:
apache-cassandra-2.1.11-bin.tar.gz
I've upgraded Java to 1.8 as well, as earlier it was throwing errors related to 
Java version.

{code}
[root@localhost cassandra]# java -version
java version "1.8.0_60"
Java(TM) SE Runtime Environment (build 1.8.0_60-b27)
Java HotSpot(TM) 64-Bit Server VM (build 25.60-b23, mixed mode)
{code}

I've also verified the cassandra.yaml file from "http://www.yamllint.com/; as 
well. But while starting cassandra, I am getting vague exception as below:

{code}
INFO  15:52:11 Compacting 
[SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-18-Data.db'),
 
SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-17-Data.db'),
 
SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-20-Data.db'),
 
SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-19-Data.db')]
INFO  15:52:11 Node localhost/127.0.0.1 state jump to normal
INFO  15:52:11 Netty using native Epoll event loop
ERROR 15:52:11 Exception encountered during startup
java.lang.NullPointerException: null
at org.apache.cassandra.transport.Server.run(Server.java:171) 
~[apache-cassandra-2.1.11.jar:2.1.11]
at org.apache.cassandra.transport.Server.start(Server.java:117) 
~[apache-cassandra-2.1.11.jar:2.1.11]
at 
org.apache.cassandra.service.CassandraDaemon.start(CassandraDaemon.java:492) 
[apache-cassandra-2.1.11.jar:2.1.11]
at 
org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:575) 
[apache-cassandra-2.1.11.jar:2.1.11]
at 
org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:651) 
[apache-cassandra-2.1.11.jar:2.1.11]
java.lang.NullPointerException
at org.apache.cassandra.transport.Server.run(Server.java:171)
at org.apache.cassandra.transport.Server.start(Server.java:117)
at 
org.apache.cassandra.service.CassandraDaemon.start(CassandraDaemon.java:492)
at 
org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:575)
at 
org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:651)
Exception encountered during startup: null
INFO  15:52:11 Announcing shutdown
INFO  15:52:11 Node localhost/127.0.0.1 state jump to normal
INFO  15:52:11 Compacted 4 sstables to 
[/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-21,].
  11,427 bytes to 5,749 (~50% of original) in 199ms = 0.027551MB/s.  4 total 
partitions merged to 1.  Partition merge counts were {4:1, }
INFO  15:52:13 Waiting for messaging service to quiesce
INFO  15:52:13 MessagingService has terminated the accept() thread
[root@localhost server]#
{code}

I've also posted the issue on stack overflow as well:
http://stackoverflow.com/questions/33514745/cassandra-startup-failed-with-exception-exception-encountered-during-startup

Request some one to assist on this issue.


  was:
I am trying to setup cassandra single node cluster. i've downloaded below build:
apache-cassandra-2.1.11-bin.tar.gz
I've upgraded Java to 1.8 as well, as earlier it was throwing errors related to 
Java version.
+
[root@localhost cassandra]# java -version
java version "1.8.0_60"
Java(TM) SE Runtime Environment (build 1.8.0_60-b27)
Java HotSpot(TM) 64-Bit Server VM (build 25.60-b23, mixed mode)
+

I've also verified the cassandra.yaml file from "http://www.yamllint.com/; as 
well. But while starting cassandra, I am getting vague exception as below:

INFO  15:52:11 Compacting 
[SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-18-Data.db'),
 
SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-17-Data.db'),
 
SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-20-Data.db'),
 
SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-19-Data.db')]
INFO  15:52:11 Node localhost/127.0.0.1 state jump to normal
INFO  15:52:11 Netty using native Epoll event loop
ERROR 15:52:11 Exception encountered during startup
java.lang.NullPointerException: null
at org.apache.cassandra.transport.Server.run(Server.java:171) 
~[apache-cassandra-2.1.11.jar:2.1.11]
at org.apache.cassandra.transport.Server.start(Server.java:117) 

[jira] [Updated] (CASSANDRA-10651) allow unit testing by defined list of files

[Russ Hatch (JIRA)]

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

Russ Hatch updated CASSANDRA-10651:
---
Attachment: trunk-10651-v3.txt

Seems like a good idea. Was a bit difficult to squeeze enough info into the 
description, but here's a little v3 patch.

> allow unit testing by defined list of files
> ---
>
> Key: CASSANDRA-10651
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10651
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Russ Hatch
>Assignee: Russ Hatch
> Fix For: 3.2
>
> Attachments: test_slice_001.txt, trunk-10651-v2.txt, 
> trunk-10651-v3.txt, trunk-10651.txt
>
>
> "Testing by list" allows distributing defined test lists across machines to 
> run tests in parallel.
> Additionally it can be used by devs to create a simple list of tests they are 
> interested in during feature development, without crafting a complicated 
> command.
> A final reason would be adding a new way to divide tests into suites without 
> requiring more unique ant targets (which may differ in subtle ways for better 
> or worse).



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

[jira] [Commented] (CASSANDRA-10649) Cassandra 2.1 start failed with exception:Exception encountered during startup

[Jim Witschey (JIRA)]

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

Jim Witschey commented on CASSANDRA-10649:
--

For record-keeping purposes, I've copied [the {{cassandra.yaml}} posted on 
stack overflow|http://stackoverflow.com/questions/33514745] and attached it to 
this ticket.

[~sthakur] As someone noted on your SO question, your 
{{client_encryption_options}} section may not be valid:

{code}
client_encryption_options:
#enabled: false
#keystore: conf/.keystore
#keystore_password: cassandra
{code}

What happens when you try

{code}
client_encryption_options:
enabled: false
{code}

If that fixes it, then we need to improve error reporting for situations like 
this.

> Cassandra 2.1 start failed with exception:Exception encountered during startup
> --
>
> Key: CASSANDRA-10649
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10649
> Project: Cassandra
>  Issue Type: Bug
>  Components: Configuration
> Environment: Linux: Fedora-16 64 bit
>Reporter: sandeep thakur
> Fix For: 2.1.x
>
> Attachments: cassandra.yaml
>
>
> I am trying to setup cassandra single node cluster. i've downloaded below 
> build:
> apache-cassandra-2.1.11-bin.tar.gz
> I've upgraded Java to 1.8 as well, as earlier it was throwing errors related 
> to Java version.
> {code}
> [root@localhost cassandra]# java -version
> java version "1.8.0_60"
> Java(TM) SE Runtime Environment (build 1.8.0_60-b27)
> Java HotSpot(TM) 64-Bit Server VM (build 25.60-b23, mixed mode)
> {code}
> I've also verified the cassandra.yaml file from "http://www.yamllint.com/; as 
> well. But while starting cassandra, I am getting vague exception as below:
> {code}
> INFO  15:52:11 Compacting 
> [SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-18-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-17-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-20-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-19-Data.db')]
> INFO  15:52:11 Node localhost/127.0.0.1 state jump to normal
> INFO  15:52:11 Netty using native Epoll event loop
> ERROR 15:52:11 Exception encountered during startup
> java.lang.NullPointerException: null
> at org.apache.cassandra.transport.Server.run(Server.java:171) 
> ~[apache-cassandra-2.1.11.jar:2.1.11]
> at org.apache.cassandra.transport.Server.start(Server.java:117) 
> ~[apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.start(CassandraDaemon.java:492) 
> [apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:575)
>  [apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:651) 
> [apache-cassandra-2.1.11.jar:2.1.11]
> java.lang.NullPointerException
> at org.apache.cassandra.transport.Server.run(Server.java:171)
> at org.apache.cassandra.transport.Server.start(Server.java:117)
> at 
> org.apache.cassandra.service.CassandraDaemon.start(CassandraDaemon.java:492)
> at 
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:575)
> at 
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:651)
> Exception encountered during startup: null
> INFO  15:52:11 Announcing shutdown
> INFO  15:52:11 Node localhost/127.0.0.1 state jump to normal
> INFO  15:52:11 Compacted 4 sstables to 
> [/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-21,].
>   11,427 bytes to 5,749 (~50% of original) in 199ms = 0.027551MB/s.  4 total 
> partitions merged to 1.  Partition merge counts were {4:1, }
> INFO  15:52:13 Waiting for messaging service to quiesce
> INFO  15:52:13 MessagingService has terminated the accept() thread
> [root@localhost server]#
> {code}
> I've also posted the issue on stack overflow as well:
> http://stackoverflow.com/questions/33514745/cassandra-startup-failed-with-exception-exception-encountered-during-startup
> Request some one to assist on this issue.



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

[jira] [Commented] (CASSANDRA-10584) reads with EACH_QUORUM on keyspace with SimpleTopologyStrategy throw a ClassCastException

[Ariel Weisberg (JIRA)]

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

Ariel Weisberg commented on CASSANDRA-10584:


Yikes... the pull request for CASSANDRA-9602 was never merged.

> reads with EACH_QUORUM  on keyspace with SimpleTopologyStrategy throw a 
> ClassCastException
> --
>
> Key: CASSANDRA-10584
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10584
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Andy Tolbert
>Assignee: Carl Yeksigian
>Priority: Minor
> Fix For: 3.0.0
>
>
> I think this may be a regression introduced w/ [CASSANDRA-9602].  Starting 
> with C* 3.0.0-rc2 an error is returned when querying a keyspace with 
> {{SimpleTopologyStrategy}} using EACH_QUORUM CL:
> {noformat}
> cqlsh> create keyspace test with replication = {'class': 'SimpleStrategy', 
> 'replication_factor': 1};
> cqlsh> create table test.test (k int PRIMARY KEY, i int);
> cqlsh> consistency EACH_QUORUM;
> Consistency level set to EACH_QUORUM.
> cqlsh> select * from test.test;
> ServerError:  message="java.lang.ClassCastException: 
> org.apache.cassandra.locator.SimpleStrategy cannot be cast to 
> org.apache.cassandra.locator.NetworkTopologyStrategy">
> {noformat}
> The exception yielded in the system logs:
> {noformat}
> ERROR [SharedPool-Worker-1] 2015-10-23 13:02:15,405 ErrorMessage.java:336 - 
> Unexpected exception during request
> java.lang.ClassCastException: org.apache.cassandra.locator.SimpleStrategy 
> cannot be cast to org.apache.cassandra.locator.NetworkTopologyStrategy
> at 
> org.apache.cassandra.db.ConsistencyLevel.filterForEachQuorum(ConsistencyLevel.java:227)
>  ~[main/:na]
> at 
> org.apache.cassandra.db.ConsistencyLevel.filterForQuery(ConsistencyLevel.java:188)
>  ~[main/:na]
> at 
> org.apache.cassandra.db.ConsistencyLevel.filterForQuery(ConsistencyLevel.java:180)
>  ~[main/:na]
> at 
> org.apache.cassandra.service.StorageProxy$RangeIterator.computeNext(StorageProxy.java:1795)
>  ~[main/:na]
> at 
> org.apache.cassandra.service.StorageProxy$RangeIterator.computeNext(StorageProxy.java:1762)
>  ~[main/:na]
> at 
> org.apache.cassandra.utils.AbstractIterator.hasNext(AbstractIterator.java:47) 
> ~[main/:na]
> at 
> com.google.common.collect.Iterators$PeekingImpl.hasNext(Iterators.java:1149) 
> ~[guava-18.0.jar:na]
> at 
> org.apache.cassandra.service.StorageProxy$RangeMerger.computeNext(StorageProxy.java:1814)
>  ~[main/:na]
> at 
> org.apache.cassandra.service.StorageProxy$RangeMerger.computeNext(StorageProxy.java:1799)
>  ~[main/:na]
> at 
> org.apache.cassandra.utils.AbstractIterator.hasNext(AbstractIterator.java:47) 
> ~[main/:na]
> at 
> org.apache.cassandra.service.StorageProxy$RangeCommandIterator.computeNext(StorageProxy.java:1925)
>  ~[main/:na]
> at 
> org.apache.cassandra.service.StorageProxy$RangeCommandIterator.computeNext(StorageProxy.java:1892)
>  ~[main/:na]
> at 
> org.apache.cassandra.utils.AbstractIterator.hasNext(AbstractIterator.java:47) 
> ~[main/:na]
> at 
> org.apache.cassandra.db.partitions.WrappingPartitionIterator.hasNext(WrappingPartitionIterator.java:33)
>  ~[main/:na]
> at 
> org.apache.cassandra.db.partitions.CountingPartitionIterator.hasNext(CountingPartitionIterator.java:49)
>  ~[main/:na]
> at 
> org.apache.cassandra.db.partitions.WrappingPartitionIterator.hasNext(WrappingPartitionIterator.java:33)
>  ~[main/:na]
> at 
> org.apache.cassandra.db.partitions.CountingPartitionIterator.hasNext(CountingPartitionIterator.java:49)
>  ~[main/:na]
> at 
> org.apache.cassandra.service.pager.AbstractQueryPager$PagerIterator.hasNext(AbstractQueryPager.java:99)
>  ~[main/:na]
> at 
> org.apache.cassandra.cql3.statements.SelectStatement.process(SelectStatement.java:610)
>  ~[main/:na]
> at 
> org.apache.cassandra.cql3.statements.SelectStatement.processResults(SelectStatement.java:371)
>  ~[main/:na]
> at 
> org.apache.cassandra.cql3.statements.SelectStatement.execute(SelectStatement.java:327)
>  ~[main/:na]
> at 
> org.apache.cassandra.cql3.statements.SelectStatement.execute(SelectStatement.java:213)
>  ~[main/:na]
> at 
> org.apache.cassandra.cql3.statements.SelectStatement.execute(SelectStatement.java:76)
>  ~[main/:na]
> at 
> org.apache.cassandra.cql3.QueryProcessor.processStatement(QueryProcessor.java:205)
>  ~[main/:na]
> at 
> org.apache.cassandra.cql3.QueryProcessor.process(QueryProcessor.java:236) 
> ~[main/:na]
> at 
> org.apache.cassandra.cql3.QueryProcessor.process(QueryProcessor.java:221) 
> ~[main/:na]
> at 
> 

[jira] [Updated] (CASSANDRA-10651) allow unit testing by defined list of files

[Russ Hatch (JIRA)]

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

Russ Hatch updated CASSANDRA-10651:
---
Attachment: trunk-10651-v2.txt

attaching updated patch with a little more comment documentation, an updated 
task description and renamed the file name property to test.classlistfile.

> allow unit testing by defined list of files
> ---
>
> Key: CASSANDRA-10651
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10651
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Russ Hatch
>Assignee: Russ Hatch
> Fix For: 3.2
>
> Attachments: test_slice_001.txt, trunk-10651-v2.txt, trunk-10651.txt
>
>
> "Testing by list" allows distributing defined test lists across machines to 
> run tests in parallel.
> Additionally it can be used by devs to create a simple list of tests they are 
> interested in during feature development, without crafting a complicated 
> command.
> A final reason would be adding a new way to divide tests into suites without 
> requiring more unique ant targets (which may differ in subtle ways for better 
> or worse).



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

[jira] [Updated] (CASSANDRA-10649) Cassandra 2.1 start failed with exception:Exception encountered during startup

[Jim Witschey (JIRA)]

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

Jim Witschey updated CASSANDRA-10649:
-
Attachment: cassandra.yaml

> Cassandra 2.1 start failed with exception:Exception encountered during startup
> --
>
> Key: CASSANDRA-10649
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10649
> Project: Cassandra
>  Issue Type: Bug
>  Components: Configuration
> Environment: Linux: Fedora-16 64 bit
>Reporter: sandeep thakur
> Fix For: 2.1.x
>
> Attachments: cassandra.yaml
>
>
> I am trying to setup cassandra single node cluster. i've downloaded below 
> build:
> apache-cassandra-2.1.11-bin.tar.gz
> I've upgraded Java to 1.8 as well, as earlier it was throwing errors related 
> to Java version.
> {code}
> [root@localhost cassandra]# java -version
> java version "1.8.0_60"
> Java(TM) SE Runtime Environment (build 1.8.0_60-b27)
> Java HotSpot(TM) 64-Bit Server VM (build 25.60-b23, mixed mode)
> {code}
> I've also verified the cassandra.yaml file from "http://www.yamllint.com/; as 
> well. But while starting cassandra, I am getting vague exception as below:
> {code}
> INFO  15:52:11 Compacting 
> [SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-18-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-17-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-20-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-19-Data.db')]
> INFO  15:52:11 Node localhost/127.0.0.1 state jump to normal
> INFO  15:52:11 Netty using native Epoll event loop
> ERROR 15:52:11 Exception encountered during startup
> java.lang.NullPointerException: null
> at org.apache.cassandra.transport.Server.run(Server.java:171) 
> ~[apache-cassandra-2.1.11.jar:2.1.11]
> at org.apache.cassandra.transport.Server.start(Server.java:117) 
> ~[apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.start(CassandraDaemon.java:492) 
> [apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:575)
>  [apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:651) 
> [apache-cassandra-2.1.11.jar:2.1.11]
> java.lang.NullPointerException
> at org.apache.cassandra.transport.Server.run(Server.java:171)
> at org.apache.cassandra.transport.Server.start(Server.java:117)
> at 
> org.apache.cassandra.service.CassandraDaemon.start(CassandraDaemon.java:492)
> at 
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:575)
> at 
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:651)
> Exception encountered during startup: null
> INFO  15:52:11 Announcing shutdown
> INFO  15:52:11 Node localhost/127.0.0.1 state jump to normal
> INFO  15:52:11 Compacted 4 sstables to 
> [/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-21,].
>   11,427 bytes to 5,749 (~50% of original) in 199ms = 0.027551MB/s.  4 total 
> partitions merged to 1.  Partition merge counts were {4:1, }
> INFO  15:52:13 Waiting for messaging service to quiesce
> INFO  15:52:13 MessagingService has terminated the accept() thread
> [root@localhost server]#
> {code}
> I've also posted the issue on stack overflow as well:
> http://stackoverflow.com/questions/33514745/cassandra-startup-failed-with-exception-exception-encountered-during-startup
> Request some one to assist on this issue.



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

[jira] [Updated] (CASSANDRA-10641) simultaneous_bootstrap_test fails on Windows

[Joshua McKenzie (JIRA)]

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

Joshua McKenzie updated CASSANDRA-10641:

Attachment: 10641.txt

Changed launch params to redirect stdout/err to console. Added -q flag to 
retain previous (quiet) behavior.

CI on Windows: 
[utest|https://cassci.datastax.com/view/Dev/view/josh-mckenzie/job/josh-mckenzie-10641_windows-utest_win32/1/]
 and 
[dtest|https://cassci.datastax.com/view/Dev/view/josh-mckenzie/job/josh-mckenzie-10641_windows-dtest_win32/1/]

> simultaneous_bootstrap_test fails on Windows
> 
>
> Key: CASSANDRA-10641
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10641
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Joshua McKenzie
> Fix For: 2.2.x, 3.0.0
>
> Attachments: 10641.txt
>
>
> {{bootstrap_test.py:TestBootstrap.simultaneous_bootstrap_test}} fails on 
> Windows on C* 3.0 and 2.2:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/99/testReport/junit/bootstrap_test/TestBootstrap/simultaneous_bootstrap_test/
> http://cassci.datastax.com/view/win32/job/cassandra-2.2_dtest_win32/127/testReport/junit/bootstrap_test/TestBootstrap/simultaneous_bootstrap_test/
> It expects there to be a warning in the stderr of the node attempting to 
> start while another node boostraps, but the stderr is empty. It fails on this 
> line:
> https://github.com/riptano/cassandra-dtest/blob/master/bootstrap_test.py#L469
> [~yukim] I believe you're the person to handle this ticket? I'll assign you, 
> but feel free to reassign.



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

[jira] [Commented] (CASSANDRA-10492) Fix failing upgrade tests on 2.1->2.2 path

[Ariel Weisberg (JIRA)]

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

Ariel Weisberg commented on CASSANDRA-10492:


{{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions}}
 is caused by a change in the exceptions thrown by the python driver for 
timeouts (or possibly it was always wrong). Need to check for OperationTimedOut 
as well.

> Fix failing upgrade tests on 2.1->2.2 path
> --
>
> Key: CASSANDRA-10492
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10492
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Jim Witschey
>Assignee: Ariel Weisberg
>  Labels: triage
> Fix For: 2.1.x, 2.2.x
>
> Attachments: test_stdout.txt
>
>
> 2 dtests for the storage engine upgrade on the 2.1->2.2 path fail:
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-21_HEAD-22_tarball/lastCompletedBuild/testReport/
> (If there are 3 failures at that link, don't worry; one was a dtest bug 
> that's been fixed.)
> {{upgrade_tests/cql_tests.py:TestCQL.large_count_test}} flaps when a TRUNCATE 
> operation times out:
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-21_HEAD-22_tarball/20/testReport/upgrade_tests.cql_tests/TestCQL/large_count_test/history/
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions}}
>  also fails on this upgrade path:
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-21_HEAD-22_tarball/15/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_failure_threshold_deletions/history/
> These are in the same ticket for the moment, but if one becomes a longer 
> project, it should be broken out into a separate ticket.



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

[jira] [Commented] (CASSANDRA-10628) get JEMAlloc debug output out of nodetool output

[Robert Stupp (JIRA)]

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

Robert Stupp commented on CASSANDRA-10628:
--

Works on both OSX and Linux (latest Debian).
Thanks, committed as 0ff13d2a6847f7ecba1ac9a26b66714d9e58b60d to 2.2, 3.0, trunk


> get JEMAlloc debug output out of nodetool output
> 
>
> Key: CASSANDRA-10628
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10628
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Jim Witschey
>Assignee: Robert Stupp
> Fix For: 2.2.4, 3.0.0
>
>
> This is a followup ticket for CASSANDRA-10581. The consensus on the Cassandra 
> TE is that the debug output for loading JEMAlloc is helpful (or at least 
> harmless when starting C*, but not when starting {{nodetool}}, which, it 
> turns out, sources {{cassandra-env}}:
> https://github.com/apache/cassandra/blob/trunk/bin/nodetool#L53
> You can reproduce the excessive output with
> {code}
> ccm create test-nodetool-output -v git:cassandra-3.0 -n 1 ; ccm start 
> --wait-for-binary-proto ; ccm node1 nodetool ring
> {code}
> The simplest solution would probably be to redirect the output of the 
> sourcing to {{/dev/null/}}. I don't know if that's the right thing to do; it 
> may be better to move the {{LD_PRELOAD}}-setting logic to {{bin/cassandra}}. 
> I'm not sure what the reasoning would be for putting something in one place 
> or another, so I leave it to the dev team to decide on the best solution.
> Assigning [~snazy] for now; feel free to reassign



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

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

[snazy]

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

Branch: refs/heads/trunk
Commit: 242b9738f21e835c3f0cb734c96947c4e4ed0710
Parents: 340df43 0ff13d2
Author: Robert Stupp 
Authored: Wed Nov 4 23:29:44 2015 +0100
Committer: Robert Stupp 
Committed: Wed Nov 4 23:29:44 2015 +0100

--
 CHANGES.txt |  2 +-
 bin/cassandra   | 49 
 conf/cassandra-env.sh   | 49 
 .../apache/cassandra/service/StartupChecks.java | 19 +++-
 4 files changed, 68 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/242b9738/CHANGES.txt
--
diff --cc CHANGES.txt
index 1914fa1,fedede2..5fdeae5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,10 +1,29 @@@
 -2.2.4
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 +3.0
 + * Use CQL type names in schema metadata tables (CASSANDRA-10365)
 + * Guard batchlog replay against integer division by zero (CASSANDRA-9223)
 + * Fix bug when adding a column to thrift with the same name than a primary 
key (CASSANDRA-10608)
 + * Add client address argument to IAuthenticator::newSaslNegotiator 
(CASSANDRA-8068)
 + * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
 + * Don't use 'names query' read path for counters (CASSANDRA-10572)
 + * Fix backward compatibility for counters (CASSANDRA-10470)
-  * Remove memory_allocator paramter from cassandra.yaml (CASSANDRA-10581)
++ * Remove memory_allocator paramter from cassandra.yaml 
(CASSANDRA-10581,10628)
 + * Execute the metadata reload task of all registered indexes on CFS::reload 
(CASSANDRA-10604)
 + * Fix thrift cas operations with defined columns (CASSANDRA-10576)
 + * Fix PartitionUpdate.operationCount()for updates with static column 
operations (CASSANDRA-10606)
 + * Fix thrift get() queries with defined columns (CASSANDRA-10586)
 + * Fix marking of indexes as built and removed (CASSANDRA-10601)
 + * Skip initialization of non-registered 2i instances, remove 
Index::getIndexName (CASSANDRA-10595)
 + * Fix batches on multiple tables (CASSANDRA-10554)
 + * Ensure compaction options are validated when updating KeyspaceMetadata 
(CASSANDRA-10569)
 + * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)
 + * Remove token generator (CASSANDRA-5261)
 + * RolesCache should not be created for any authenticator that does not 
requireAuthentication (CASSANDRA-10562)
 + * Fix LogTransaction checking only a single directory for files 
(CASSANDRA-10421)
 + * Fix handling of range tombstones when reading old format sstables 
(CASSANDRA-10360)
 + * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
 +Merged from 2.2:
   * Expose phi values from failure detector via JMX and tweak debug
 and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)
   * Fix logback-tools.xml incorrectly configured for outputing to System.err

http://git-wip-us.apache.org/repos/asf/cassandra/blob/242b9738/conf/cassandra-env.sh
--
diff --cc conf/cassandra-env.sh
index 2f0ae34,e82198b..ef164e8
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@@ -156,98 -160,15 +156,49 @@@ if [ "x$MALLOC_ARENA_MAX" = "x" ] ; the
  export MALLOC_ARENA_MAX=4
  fi
  
- # Cassandra uses an installed jemalloc via LD_PRELOAD / DYLD_INSERT_LIBRARIES 
by default to improve off-heap
- # memory allocation performance. The following code searches for an installed 
libjemalloc.dylib/.so/.1.so using
- # Linux and OS-X specific approaches.
- # To specify your own libjemalloc in a different path, configure the fully 
qualified path in CASSANDRA_LIBJEMALLOC.
- # To disable jemalloc at all set CASSANDRA_LIBJEMALLOC=-
- #
- #CASSANDRA_LIBJEMALLOC=
- #
- find_library()
- {
- pattern=$1
- path=$(echo ${2} | tr ":" " ")
- 
- find $path -regex "$pattern" -print 2>/dev/null | head -n 1
- }
- case "`uname -s`" in
- Linux)
- if [ -z $CASSANDRA_LIBJEMALLOC ] ; then
- which ldconfig > /dev/null 2>&1
- if [ $? = 0 ] ; then
- # e.g. for CentOS
- dirs="/lib64 /lib /usr/lib64 /usr/lib `ldconfig -v 
2>/dev/null | 

[jira] [Commented] (CASSANDRA-10365) Store types by their CQL names in schema tables instead of fully-qualified internal class names

[Alexandre Dutra (JIRA)]

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

Alexandre Dutra commented on CASSANDRA-10365:
-

Pushed two new commits to the [current 
PR|https://github.com/datastax/java-driver/pull/467] for the Java driver. The 
first one gets rid of the new dependency on jgrapht, and implements topological 
sort from scratch (following Kahn's algorithm); the second one is of less 
interest for this ticket but for the record, it enables lazy resolution of UDTs 
when the dependency graph is incomplete (which can happen when we refresh 
metadata for just a subset of the entire schema).

> Store types by their CQL names in schema tables instead of fully-qualified 
> internal class names
> ---
>
> Key: CASSANDRA-10365
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10365
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Aleksey Yeschenko
>Assignee: Aleksey Yeschenko
>  Labels: client-impacting
> Fix For: 3.0.0
>
>
> Consider saving CQL types names for column, UDF/UDA arguments and return 
> types, and UDT components.



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

[jira] [Comment Edited] (CASSANDRA-10649) Cassandra 2.1 start failed with exception:Exception encountered during startup

[Jim Witschey (JIRA)]

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

Jim Witschey edited comment on CASSANDRA-10649 at 11/4/15 10:12 PM:


For record-keeping purposes, I've copied [the {{cassandra.yaml}} posted on 
stack overflow|http://stackoverflow.com/questions/33514745] and attached it to 
this ticket.

[~sthakur] As someone noted on your SO question, your 
{{client_encryption_options}} section may not be valid:

{code}
client_encryption_options:
#enabled: false
#keystore: conf/.keystore
#keystore_password: cassandra
{code}

What happens when you try

{code}
client_encryption_options:
enabled: false
{code}

If that fixes it, then we need to improve reporting for errors like this.


was (Author: mambocab):
For record-keeping purposes, I've copied [the {{cassandra.yaml}} posted on 
stack overflow|http://stackoverflow.com/questions/33514745] and attached it to 
this ticket.

[~sthakur] As someone noted on your SO question, your 
{{client_encryption_options}} section may not be valid:

{code}
client_encryption_options:
#enabled: false
#keystore: conf/.keystore
#keystore_password: cassandra
{code}

What happens when you try

{code}
client_encryption_options:
enabled: false
{code}

If that fixes it, then we need to improve error reporting for situations like 
this.

> Cassandra 2.1 start failed with exception:Exception encountered during startup
> --
>
> Key: CASSANDRA-10649
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10649
> Project: Cassandra
>  Issue Type: Bug
>  Components: Configuration
> Environment: Linux: Fedora-16 64 bit
>Reporter: sandeep thakur
> Fix For: 2.1.x
>
> Attachments: cassandra.yaml
>
>
> I am trying to setup cassandra single node cluster. i've downloaded below 
> build:
> apache-cassandra-2.1.11-bin.tar.gz
> I've upgraded Java to 1.8 as well, as earlier it was throwing errors related 
> to Java version.
> {code}
> [root@localhost cassandra]# java -version
> java version "1.8.0_60"
> Java(TM) SE Runtime Environment (build 1.8.0_60-b27)
> Java HotSpot(TM) 64-Bit Server VM (build 25.60-b23, mixed mode)
> {code}
> I've also verified the cassandra.yaml file from "http://www.yamllint.com/; as 
> well. But while starting cassandra, I am getting vague exception as below:
> {code}
> INFO  15:52:11 Compacting 
> [SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-18-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-17-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-20-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-19-Data.db')]
> INFO  15:52:11 Node localhost/127.0.0.1 state jump to normal
> INFO  15:52:11 Netty using native Epoll event loop
> ERROR 15:52:11 Exception encountered during startup
> java.lang.NullPointerException: null
> at org.apache.cassandra.transport.Server.run(Server.java:171) 
> ~[apache-cassandra-2.1.11.jar:2.1.11]
> at org.apache.cassandra.transport.Server.start(Server.java:117) 
> ~[apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.start(CassandraDaemon.java:492) 
> [apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:575)
>  [apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:651) 
> [apache-cassandra-2.1.11.jar:2.1.11]
> java.lang.NullPointerException
> at org.apache.cassandra.transport.Server.run(Server.java:171)
> at org.apache.cassandra.transport.Server.start(Server.java:117)
> at 
> org.apache.cassandra.service.CassandraDaemon.start(CassandraDaemon.java:492)
> at 
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:575)
> at 
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:651)
> Exception encountered during startup: null
> INFO  15:52:11 Announcing shutdown
> INFO  15:52:11 Node localhost/127.0.0.1 state jump to normal
> INFO  15:52:11 Compacted 4 sstables to 
> [/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-21,].
>   11,427 bytes to 5,749 (~50% of original) in 199ms = 0.027551MB/s.  4 total 
> partitions merged to 1.  Partition merge counts were {4:1, }
> INFO  15:52:13 Waiting for messaging service to quiesce
> INFO  

[1/3] cassandra git commit: get JEMAlloc debug output out of nodetool output

[snazy]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 1b876bc60 -> be2cf1afa


get JEMAlloc debug output out of nodetool output

patch by Robert Stupp; reviewed by Ariel Weisberg for CASSANDRA-10628


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

Branch: refs/heads/trunk
Commit: 0ff13d2a6847f7ecba1ac9a26b66714d9e58b60d
Parents: a306a1b
Author: Robert Stupp 
Authored: Wed Nov 4 23:28:57 2015 +0100
Committer: Robert Stupp 
Committed: Wed Nov 4 23:28:57 2015 +0100

--
 CHANGES.txt |  2 +-
 bin/cassandra   | 49 
 conf/cassandra-env.sh   | 49 
 .../apache/cassandra/service/StartupChecks.java | 19 +++-
 4 files changed, 68 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ff13d2a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 60bf565..fedede2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
 2.2.4
- * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
+ * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
  * Expose phi values from failure detector via JMX and tweak debug
and trace logging (CASSANDRA-9526)
  * Fix RangeNamesQueryPager (CASSANDRA-10509)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ff13d2a/bin/cassandra
--
diff --git a/bin/cassandra b/bin/cassandra
index 8d7b14f..0bbd9fb 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -132,6 +132,55 @@ case "`uname`" in
 ;;
 esac
 
+# Cassandra uses an installed jemalloc via LD_PRELOAD / DYLD_INSERT_LIBRARIES 
by default to improve off-heap
+# memory allocation performance. The following code searches for an installed 
libjemalloc.dylib/.so/.1.so using
+# Linux and OS-X specific approaches.
+# To specify your own libjemalloc in a different path, configure the fully 
qualified path in CASSANDRA_LIBJEMALLOC.
+# To disable jemalloc preload at all, set CASSANDRA_LIBJEMALLOC=-
+#
+#CASSANDRA_LIBJEMALLOC=
+#
+find_library()
+{
+pattern=$1
+path=$(echo ${2} | tr ":" " ")
+
+find $path -regex "$pattern" -print 2>/dev/null | head -n 1
+}
+case "`uname -s`" in
+Linux)
+if [ -z $CASSANDRA_LIBJEMALLOC ] ; then
+which ldconfig > /dev/null 2>&1
+if [ $? = 0 ] ; then
+# e.g. for CentOS
+dirs="/lib64 /lib /usr/lib64 /usr/lib `ldconfig -v 2>/dev/null 
| grep -v ^$'\t' | sed 's/^\([^:]*\):.*$/\1/'`"
+else
+# e.g. for Debian, OpenSUSE
+dirs="/lib64 /lib /usr/lib64 /usr/lib `cat /etc/ld.so.conf 
/etc/ld.so.conf.d/*.conf | grep '^/'`"
+fi
+dirs=`echo $dirs | tr " " ":"`
+CASSANDRA_LIBJEMALLOC=$(find_library '.*/libjemalloc\.so\(\.1\)*' 
$dirs)
+fi
+if [ ! -z $CASSANDRA_LIBJEMALLOC ] ; then
+export JVM_OPTS="$JVM_OPTS 
-Dcassandra.libjemalloc=$CASSANDRA_LIBJEMALLOC"
+if [ "-" != "$CASSANDRA_LIBJEMALLOC" ] ; then
+export LD_PRELOAD=$CASSANDRA_LIBJEMALLOC
+fi
+fi
+;;
+Darwin)
+if [ -z $CASSANDRA_LIBJEMALLOC ] ; then
+CASSANDRA_LIBJEMALLOC=$(find_library '.*/libjemalloc\.dylib' 
$DYLD_LIBRARY_PATH:${DYLD_FALLBACK_LIBRARY_PATH-$HOME/lib:/usr/local/lib:/lib:/usr/lib})
+fi
+if [ ! -z $CASSANDRA_LIBJEMALLOC ] ; then
+export JVM_OPTS="$JVM_OPTS 
-Dcassandra.libjemalloc=$CASSANDRA_LIBJEMALLOC"
+if [ "-" != "$CASSANDRA_LIBJEMALLOC" ] ; then
+export DYLD_INSERT_LIBRARIES=$CASSANDRA_LIBJEMALLOC
+fi
+fi
+;;
+esac
+
 launch_service()
 {
 pidpath="$1"

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ff13d2a/conf/cassandra-env.sh
--
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index bb20964..e82198b 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -160,55 +160,6 @@ then
 export MALLOC_ARENA_MAX=4
 fi
 
-# Cassandra uses an installed jemalloc via LD_PRELOAD / DYLD_INSERT_LIBRARIES 
by default to improve off-heap
-# memory allocation performance. The following code searches for an installed 
libjemalloc.dylib/.so/.1.so using
-# Linux and OS-X specific approaches.
-# To specify your own libjemalloc in a different path, configure the fully 
qualified path in CASSANDRA_LIBJEMALLOC.

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

[snazy]

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

Branch: refs/heads/cassandra-3.0
Commit: 242b9738f21e835c3f0cb734c96947c4e4ed0710
Parents: 340df43 0ff13d2
Author: Robert Stupp 
Authored: Wed Nov 4 23:29:44 2015 +0100
Committer: Robert Stupp 
Committed: Wed Nov 4 23:29:44 2015 +0100

--
 CHANGES.txt |  2 +-
 bin/cassandra   | 49 
 conf/cassandra-env.sh   | 49 
 .../apache/cassandra/service/StartupChecks.java | 19 +++-
 4 files changed, 68 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/242b9738/CHANGES.txt
--
diff --cc CHANGES.txt
index 1914fa1,fedede2..5fdeae5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,10 +1,29 @@@
 -2.2.4
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 +3.0
 + * Use CQL type names in schema metadata tables (CASSANDRA-10365)
 + * Guard batchlog replay against integer division by zero (CASSANDRA-9223)
 + * Fix bug when adding a column to thrift with the same name than a primary 
key (CASSANDRA-10608)
 + * Add client address argument to IAuthenticator::newSaslNegotiator 
(CASSANDRA-8068)
 + * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
 + * Don't use 'names query' read path for counters (CASSANDRA-10572)
 + * Fix backward compatibility for counters (CASSANDRA-10470)
-  * Remove memory_allocator paramter from cassandra.yaml (CASSANDRA-10581)
++ * Remove memory_allocator paramter from cassandra.yaml 
(CASSANDRA-10581,10628)
 + * Execute the metadata reload task of all registered indexes on CFS::reload 
(CASSANDRA-10604)
 + * Fix thrift cas operations with defined columns (CASSANDRA-10576)
 + * Fix PartitionUpdate.operationCount()for updates with static column 
operations (CASSANDRA-10606)
 + * Fix thrift get() queries with defined columns (CASSANDRA-10586)
 + * Fix marking of indexes as built and removed (CASSANDRA-10601)
 + * Skip initialization of non-registered 2i instances, remove 
Index::getIndexName (CASSANDRA-10595)
 + * Fix batches on multiple tables (CASSANDRA-10554)
 + * Ensure compaction options are validated when updating KeyspaceMetadata 
(CASSANDRA-10569)
 + * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)
 + * Remove token generator (CASSANDRA-5261)
 + * RolesCache should not be created for any authenticator that does not 
requireAuthentication (CASSANDRA-10562)
 + * Fix LogTransaction checking only a single directory for files 
(CASSANDRA-10421)
 + * Fix handling of range tombstones when reading old format sstables 
(CASSANDRA-10360)
 + * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
 +Merged from 2.2:
   * Expose phi values from failure detector via JMX and tweak debug
 and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)
   * Fix logback-tools.xml incorrectly configured for outputing to System.err

http://git-wip-us.apache.org/repos/asf/cassandra/blob/242b9738/conf/cassandra-env.sh
--
diff --cc conf/cassandra-env.sh
index 2f0ae34,e82198b..ef164e8
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@@ -156,98 -160,15 +156,49 @@@ if [ "x$MALLOC_ARENA_MAX" = "x" ] ; the
  export MALLOC_ARENA_MAX=4
  fi
  
- # Cassandra uses an installed jemalloc via LD_PRELOAD / DYLD_INSERT_LIBRARIES 
by default to improve off-heap
- # memory allocation performance. The following code searches for an installed 
libjemalloc.dylib/.so/.1.so using
- # Linux and OS-X specific approaches.
- # To specify your own libjemalloc in a different path, configure the fully 
qualified path in CASSANDRA_LIBJEMALLOC.
- # To disable jemalloc at all set CASSANDRA_LIBJEMALLOC=-
- #
- #CASSANDRA_LIBJEMALLOC=
- #
- find_library()
- {
- pattern=$1
- path=$(echo ${2} | tr ":" " ")
- 
- find $path -regex "$pattern" -print 2>/dev/null | head -n 1
- }
- case "`uname -s`" in
- Linux)
- if [ -z $CASSANDRA_LIBJEMALLOC ] ; then
- which ldconfig > /dev/null 2>&1
- if [ $? = 0 ] ; then
- # e.g. for CentOS
- dirs="/lib64 /lib /usr/lib64 /usr/lib `ldconfig -v 

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

[snazy]

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: be2cf1afa75acfe9c2ce385a69f471d4770c56bb
Parents: 1b876bc 242b973
Author: Robert Stupp 
Authored: Wed Nov 4 23:30:01 2015 +0100
Committer: Robert Stupp 
Committed: Wed Nov 4 23:30:01 2015 +0100

--
 CHANGES.txt |  2 +-
 bin/cassandra   | 49 
 conf/cassandra-env.sh   | 49 
 .../apache/cassandra/service/StartupChecks.java | 19 +++-
 4 files changed, 68 insertions(+), 51 deletions(-)
--


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

[1/2] cassandra git commit: get JEMAlloc debug output out of nodetool output

[snazy]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 340df43fb -> 242b9738f


get JEMAlloc debug output out of nodetool output

patch by Robert Stupp; reviewed by Ariel Weisberg for CASSANDRA-10628


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

Branch: refs/heads/cassandra-3.0
Commit: 0ff13d2a6847f7ecba1ac9a26b66714d9e58b60d
Parents: a306a1b
Author: Robert Stupp 
Authored: Wed Nov 4 23:28:57 2015 +0100
Committer: Robert Stupp 
Committed: Wed Nov 4 23:28:57 2015 +0100

--
 CHANGES.txt |  2 +-
 bin/cassandra   | 49 
 conf/cassandra-env.sh   | 49 
 .../apache/cassandra/service/StartupChecks.java | 19 +++-
 4 files changed, 68 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ff13d2a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 60bf565..fedede2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
 2.2.4
- * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
+ * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
  * Expose phi values from failure detector via JMX and tweak debug
and trace logging (CASSANDRA-9526)
  * Fix RangeNamesQueryPager (CASSANDRA-10509)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ff13d2a/bin/cassandra
--
diff --git a/bin/cassandra b/bin/cassandra
index 8d7b14f..0bbd9fb 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -132,6 +132,55 @@ case "`uname`" in
 ;;
 esac
 
+# Cassandra uses an installed jemalloc via LD_PRELOAD / DYLD_INSERT_LIBRARIES 
by default to improve off-heap
+# memory allocation performance. The following code searches for an installed 
libjemalloc.dylib/.so/.1.so using
+# Linux and OS-X specific approaches.
+# To specify your own libjemalloc in a different path, configure the fully 
qualified path in CASSANDRA_LIBJEMALLOC.
+# To disable jemalloc preload at all, set CASSANDRA_LIBJEMALLOC=-
+#
+#CASSANDRA_LIBJEMALLOC=
+#
+find_library()
+{
+pattern=$1
+path=$(echo ${2} | tr ":" " ")
+
+find $path -regex "$pattern" -print 2>/dev/null | head -n 1
+}
+case "`uname -s`" in
+Linux)
+if [ -z $CASSANDRA_LIBJEMALLOC ] ; then
+which ldconfig > /dev/null 2>&1
+if [ $? = 0 ] ; then
+# e.g. for CentOS
+dirs="/lib64 /lib /usr/lib64 /usr/lib `ldconfig -v 2>/dev/null 
| grep -v ^$'\t' | sed 's/^\([^:]*\):.*$/\1/'`"
+else
+# e.g. for Debian, OpenSUSE
+dirs="/lib64 /lib /usr/lib64 /usr/lib `cat /etc/ld.so.conf 
/etc/ld.so.conf.d/*.conf | grep '^/'`"
+fi
+dirs=`echo $dirs | tr " " ":"`
+CASSANDRA_LIBJEMALLOC=$(find_library '.*/libjemalloc\.so\(\.1\)*' 
$dirs)
+fi
+if [ ! -z $CASSANDRA_LIBJEMALLOC ] ; then
+export JVM_OPTS="$JVM_OPTS 
-Dcassandra.libjemalloc=$CASSANDRA_LIBJEMALLOC"
+if [ "-" != "$CASSANDRA_LIBJEMALLOC" ] ; then
+export LD_PRELOAD=$CASSANDRA_LIBJEMALLOC
+fi
+fi
+;;
+Darwin)
+if [ -z $CASSANDRA_LIBJEMALLOC ] ; then
+CASSANDRA_LIBJEMALLOC=$(find_library '.*/libjemalloc\.dylib' 
$DYLD_LIBRARY_PATH:${DYLD_FALLBACK_LIBRARY_PATH-$HOME/lib:/usr/local/lib:/lib:/usr/lib})
+fi
+if [ ! -z $CASSANDRA_LIBJEMALLOC ] ; then
+export JVM_OPTS="$JVM_OPTS 
-Dcassandra.libjemalloc=$CASSANDRA_LIBJEMALLOC"
+if [ "-" != "$CASSANDRA_LIBJEMALLOC" ] ; then
+export DYLD_INSERT_LIBRARIES=$CASSANDRA_LIBJEMALLOC
+fi
+fi
+;;
+esac
+
 launch_service()
 {
 pidpath="$1"

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ff13d2a/conf/cassandra-env.sh
--
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index bb20964..e82198b 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -160,55 +160,6 @@ then
 export MALLOC_ARENA_MAX=4
 fi
 
-# Cassandra uses an installed jemalloc via LD_PRELOAD / DYLD_INSERT_LIBRARIES 
by default to improve off-heap
-# memory allocation performance. The following code searches for an installed 
libjemalloc.dylib/.so/.1.so using
-# Linux and OS-X specific approaches.
-# To specify your own libjemalloc in a different path, configure the fully 
qualified path in 

cassandra git commit: get JEMAlloc debug output out of nodetool output

[snazy]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 a306a1bf3 -> 0ff13d2a6


get JEMAlloc debug output out of nodetool output

patch by Robert Stupp; reviewed by Ariel Weisberg for CASSANDRA-10628


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

Branch: refs/heads/cassandra-2.2
Commit: 0ff13d2a6847f7ecba1ac9a26b66714d9e58b60d
Parents: a306a1b
Author: Robert Stupp 
Authored: Wed Nov 4 23:28:57 2015 +0100
Committer: Robert Stupp 
Committed: Wed Nov 4 23:28:57 2015 +0100

--
 CHANGES.txt |  2 +-
 bin/cassandra   | 49 
 conf/cassandra-env.sh   | 49 
 .../apache/cassandra/service/StartupChecks.java | 19 +++-
 4 files changed, 68 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ff13d2a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 60bf565..fedede2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
 2.2.4
- * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
+ * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
  * Expose phi values from failure detector via JMX and tweak debug
and trace logging (CASSANDRA-9526)
  * Fix RangeNamesQueryPager (CASSANDRA-10509)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ff13d2a/bin/cassandra
--
diff --git a/bin/cassandra b/bin/cassandra
index 8d7b14f..0bbd9fb 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -132,6 +132,55 @@ case "`uname`" in
 ;;
 esac
 
+# Cassandra uses an installed jemalloc via LD_PRELOAD / DYLD_INSERT_LIBRARIES 
by default to improve off-heap
+# memory allocation performance. The following code searches for an installed 
libjemalloc.dylib/.so/.1.so using
+# Linux and OS-X specific approaches.
+# To specify your own libjemalloc in a different path, configure the fully 
qualified path in CASSANDRA_LIBJEMALLOC.
+# To disable jemalloc preload at all, set CASSANDRA_LIBJEMALLOC=-
+#
+#CASSANDRA_LIBJEMALLOC=
+#
+find_library()
+{
+pattern=$1
+path=$(echo ${2} | tr ":" " ")
+
+find $path -regex "$pattern" -print 2>/dev/null | head -n 1
+}
+case "`uname -s`" in
+Linux)
+if [ -z $CASSANDRA_LIBJEMALLOC ] ; then
+which ldconfig > /dev/null 2>&1
+if [ $? = 0 ] ; then
+# e.g. for CentOS
+dirs="/lib64 /lib /usr/lib64 /usr/lib `ldconfig -v 2>/dev/null 
| grep -v ^$'\t' | sed 's/^\([^:]*\):.*$/\1/'`"
+else
+# e.g. for Debian, OpenSUSE
+dirs="/lib64 /lib /usr/lib64 /usr/lib `cat /etc/ld.so.conf 
/etc/ld.so.conf.d/*.conf | grep '^/'`"
+fi
+dirs=`echo $dirs | tr " " ":"`
+CASSANDRA_LIBJEMALLOC=$(find_library '.*/libjemalloc\.so\(\.1\)*' 
$dirs)
+fi
+if [ ! -z $CASSANDRA_LIBJEMALLOC ] ; then
+export JVM_OPTS="$JVM_OPTS 
-Dcassandra.libjemalloc=$CASSANDRA_LIBJEMALLOC"
+if [ "-" != "$CASSANDRA_LIBJEMALLOC" ] ; then
+export LD_PRELOAD=$CASSANDRA_LIBJEMALLOC
+fi
+fi
+;;
+Darwin)
+if [ -z $CASSANDRA_LIBJEMALLOC ] ; then
+CASSANDRA_LIBJEMALLOC=$(find_library '.*/libjemalloc\.dylib' 
$DYLD_LIBRARY_PATH:${DYLD_FALLBACK_LIBRARY_PATH-$HOME/lib:/usr/local/lib:/lib:/usr/lib})
+fi
+if [ ! -z $CASSANDRA_LIBJEMALLOC ] ; then
+export JVM_OPTS="$JVM_OPTS 
-Dcassandra.libjemalloc=$CASSANDRA_LIBJEMALLOC"
+if [ "-" != "$CASSANDRA_LIBJEMALLOC" ] ; then
+export DYLD_INSERT_LIBRARIES=$CASSANDRA_LIBJEMALLOC
+fi
+fi
+;;
+esac
+
 launch_service()
 {
 pidpath="$1"

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ff13d2a/conf/cassandra-env.sh
--
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index bb20964..e82198b 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -160,55 +160,6 @@ then
 export MALLOC_ARENA_MAX=4
 fi
 
-# Cassandra uses an installed jemalloc via LD_PRELOAD / DYLD_INSERT_LIBRARIES 
by default to improve off-heap
-# memory allocation performance. The following code searches for an installed 
libjemalloc.dylib/.so/.1.so using
-# Linux and OS-X specific approaches.
-# To specify your own libjemalloc in a different path, configure the fully 
qualified path in 

[jira] [Commented] (CASSANDRA-10632) sstableutil tests failing on Windows

[Jim Witschey (JIRA)]

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

Jim Witschey commented on CASSANDRA-10632:
--

[dtest PR|https://github.com/riptano/cassandra-dtest/pull/641]. In my OpenStack 
Windows environment, 
{{sstableutil_test.py:SSTableUtilTest.abortedcompaction_test}} still fails 
after those changes, as described in the PR. If that PR gets merged, I'll still 
need help figuring out what's causing the remaining failure.

> sstableutil tests failing on Windows
> 
>
> Key: CASSANDRA-10632
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10632
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Jim Witschey
> Fix For: 3.0.0
>
>
> {{sstableutil_test.py:SSTableUtilTest.abortedcompaction_test}} and 
> {{sstableutil_test.py:SSTableUtilTest.compaction_test}} fail on Windows:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/sstableutil_test/SSTableUtilTest/abortedcompaction_test/
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/100/testReport/sstableutil_test/SSTableUtilTest/compaction_test/
> This is a pretty simple failure -- looks like the underlying behavior is ok, 
> but string comparison fails when the leading {{d}} in the filename is 
> lowercase as returned by {{sstableutil}} (see the [{{_invoke_sstableutil}} 
> test 
> function|https://github.com/riptano/cassandra-dtest/blob/master/sstableutil_test.py#L128]),
>  but uppercase as returned by {{glob.glob}} (see the [{{_get_sstable_files}} 
> test 
> function|https://github.com/riptano/cassandra-dtest/blob/master/sstableutil_test.py#L160]).
> Do I understand correctly that Windows filenames are case-insensitive, 
> including the drive portion? If that's the case, then we can just lowercase 
> the file names in the test helper functions above when the tests are run on 
> Windows. [~JoshuaMcKenzie] can you confirm? I'll fix this in the tests if so. 
> If I'm wrong, and something in {{sstableutil}} needs to be fixed, could you 
> find an assignee?



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

[jira] [Commented] (CASSANDRA-10652) Tracing prevents startup after upgrading

[Jim Witschey (JIRA)]

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

Jim Witschey commented on CASSANDRA-10652:
--

[~rhatch] Can you keep an eye out for this error as you dig through the upgrade 
tests? I'd be surprised if there isn't an existing CassCI job that covers this.

> Tracing prevents startup after upgrading
> 
>
> Key: CASSANDRA-10652
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10652
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Carl Yeksigian
>Priority: Blocker
> Fix For: 3.0.0
>
>
> After upgrading from 2.1 to 3.0, the {{system_traces.sessions}} table is not 
> properly upgraded to include the {{client}} column added in CASSANDRA-8162. 
> Just upgrading from a clean 2.2 install to 3.0 won't show this error because 
> the column was included in 2.2, it just doesn't break the queries in that 
> release.
> The errors I get when querying {{system_traces.sessions}}:
> {noformat}
> java.lang.RuntimeException: java.lang.IllegalStateException: 
> [ColumnDefinition{name=client, 
> type=org.apache.cassandra.db.marshal.InetAddressType, kind=REGULAR, 
> position=-1}, ColumnDefinition{name=command, 
> type=org.apache.cassandra.db.marshal.UTF8Type, kind=REGULAR, position=-1}, 
> ColumnDefinition{name=coordinator, 
> type=org.apache.cassandra.db.marshal.InetAddressType, kind=REGULAR, 
> position=-1}, ColumnDefinition{name=duration, 
> type=org.apache.cassandra.db.marshal.Int32Type, kind=REGULAR, position=-1}, 
> ColumnDefinition{name=request, type=org.apache.cassandra.db.marshal.UTF8Type, 
> kind=REGULAR, position=-1}, ColumnDefinition{name=started_at, 
> type=org.apache.cassandra.db.marshal.TimestampType, kind=REGULAR, 
> position=-1}, ColumnDefinition{name=parameters, 
> type=org.apache.cassandra.db.marshal.MapType(org.apache.cassandra.db.marshal.UTF8Type,org.apache.cassandra.db.marshal.UTF8Type),
>  kind=REGULAR, position=-1}] is not a subset of [coordinator duration request 
> started_at parameters]
>   at 
> org.apache.cassandra.service.StorageProxy$DroppableRunnable.run(StorageProxy.java:2350)
>  ~[main/:na]
>   at 
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) 
> ~[na:1.8.0_45]
>   at 
> org.apache.cassandra.concurrent.AbstractTracingAwareExecutorService$FutureTask.run(AbstractTracingAwareExecutorService.java:164)
>  ~[main/:na]
>   at org.apache.cassandra.concurrent.SEPWorker.run(SEPWorker.java:105) 
> [main/:na]
>   at java.lang.Thread.run(Thread.java:745) [na:1.8.0_45]
> Caused by: java.lang.IllegalStateException: [ColumnDefinition{name=client, 
> type=org.apache.cassandra.db.marshal.InetAddressType, kind=REGULAR, 
> position=-1}, ColumnDefinition{name=command, 
> type=org.apache.cassandra.db.marshal.UTF8Type, kind=REGULAR, position=-1}, 
> ColumnDefinition{name=coordinator, 
> type=org.apache.cassandra.db.marshal.InetAddressType, kind=REGULAR, 
> position=-1}, ColumnDefinition{name=duration, 
> type=org.apache.cassandra.db.marshal.Int32Type, kind=REGULAR, position=-1}, 
> ColumnDefinition{name=request, type=org.apache.cassandra.db.marshal.UTF8Type, 
> kind=REGULAR, position=-1}, ColumnDefinition{name=started_at, 
> type=org.apache.cassandra.db.marshal.TimestampType, kind=REGULAR, 
> position=-1}, ColumnDefinition{name=parameters, 
> type=org.apache.cassandra.db.marshal.MapType(org.apache.cassandra.db.marshal.UTF8Type,org.apache.cassandra.db.marshal.UTF8Type),
>  kind=REGULAR, position=-1}] is not a subset of [coordinator duration request 
> started_at parameters]
>   at 
> org.apache.cassandra.db.Columns$Serializer.encodeBitmap(Columns.java:531) 
> ~[main/:na]
>   at 
> org.apache.cassandra.db.Columns$Serializer.serializeSubset(Columns.java:465) 
> ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredSerializer.serialize(UnfilteredSerializer.java:178)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredSerializer.serialize(UnfilteredSerializer.java:108)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredSerializer.serialize(UnfilteredSerializer.java:96)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer.serialize(UnfilteredRowIteratorSerializer.java:132)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer.serialize(UnfilteredRowIteratorSerializer.java:87)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer.serialize(UnfilteredRowIteratorSerializer.java:77)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.partitions.UnfilteredPartitionIterators$Serializer.serialize(UnfilteredPartitionIterators.java:298)
>  ~[main/:na]
>   at 
> 

[jira] [Updated] (CASSANDRA-10651) allow unit testing by defined list of files

[Russ Hatch (JIRA)]

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

Russ Hatch updated CASSANDRA-10651:
---
Attachment: (was: trunk-10651-v2.txt)

> allow unit testing by defined list of files
> ---
>
> Key: CASSANDRA-10651
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10651
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Russ Hatch
>Assignee: Russ Hatch
> Fix For: 3.2
>
> Attachments: test_slice_001.txt, trunk-10651-v2.txt, trunk-10651.txt
>
>
> "Testing by list" allows distributing defined test lists across machines to 
> run tests in parallel.
> Additionally it can be used by devs to create a simple list of tests they are 
> interested in during feature development, without crafting a complicated 
> command.
> A final reason would be adding a new way to divide tests into suites without 
> requiring more unique ant targets (which may differ in subtle ways for better 
> or worse).



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

[jira] [Updated] (CASSANDRA-10651) allow unit testing by defined list of files

[Russ Hatch (JIRA)]

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

Russ Hatch updated CASSANDRA-10651:
---
Attachment: trunk-10651-v2.txt

> allow unit testing by defined list of files
> ---
>
> Key: CASSANDRA-10651
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10651
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Russ Hatch
>Assignee: Russ Hatch
> Fix For: 3.2
>
> Attachments: test_slice_001.txt, trunk-10651-v2.txt, trunk-10651.txt
>
>
> "Testing by list" allows distributing defined test lists across machines to 
> run tests in parallel.
> Additionally it can be used by devs to create a simple list of tests they are 
> interested in during feature development, without crafting a complicated 
> command.
> A final reason would be adding a new way to divide tests into suites without 
> requiring more unique ant targets (which may differ in subtle ways for better 
> or worse).



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

[jira] [Commented] (CASSANDRA-10401) Improve json2sstable error reporting on nonexistent column

[Ariel Weisberg (JIRA)]

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

Ariel Weisberg commented on CASSANDRA-10401:


testall in 2.2 has a failing test. 2.1 looks good. I think there was no impact 
on the dtests.

> Improve json2sstable error reporting on nonexistent column
> --
>
> Key: CASSANDRA-10401
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10401
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
> Environment: Cassandra 2.1.8.621
>Reporter: Jose Martinez Poblete
>Assignee: Paulo Motta
>
> We have the following table...
> {noformat}
> CREATE TABLE keyspace_name.table_name (
> col1 text,
> col2 text,
> col3 text,
> col4 text,
> PRIMARY KEY ((col1, col2), col3)
> ) WITH CLUSTERING ORDER BY (col3 ASC)
> {noformat}
> And the following  json in a file created from sstable2json tool
> {noformat}
> [
> {"key": "This is col1:This is col2,
>  "cells": [["This is col3:","",1443217787319002],
>["This is col3:"col4","This is col4",1443217787319002]]}
> ]
> {noformat}
> Let's say we deleted that record form the DB and wanted to bring it back
> If we try to create an sstable from this data in a json file named 
> test_file.json, we get a NPE 
> {noformat}
> -bash-4.1$ json2sstable -K elp -c table_name-3264cbe063c211e5bc34e746786b7b29 
> test_file.json  
> /var/lib/cassandra/data/keyspace_name/table_name-3264cbe063c211e5bc34e746786b7b29/keyspace_name-table_name-ka-1-Data.db
> Importing 1 keys...
> java.lang.NullPointerException
>   at 
> org.apache.cassandra.tools.SSTableImport.getKeyValidator(SSTableImport.java:442)
>   at 
> org.apache.cassandra.tools.SSTableImport.importUnsorted(SSTableImport.java:316)
>   at 
> org.apache.cassandra.tools.SSTableImport.importJson(SSTableImport.java:287)
>   at org.apache.cassandra.tools.SSTableImport.main(SSTableImport.java:514)
> ERROR: null
> -bash-4.1$
> {noformat}



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

[jira] [Commented] (CASSANDRA-10651) allow unit testing by defined list of files

[Ariel Weisberg (JIRA)]

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

Ariel Weisberg commented on CASSANDRA-10651:


Ok getting really picky here. In the description it's not just running a list 
it's running out of a file. Also you could document the property that specifies 
the file in the description so ant -p will basically print usage information.

> allow unit testing by defined list of files
> ---
>
> Key: CASSANDRA-10651
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10651
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Russ Hatch
>Assignee: Russ Hatch
> Fix For: 3.2
>
> Attachments: test_slice_001.txt, trunk-10651-v2.txt, trunk-10651.txt
>
>
> "Testing by list" allows distributing defined test lists across machines to 
> run tests in parallel.
> Additionally it can be used by devs to create a simple list of tests they are 
> interested in during feature development, without crafting a complicated 
> command.
> A final reason would be adding a new way to divide tests into suites without 
> requiring more unique ant targets (which may differ in subtle ways for better 
> or worse).



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

[jira] [Updated] (CASSANDRA-10641) simultaneous_bootstrap_test fails on Windows

[Joshua McKenzie (JIRA)]

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

Joshua McKenzie updated CASSANDRA-10641:

Reviewer: Philip Thompson

> simultaneous_bootstrap_test fails on Windows
> 
>
> Key: CASSANDRA-10641
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10641
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Joshua McKenzie
> Fix For: 2.2.x, 3.0.0
>
> Attachments: 10641.txt
>
>
> {{bootstrap_test.py:TestBootstrap.simultaneous_bootstrap_test}} fails on 
> Windows on C* 3.0 and 2.2:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/99/testReport/junit/bootstrap_test/TestBootstrap/simultaneous_bootstrap_test/
> http://cassci.datastax.com/view/win32/job/cassandra-2.2_dtest_win32/127/testReport/junit/bootstrap_test/TestBootstrap/simultaneous_bootstrap_test/
> It expects there to be a warning in the stderr of the node attempting to 
> start while another node boostraps, but the stderr is empty. It fails on this 
> line:
> https://github.com/riptano/cassandra-dtest/blob/master/bootstrap_test.py#L469
> [~yukim] I believe you're the person to handle this ticket? I'll assign you, 
> but feel free to reassign.



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

[jira] [Commented] (CASSANDRA-10651) allow unit testing by defined list of files

[Ariel Weisberg (JIRA)]

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

Ariel Weisberg commented on CASSANDRA-10651:


Can you update the description of the target?

"test.pathsfile" doesn't seem very intuitive to me since it isn't a list of 
paths. test.classesfile, test.classlistfile, or test.testsfile maybe?

I tested this and everything seems to work as expected. The other target still 
work, and I can pass parameters like usejacoco through the new target.

> allow unit testing by defined list of files
> ---
>
> Key: CASSANDRA-10651
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10651
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Russ Hatch
>Assignee: Russ Hatch
> Fix For: 3.2
>
> Attachments: test_slice_001.txt, trunk-10651.txt
>
>
> "Testing by list" allows distributing defined test lists across machines to 
> run tests in parallel.
> Additionally it can be used by devs to create a simple list of tests they are 
> interested in during feature development, without crafting a complicated 
> command.
> A final reason would be adding a new way to divide tests into suites without 
> requiring more unique ant targets (which may differ in subtle ways for better 
> or worse).



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

[jira] [Comment Edited] (CASSANDRA-10492) Fix failing upgrade tests on 2.1->2.2 path

[Ariel Weisberg (JIRA)]

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

Ariel Weisberg edited comment on CASSANDRA-10492 at 11/4/15 10:22 PM:
--

{{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions}}
 is broken by a change in the exceptions thrown by the python driver for 
timeouts (or possibly it was always wrong). Need to check for OperationTimedOut 
as well.


was (Author: aweisberg):
{{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions}}
 is caused by a change in the exceptions thrown by the python driver for 
timeouts (or possibly it was always wrong). Need to check for OperationTimedOut 
as well.

> Fix failing upgrade tests on 2.1->2.2 path
> --
>
> Key: CASSANDRA-10492
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10492
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Jim Witschey
>Assignee: Ariel Weisberg
>  Labels: triage
> Fix For: 2.1.x, 2.2.x
>
> Attachments: test_stdout.txt
>
>
> 2 dtests for the storage engine upgrade on the 2.1->2.2 path fail:
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-21_HEAD-22_tarball/lastCompletedBuild/testReport/
> (If there are 3 failures at that link, don't worry; one was a dtest bug 
> that's been fixed.)
> {{upgrade_tests/cql_tests.py:TestCQL.large_count_test}} flaps when a TRUNCATE 
> operation times out:
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-21_HEAD-22_tarball/20/testReport/upgrade_tests.cql_tests/TestCQL/large_count_test/history/
> {{upgrade_tests/paging_test.py:TestPagingWithDeletions.test_failure_threshold_deletions}}
>  also fails on this upgrade path:
> http://cassci.datastax.com/view/Upgrades/job/storage_engine_upgrade_dtest-21_HEAD-22_tarball/15/testReport/upgrade_tests.paging_test/TestPagingWithDeletions/test_failure_threshold_deletions/history/
> These are in the same ticket for the moment, but if one becomes a longer 
> project, it should be broken out into a separate ticket.



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

[jira] [Created] (CASSANDRA-10653) Remove dependency on jgrapht for UDT resolution

[Aleksey Yeschenko (JIRA)]

Aleksey Yeschenko created CASSANDRA-10653:
-

 Summary: Remove dependency on jgrapht for UDT resolution
 Key: CASSANDRA-10653
 URL: https://issues.apache.org/jira/browse/CASSANDRA-10653
 Project: Cassandra
  Issue Type: Improvement
  Components: Distributed Metadata
Reporter: Aleksey Yeschenko
Assignee: Aleksey Yeschenko
Priority: Minor
 Fix For: 3.0.x


Now that the java-driver no longer pulls it as a dependency, it is silly to 
pull a whole library for resolving UDTs dependencies.

Should rewrite the resolution code without jgrapht (maybe reuse whatever code 
java-driver ended up writing).



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

[jira] [Commented] (CASSANDRA-10513) Update cqlsh for new driver execution API

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko commented on CASSANDRA-10513:
---

[~pauloricardomg] so, while that dtest PR was sufficient to fix cqlsh failures, 
you have not created a dtest PR to update all the dtests themselves to reflect 
the changes in the API, and a lot of them are now failing with {{object of type 
'ResultSet' has no len()}} or similar issues.

All should be trivial to fix. Can you take care of them?

> Update cqlsh for new driver execution API
> -
>
> Key: CASSANDRA-10513
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10513
> Project: Cassandra
>  Issue Type: New Feature
>  Components: Tools
>Reporter: Adam Holmberg
>Assignee: Adam Holmberg
>Priority: Minor
>  Labels: cqlsh
> Fix For: 2.2.4, 3.0.0
>
> Attachments: 10513-2.1.txt, 10513-2.2.txt, 10513-3.0-fix.patch, 
> 10513.txt
>
>
> The 3.0 Python driver will have a few tweaks to the execution API. We'll need 
> to update cqlsh in a couple of minor ways.
> [Results are always returned as an iterable 
> ResultSet|https://datastax-oss.atlassian.net/browse/PYTHON-368]
> [Trace data is always attached to the 
> ResultSet|https://datastax-oss.atlassian.net/browse/PYTHON-318] (instead of 
> being attached to a statement)



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

[jira] [Commented] (CASSANDRA-10365) Store types by their CQL names in schema tables instead of fully-qualified internal class names

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko commented on CASSANDRA-10365:
---

Opened CASSANDRA-10653 to remove the dependency post 3.0.0. Not going to revert 
to v1 implementation, though, because that was just not good enough.

> Store types by their CQL names in schema tables instead of fully-qualified 
> internal class names
> ---
>
> Key: CASSANDRA-10365
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10365
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Aleksey Yeschenko
>Assignee: Aleksey Yeschenko
>  Labels: client-impacting
> Fix For: 3.0.0
>
>
> Consider saving CQL types names for column, UDF/UDA arguments and return 
> types, and UDT components.



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

[jira] [Commented] (CASSANDRA-10649) Cassandra 2.1 start failed with exception:Exception encountered during startup

[sandeep thakur (JIRA)]

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

sandeep thakur commented on CASSANDRA-10649:


If I follow what you've mentioned that it is also throwing error as mentioned 
below:
++
0240; truncate_request_timeout_in_ms=6; write_request_timeout_in_ms=2000]
ERROR 15:17:59 Fatal configuration error
org.apache.cassandra.exceptions.ConfigurationException: Invalid yaml. Please 
remove properties [enabled] from your cassandra.yaml
at 
org.apache.cassandra.config.YamlConfigurationLoader$MissingPropertiesChecker.check(YamlConfigurationLoader.java:162)
 ~[apache-cassandra-2.1.11.jar:2.1.11]
at 
org.apache.cassandra.config.YamlConfigurationLoader.loadConfig(YamlConfigurationLoader.java:115)
 ~[apache-cassandra-2.1.11.jar:2.1.11]
at 
org.apache.cassandra.config.YamlConfigurationLoader.loadConfig(YamlConfigurationLoader.java:84)
 ~[apache-cassandra-2.1.11.jar:2.1.11]
at 
org.apache.cassandra.config.DatabaseDescriptor.loadConfig(DatabaseDescriptor.java:161)
 ~[apache-cassandra-2.1.11.jar:2.1.11]
at 
org.apache.cassandra.config.DatabaseDescriptor.(DatabaseDescriptor.java:136)
 ~[apache-cassandra-2.1.11.jar:2.1.11]
at 
org.apache.cassandra.service.CassandraDaemon.setup(CassandraDaemon.java:168) 
[apache-cassandra-2.1.11.jar:2.1.11]
at 
org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:562) 
[apache-cassandra-2.1.11.jar:2.1.11]
at 
org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:651) 
[apache-cassandra-2.1.11.jar:2.1.11]
Invalid yaml. Please remove properties [enabled] from your cassandra.yaml
Fatal configuration error; unable to start. See log for stacktrace.
++

It is asking to remove property "enabled".

> Cassandra 2.1 start failed with exception:Exception encountered during startup
> --
>
> Key: CASSANDRA-10649
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10649
> Project: Cassandra
>  Issue Type: Bug
>  Components: Configuration
> Environment: Linux: Fedora-16 64 bit
>Reporter: sandeep thakur
> Fix For: 2.1.x
>
> Attachments: cassandra.yaml
>
>
> I am trying to setup cassandra single node cluster. i've downloaded below 
> build:
> apache-cassandra-2.1.11-bin.tar.gz
> I've upgraded Java to 1.8 as well, as earlier it was throwing errors related 
> to Java version.
> {code}
> [root@localhost cassandra]# java -version
> java version "1.8.0_60"
> Java(TM) SE Runtime Environment (build 1.8.0_60-b27)
> Java HotSpot(TM) 64-Bit Server VM (build 25.60-b23, mixed mode)
> {code}
> I've also verified the cassandra.yaml file from "http://www.yamllint.com/; as 
> well. But while starting cassandra, I am getting vague exception as below:
> {code}
> INFO  15:52:11 Compacting 
> [SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-18-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-17-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-20-Data.db'),
>  
> SSTableReader(path='/home/sandeep/bck_up/data/cassandra/data/system/local-7ad54392bcdd35a684174e047860b377/system-local-ka-19-Data.db')]
> INFO  15:52:11 Node localhost/127.0.0.1 state jump to normal
> INFO  15:52:11 Netty using native Epoll event loop
> ERROR 15:52:11 Exception encountered during startup
> java.lang.NullPointerException: null
> at org.apache.cassandra.transport.Server.run(Server.java:171) 
> ~[apache-cassandra-2.1.11.jar:2.1.11]
> at org.apache.cassandra.transport.Server.start(Server.java:117) 
> ~[apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.start(CassandraDaemon.java:492) 
> [apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:575)
>  [apache-cassandra-2.1.11.jar:2.1.11]
> at 
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:651) 
> [apache-cassandra-2.1.11.jar:2.1.11]
> java.lang.NullPointerException
> at org.apache.cassandra.transport.Server.run(Server.java:171)
> at org.apache.cassandra.transport.Server.start(Server.java:117)
> at 
> org.apache.cassandra.service.CassandraDaemon.start(CassandraDaemon.java:492)
> at 
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:575)
> at 
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:651)
> Exception encountered during startup: null
> INFO  15:52:11 

[jira] [Commented] (CASSANDRA-9304) COPY TO improvements

[Stefania (JIRA)]

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

Stefania commented on CASSANDRA-9304:
-

Thank you for your input. 

Regarding version support for Windows, fine for 2.2+ but for completeness I'll 
point out that the only obstacle left in 2.1 is the name of the file (_cqlsh_ 
-> _cqlsh.py_).

Regarding the problem with pipes, I've replaced pipes with queues so we don't 
need to deal with the low level platform specific details. Queues can also be 
safely used from the callback threads, which was not the case for pipes.

Regarding the problem with the driver, I haven't tested in 2.2 but I don't 
think it matters which version since yesterday I was using the latest 
cassandra-test driver version. Today I used 2.7.2. The column type is the same, 
{{cassandra.cqltypes.BytesType}}, the method called from {{recv_result_rows()}} 
is the same, {{>}} but {{cls.serialize}} in {{from_binary}} is 
a lambda for the case that works and the default implementation 
{{CassandraType.deserialize}} for  the case that does not work. I don't know 
where the lambda comes from but I noticed there is a cython deserialize for 
{{BytesType}} in deserializers.pyx. I don't know how cython works but if this 
is picked up in the normal case then the problem is again with the way 
multiprocessing imports modules. 

The problem can be solved by adding a deserialize implementation to BytesType, 
like it's done for other types:

{code}
Stefi@Lila MINGW64 ~/git/cstar/python-driver ((2.7.2))
$ git diff
diff --git a/cassandra/cqltypes.py b/cassandra/cqltypes.py
index f39d28b..eb8d3b6 100644
--- a/cassandra/cqltypes.py
+++ b/cassandra/cqltypes.py
@@ -350,6 +350,10 @@ class BytesType(_CassandraType):
 def serialize(val, protocol_version):
 return six.binary_type(val)

+@staticmethod
+def deserialize(byts, protocol_version):
+return bytearray(byts)
+

 class DecimalType(_CassandraType):
 typename = 'decimal'
{code}

If this is not enough and you want to debug some more [~aholmber], you can use 
the 2.1 patch attached. I'm still working on the 2.2. merge. You need to 
generate a table with a blob, I used cassandra-stress. Then run {{COPY 
 TO 'anyfile';}} from cqlsh and this should result in a Unicode 
decode error on Windows because the blob is received as a string. If you prefer 
me to test things for you, that works too.


> COPY TO improvements
> 
>
> Key: CASSANDRA-9304
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9304
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Jonathan Ellis
>Assignee: Stefania
>Priority: Minor
>  Labels: cqlsh
> Fix For: 3.x, 2.1.x, 2.2.x
>
>
> COPY FROM has gotten a lot of love.  COPY TO not so much.  One obvious 
> improvement could be to parallelize reading and writing (write one page of 
> data while fetching the next).



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

[jira] [Commented] (CASSANDRA-10633) cqlsh copy uses wrong variable name for time_format

[Stefania (JIRA)]

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

Stefania commented on CASSANDRA-10633:
--

Sure, I'll try and have the test ready in the next few days.

> cqlsh copy uses wrong variable name for time_format
> ---
>
> Key: CASSANDRA-10633
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10633
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Jeremiah Jordan
>Assignee: Stefania
> Fix For: 2.1.x, 2.2.x, 3.0.x
>
>
> {code}
> diff --git a/bin/cqlsh b/bin/cqlsh
> index ca45be3..ddf0314 100755
> --- a/bin/cqlsh
> +++ b/bin/cqlsh
> @@ -1816,7 +1816,7 @@ class Shell(cmd.Cmd):
>  encoding = opts.pop('encoding', 'utf8')
>  nullval = opts.pop('null', '')
>  header = bool(opts.pop('header', '').lower() == 'true')
> -timestamp_format = opts.pop('time_format', 
> self.display_timestamp_format)
> +timestamp_format = opts.pop('time_format', self.display_time_format)
>  if dialect_options['quotechar'] == dialect_options['escapechar']:
>  dialect_options['doublequote'] = True
>  del dialect_options['escape char']
> {code}



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

[jira] [Commented] (CASSANDRA-7645) cqlsh: show partial trace if incomplete after max_trace_wait

[Carl Yeksigian (JIRA)]

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

Carl Yeksigian commented on CASSANDRA-7645:
---

We should revert these changes from 2.1, as we didn't change to the new driver 
architecture in the 2.1 update. Otherwise, I've updated to use the new API from 
PYTHON-438.

||2.1||2.2||3.0||trunk||
|[branch|https://github.com/carlyeks/cassandra/tree/ticket/7645-2/2.1]|[branch|https://github.com/carlyeks/cassandra/tree/ticket/7645-2/2.2]|[branch|https://github.com/carlyeks/cassandra/tree/ticket/7645-2/3.0]|[branch|https://github.com/carlyeks/cassandra/tree/ticket/7645-2/trunk]|
|[utest|http://cassci.datastax.com/view/Dev/view/carlyeks/job/carlyeks-ticket-7645-2-2.1-testall/]|[utest|http://cassci.datastax.com/view/Dev/view/carlyeks/job/carlyeks-ticket-7645-2-2.2-testall/]|[utest|http://cassci.datastax.com/view/Dev/view/carlyeks/job/carlyeks-ticket-7645-2-3.0-testall/]|[utest|http://cassci.datastax.com/view/Dev/view/carlyeks/job/carlyeks-ticket-7645-2-trunk-testall/]|
|[dtest|http://cassci.datastax.com/view/Dev/view/carlyeks/job/carlyeks-ticket-7645-2-2.1-dtest/]|[dtest|http://cassci.datastax.com/view/Dev/view/carlyeks/job/carlyeks-ticket-7645-2-2.2-dtest/]|[dtest|http://cassci.datastax.com/view/Dev/view/carlyeks/job/carlyeks-ticket-7645-2-3.0-dtest/]|[dtest|http://cassci.datastax.com/view/Dev/view/carlyeks/job/carlyeks-ticket-7645-2-trunk-dtest/]|


> cqlsh: show partial trace if incomplete after max_trace_wait
> 
>
> Key: CASSANDRA-7645
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7645
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Tools
>Reporter: Tyler Hobbs
>Assignee: Carl Yeksigian
>Priority: Trivial
> Fix For: 2.2.4, 2.1.12, 3.0.0
>
>
> If a trace hasn't completed within {{max_trace_wait}}, cqlsh will say the 
> trace is unavailable and not show anything.  It (and the underlying python 
> driver) determines when the trace is complete by checking if the {{duration}} 
> column in {{system_traces.sessions}} is non-null.  If {{duration}} is null 
> but we still have some trace events when the timeout is hit, cqlsh should 
> print whatever trace events we have along with a warning about it being 
> incomplete.



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

[jira] [Commented] (CASSANDRA-10633) cqlsh copy uses wrong variable name for time_format

[Paulo Motta (JIRA)]

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

Paulo Motta commented on CASSANDRA-10633:
-

Code and CI looks good. Would you mind adding a simple regression dtest using 
the TIMEFORMAT option? 

Thanks!

> cqlsh copy uses wrong variable name for time_format
> ---
>
> Key: CASSANDRA-10633
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10633
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Jeremiah Jordan
>Assignee: Stefania
> Fix For: 2.1.x, 2.2.x, 3.0.x
>
>
> {code}
> diff --git a/bin/cqlsh b/bin/cqlsh
> index ca45be3..ddf0314 100755
> --- a/bin/cqlsh
> +++ b/bin/cqlsh
> @@ -1816,7 +1816,7 @@ class Shell(cmd.Cmd):
>  encoding = opts.pop('encoding', 'utf8')
>  nullval = opts.pop('null', '')
>  header = bool(opts.pop('header', '').lower() == 'true')
> -timestamp_format = opts.pop('time_format', 
> self.display_timestamp_format)
> +timestamp_format = opts.pop('time_format', self.display_time_format)
>  if dialect_options['quotechar'] == dialect_options['escapechar']:
>  dialect_options['doublequote'] = True
>  del dialect_options['escape char']
> {code}



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

[jira] [Commented] (CASSANDRA-10628) get JEMAlloc debug output out of nodetool output

[Ariel Weisberg (JIRA)]

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

Ariel Weisberg commented on CASSANDRA-10628:


The change LGTM. The dtests and utests look good although the trunk version is 
still running. I asked Robert to manually test on Linux and OS X, with and 
without jemalloc, and disabling jemalloc with "-". If that checks out then +1.

> get JEMAlloc debug output out of nodetool output
> 
>
> Key: CASSANDRA-10628
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10628
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Jim Witschey
>Assignee: Robert Stupp
> Fix For: 2.2.4, 3.0.0
>
>
> This is a followup ticket for CASSANDRA-10581. The consensus on the Cassandra 
> TE is that the debug output for loading JEMAlloc is helpful (or at least 
> harmless when starting C*, but not when starting {{nodetool}}, which, it 
> turns out, sources {{cassandra-env}}:
> https://github.com/apache/cassandra/blob/trunk/bin/nodetool#L53
> You can reproduce the excessive output with
> {code}
> ccm create test-nodetool-output -v git:cassandra-3.0 -n 1 ; ccm start 
> --wait-for-binary-proto ; ccm node1 nodetool ring
> {code}
> The simplest solution would probably be to redirect the output of the 
> sourcing to {{/dev/null/}}. I don't know if that's the right thing to do; it 
> may be better to move the {{LD_PRELOAD}}-setting logic to {{bin/cassandra}}. 
> I'm not sure what the reasoning would be for putting something in one place 
> or another, so I leave it to the dev team to decide on the best solution.
> Assigning [~snazy] for now; feel free to reassign



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

[jira] [Commented] (CASSANDRA-9748) Can't see other nodes when using multiple network interfaces

[Ariel Weisberg (JIRA)]

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

Ariel Weisberg commented on CASSANDRA-9748:
---

[~pauloricardomg] can you make it so they can configure multiple interfaces for 
listening without binding to all interfaces?

At some point in the future we will genuinely need to support multiple 
interfaces for performance in virtualized environments. We could go with a UI 
that accommodates that although we will probably get it wrong anyways.

> Can't see other nodes when using multiple network interfaces
> 
>
> Key: CASSANDRA-9748
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9748
> Project: Cassandra
>  Issue Type: Improvement
> Environment: Cassandra 2.0.16; multi-DC configuration
>Reporter: Roman Bielik
>Assignee: Paulo Motta
>  Labels: docs-impacting
> Fix For: 2.1.x, 2.2.x, 3.0.x
>
> Attachments: system_node1.log, system_node2.log
>
>
> The idea is to setup a multi-DC environment across 2 different networks based 
> on the following configuration recommendations:
> http://docs.datastax.com/en/cassandra/2.0/cassandra/configuration/configMultiNetworks.html
> Each node has 2 network interfaces. One used as a private network (DC1: 
> 10.0.1.x and DC2: 10.0.2.x). The second one a "public" network where all 
> nodes can see each other (this one has a higher latency). 
> Using the following settings in cassandra.yaml:
> *seeds:* public IP (same as used in broadcast_address)
> *listen_address:* private IP
> *broadcast_address:* public IP
> *rpc_address:* 0.0.0.0
> *endpoint_snitch:* GossipingPropertyFileSnitch
> _(tried different combinations with no luck)_
> No firewall and no SSL/encryption used.
> The problem is that nodes do not see each other (a gossip problem I guess). 
> The nodetool ring/status shows only the local node but not the other ones 
> (even from the same DC).
> When I set listen_address to public IP, then everything works fine, but that 
> is not the required configuration.
> _Note: Not using EC2 cloud!_
> netstat -anp | grep -E "(7199|9160|9042|7000)"
> tcp0  0 0.0.0.0:71990.0.0.0:*   
> LISTEN  3587/java   
> tcp0  0 10.0.1.1:9160   0.0.0.0:*   
> LISTEN  3587/java   
> tcp0  0 10.0.1.1:9042   0.0.0.0:*   
> LISTEN  3587/java   
> tcp0  0 10.0.1.1:7000   0.0.0.0:*   
> LISTEN  3587/java   
> tcp0  0 127.0.0.1:7199  127.0.0.1:52874 
> ESTABLISHED 3587/java   
> tcp0  0 10.0.1.1:7199   10.0.1.1:39650  
> ESTABLISHED 3587/java 



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

[jira] [Commented] (CASSANDRA-10512) We do not save an upsampled index summaries

[Ariel Weisberg (JIRA)]

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

Ariel Weisberg commented on CASSANDRA-10512:


Renamed, tests are running. 

> We do not save an upsampled index summaries
> ---
>
> Key: CASSANDRA-10512
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10512
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Benedict
>Assignee: Ariel Weisberg
> Fix For: 2.1.x, 2.2.x, 3.1
>
>
> If we downsample an index summary, we overwrite the existing summary, despite 
> downsampling being inexpensive. However on upsampling (which is expensive) we 
> do not, so that on restart all of our index summaries are the smallest they 
> have ever been adjusted to.



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

[jira] [Updated] (CASSANDRA-10651) allow unit testing by defined list of files

[Ariel Weisberg (JIRA)]

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

Ariel Weisberg updated CASSANDRA-10651:
---
Reviewer: Ariel Weisberg

> allow unit testing by defined list of files
> ---
>
> Key: CASSANDRA-10651
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10651
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Russ Hatch
>Assignee: Russ Hatch
> Fix For: 3.2
>
> Attachments: test_slice_001.txt, trunk-10651.txt
>
>
> "Testing by list" allows distributing defined test lists across machines to 
> run tests in parallel.
> Additionally it can be used by devs to create a simple list of tests they are 
> interested in during feature development, without crafting a complicated 
> command.
> A final reason would be adding a new way to divide tests into suites without 
> requiring more unique ant targets (which may differ in subtle ways for better 
> or worse).



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

[jira] [Commented] (CASSANDRA-10651) allow unit testing by defined list of files

[Russ Hatch (JIRA)]

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

Russ Hatch commented on CASSANDRA-10651:


[~aweisberg] could you offer a review?

> allow unit testing by defined list of files
> ---
>
> Key: CASSANDRA-10651
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10651
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Russ Hatch
>Assignee: Russ Hatch
> Fix For: 3.2
>
> Attachments: test_slice_001.txt, trunk-10651.txt
>
>
> "Testing by list" allows distributing defined test lists across machines to 
> run tests in parallel.
> Additionally it can be used by devs to create a simple list of tests they are 
> interested in during feature development, without crafting a complicated 
> command.
> A final reason would be adding a new way to divide tests into suites without 
> requiring more unique ant targets (which may differ in subtle ways for better 
> or worse).



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

[jira] [Assigned] (CASSANDRA-10641) simultaneous_bootstrap_test fails on Windows

[Joshua McKenzie (JIRA)]

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

Joshua McKenzie reassigned CASSANDRA-10641:
---

Assignee: Joshua McKenzie  (was: Paulo Motta)

Grabbing the ticket as I wrote the original launch scripts and Paulo has enough 
Windows-related on his plate atm. ;)

> simultaneous_bootstrap_test fails on Windows
> 
>
> Key: CASSANDRA-10641
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10641
> Project: Cassandra
>  Issue Type: Sub-task
>Reporter: Jim Witschey
>Assignee: Joshua McKenzie
> Fix For: 2.2.x, 3.0.0
>
>
> {{bootstrap_test.py:TestBootstrap.simultaneous_bootstrap_test}} fails on 
> Windows on C* 3.0 and 2.2:
> http://cassci.datastax.com/view/win32/job/cassandra-3.0_dtest_win32/99/testReport/junit/bootstrap_test/TestBootstrap/simultaneous_bootstrap_test/
> http://cassci.datastax.com/view/win32/job/cassandra-2.2_dtest_win32/127/testReport/junit/bootstrap_test/TestBootstrap/simultaneous_bootstrap_test/
> It expects there to be a warning in the stderr of the node attempting to 
> start while another node boostraps, but the stderr is empty. It fails on this 
> line:
> https://github.com/riptano/cassandra-dtest/blob/master/bootstrap_test.py#L469
> [~yukim] I believe you're the person to handle this ticket? I'll assign you, 
> but feel free to reassign.



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

[jira] [Created] (CASSANDRA-10652) Tracing prevents startup after upgrading

[Carl Yeksigian (JIRA)]

Carl Yeksigian created CASSANDRA-10652:
--

 Summary: Tracing prevents startup after upgrading
 Key: CASSANDRA-10652
 URL: https://issues.apache.org/jira/browse/CASSANDRA-10652
 Project: Cassandra
  Issue Type: Bug
Reporter: Carl Yeksigian
Priority: Blocker
 Fix For: 3.0.0


After upgrading from 2.1 to 3.0, the {{system_traces.sessions}} table is not 
properly upgraded to include the {{client}} column added in CASSANDRA-8162. 
Just upgrading from a clean 2.2 install to 3.0 won't show this error because 
the column was included in 2.2, it just doesn't break the queries in that 
release.

The errors I get when querying {{system_traces.sessions}}:
{noformat}
java.lang.RuntimeException: java.lang.IllegalStateException: 
[ColumnDefinition{name=client, 
type=org.apache.cassandra.db.marshal.InetAddressType, kind=REGULAR, 
position=-1}, ColumnDefinition{name=command, 
type=org.apache.cassandra.db.marshal.UTF8Type, kind=REGULAR, position=-1}, 
ColumnDefinition{name=coordinator, 
type=org.apache.cassandra.db.marshal.InetAddressType, kind=REGULAR, 
position=-1}, ColumnDefinition{name=duration, 
type=org.apache.cassandra.db.marshal.Int32Type, kind=REGULAR, position=-1}, 
ColumnDefinition{name=request, type=org.apache.cassandra.db.marshal.UTF8Type, 
kind=REGULAR, position=-1}, ColumnDefinition{name=started_at, 
type=org.apache.cassandra.db.marshal.TimestampType, kind=REGULAR, position=-1}, 
ColumnDefinition{name=parameters, 
type=org.apache.cassandra.db.marshal.MapType(org.apache.cassandra.db.marshal.UTF8Type,org.apache.cassandra.db.marshal.UTF8Type),
 kind=REGULAR, position=-1}] is not a subset of [coordinator duration request 
started_at parameters]
at 
org.apache.cassandra.service.StorageProxy$DroppableRunnable.run(StorageProxy.java:2350)
 ~[main/:na]
at 
java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) 
~[na:1.8.0_45]
at 
org.apache.cassandra.concurrent.AbstractTracingAwareExecutorService$FutureTask.run(AbstractTracingAwareExecutorService.java:164)
 ~[main/:na]
at org.apache.cassandra.concurrent.SEPWorker.run(SEPWorker.java:105) 
[main/:na]
at java.lang.Thread.run(Thread.java:745) [na:1.8.0_45]
Caused by: java.lang.IllegalStateException: [ColumnDefinition{name=client, 
type=org.apache.cassandra.db.marshal.InetAddressType, kind=REGULAR, 
position=-1}, ColumnDefinition{name=command, 
type=org.apache.cassandra.db.marshal.UTF8Type, kind=REGULAR, position=-1}, 
ColumnDefinition{name=coordinator, 
type=org.apache.cassandra.db.marshal.InetAddressType, kind=REGULAR, 
position=-1}, ColumnDefinition{name=duration, 
type=org.apache.cassandra.db.marshal.Int32Type, kind=REGULAR, position=-1}, 
ColumnDefinition{name=request, type=org.apache.cassandra.db.marshal.UTF8Type, 
kind=REGULAR, position=-1}, ColumnDefinition{name=started_at, 
type=org.apache.cassandra.db.marshal.TimestampType, kind=REGULAR, position=-1}, 
ColumnDefinition{name=parameters, 
type=org.apache.cassandra.db.marshal.MapType(org.apache.cassandra.db.marshal.UTF8Type,org.apache.cassandra.db.marshal.UTF8Type),
 kind=REGULAR, position=-1}] is not a subset of [coordinator duration request 
started_at parameters]
at 
org.apache.cassandra.db.Columns$Serializer.encodeBitmap(Columns.java:531) 
~[main/:na]
at 
org.apache.cassandra.db.Columns$Serializer.serializeSubset(Columns.java:465) 
~[main/:na]
at 
org.apache.cassandra.db.rows.UnfilteredSerializer.serialize(UnfilteredSerializer.java:178)
 ~[main/:na]
at 
org.apache.cassandra.db.rows.UnfilteredSerializer.serialize(UnfilteredSerializer.java:108)
 ~[main/:na]
at 
org.apache.cassandra.db.rows.UnfilteredSerializer.serialize(UnfilteredSerializer.java:96)
 ~[main/:na]
at 
org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer.serialize(UnfilteredRowIteratorSerializer.java:132)
 ~[main/:na]
at 
org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer.serialize(UnfilteredRowIteratorSerializer.java:87)
 ~[main/:na]
at 
org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer.serialize(UnfilteredRowIteratorSerializer.java:77)
 ~[main/:na]
at 
org.apache.cassandra.db.partitions.UnfilteredPartitionIterators$Serializer.serialize(UnfilteredPartitionIterators.java:298)
 ~[main/:na]
at 
org.apache.cassandra.db.ReadResponse$LocalDataResponse.build(ReadResponse.java:136)
 ~[main/:na]
at 
org.apache.cassandra.db.ReadResponse$LocalDataResponse.(ReadResponse.java:128)
 ~[main/:na]
at 
org.apache.cassandra.db.ReadResponse$LocalDataResponse.(ReadResponse.java:123)
 ~[main/:na]
at 
org.apache.cassandra.db.ReadResponse.createDataResponse(ReadResponse.java:65) 
~[main/:na]
at 
org.apache.cassandra.db.ReadCommand.createResponse(ReadCommand.java:288) 
~[main/:na]
at 

[jira] [Commented] (CASSANDRA-9304) COPY TO improvements

[Adam Holmberg (JIRA)]

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

Adam Holmberg commented on CASSANDRA-9304:
--

[~Stefania] nothing jumps out at me after a brief scan of the changeset. First 
thing I would check is the [column metadata materialized for this 
column|https://github.com/datastax/python-driver/blob/2.7.2/cassandra/protocol.py#L625]
 (is it the expected type?).  I have not tried to reproduce yet.

Does the subsequent discussion about Windows support for 2.2+ make this "don't 
care", or is there still an issue with other versions?

> COPY TO improvements
> 
>
> Key: CASSANDRA-9304
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9304
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Jonathan Ellis
>Assignee: Stefania
>Priority: Minor
>  Labels: cqlsh
> Fix For: 3.x, 2.1.x, 2.2.x
>
>
> COPY FROM has gotten a lot of love.  COPY TO not so much.  One obvious 
> improvement could be to parallelize reading and writing (write one page of 
> data while fetching the next).



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

[jira] [Commented] (CASSANDRA-10012) Deadlock when session streaming is retried after exception

[Paulo Motta (JIRA)]

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

Paulo Motta commented on CASSANDRA-10012:
-

Nice catch! Code and tests look good. It doesn't merge to 3.0 though, could you 
rebase and submit tests for 3.0?

Could this be a duplicate of CASSANDRA-10448 ? The same {{Unknown type 0}} 
exception is thrown. Can we close preceding ticket CASSANDRA-10005?

> Deadlock when session streaming is retried after exception
> --
>
> Key: CASSANDRA-10012
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10012
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Chris Moos
>Assignee: Chris Moos
> Fix For: 2.2.x
>
> Attachments: CASSANDRA-10012.patch
>
>
> This patch ensures that the CompressedInputStream thread is cleaned up 
> properly (for example, if an Exception occurs and a session stream is 
> retried).



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

[jira] [Commented] (CASSANDRA-10512) We do not save an upsampled index summaries

[Benedict (JIRA)]

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

Benedict commented on CASSANDRA-10512:
--

I've closed CASSANDRA-10511 in favour of this, since your branches are merged.

Would it be neater to have a {{copyReadableBounds}} method instead of 
{{getReadableBounds}}?

> We do not save an upsampled index summaries
> ---
>
> Key: CASSANDRA-10512
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10512
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Benedict
>Assignee: Ariel Weisberg
> Fix For: 2.1.x, 2.2.x, 3.1
>
>
> If we downsample an index summary, we overwrite the existing summary, despite 
> downsampling being inexpensive. However on upsampling (which is expensive) we 
> do not, so that on restart all of our index summaries are the smallest they 
> have ever been adjusted to.



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

[jira] [Commented] (CASSANDRA-10616) add support for jacoco execfile merging and bump version

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko commented on CASSANDRA-10616:
---

Committed as 
[b14423c8b4c26f3ac84c901ff078d7635aaddfb8|https://github.com/apache/cassandra/commit/b14423c8b4c26f3ac84c901ff078d7635aaddfb8]
 to trunk, thanks.

> add support for jacoco execfile merging and bump version
> 
>
> Key: CASSANDRA-10616
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10616
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Russ Hatch
>Assignee: Russ Hatch
> Fix For: 3.2
>
> Attachments: trunk-10616.txt
>
>
> To support coverage reporting across multiple machines we need to add a build 
> task for jacoco's merge feature. This will allow tests to be run in 
> fragmented ways (such as in parallel) and later combined into a single 
> cohesive coverage report.
> Additionally, jacoco can be updated from 0.7.1 to 0.7.5.



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

[jira] [Commented] (CASSANDRA-10631) JSON Update not working with PreparedStatement

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne commented on CASSANDRA-10631:
--

Last [dtest|http://cassci.datastax.com/job/pcmanus-10631-dtest/2/] run confirms 
this is on par with the 2.2 branch.

> JSON Update not working with PreparedStatement
> --
>
> Key: CASSANDRA-10631
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10631
> Project: Cassandra
>  Issue Type: Bug
>  Components: CQL
> Environment: Windows 7, Datastax Java Driver 2.2.0-rc2
>Reporter: Henrik Karlsson
>Assignee: Sylvain Lebresne
> Fix For: 2.2.x
>
> Attachments: test-json.zip
>
>
> When using PreparedStatement to insert and update a row with JSON the first 
> "INSERT INTO {tablename} JSON ?" statement works OK. But when calling it a 
> second time with a changed value on a field the field is not updated. If I 
> use a SimpleStatement instead ("INSERT INTO {tablename} JSON '"+json+"'") the 
> modified field is updated as expected.
> Attaching a test project that shows the problem.



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

[jira] [Commented] (CASSANDRA-10298) Replaced dead node stayed in gossip forever

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko commented on CASSANDRA-10298:
---

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

[~Stefania] [~dikanggu] There was an issue with braces/newlines that went 
against code style, I fixed that on commit. I hope nothing else was overlooked 
though.

> Replaced dead node stayed in gossip forever
> ---
>
> Key: CASSANDRA-10298
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10298
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Dikang Gu
>Assignee: Dikang Gu
> Fix For: 2.1.x
>
> Attachments: CASSANDRA-10298.patch
>
>
> The dead node stayed in the nodetool status,
> DN  10.210.165.55379.76 GB  256 ?   null
> And in the log, it throws NPE when trying to remove it.
> {code}
> 2015-09-10_06:41:22.92453 ERROR 06:41:22 Exception in thread 
> Thread[GossipStage:1,5,main]
> 2015-09-10_06:41:22.92454 java.lang.NullPointerException: null
> 2015-09-10_06:41:22.92455   at 
> org.apache.cassandra.utils.UUIDGen.decompose(UUIDGen.java:100) 
> 2015-09-10_06:41:22.92455   at 
> org.apache.cassandra.db.HintedHandOffManager.deleteHintsForEndpoint(HintedHandOffManager.java:201)
>  
> 2015-09-10_06:41:22.92455   at 
> org.apache.cassandra.service.StorageService.excise(StorageService.java:1886) 
> 2015-09-10_06:41:22.92455   at 
> org.apache.cassandra.service.StorageService.excise(StorageService.java:1902) 
> 2015-09-10_06:41:22.92456   at 
> org.apache.cassandra.service.StorageService.handleStateLeft(StorageService.java:1805)
> 2015-09-10_06:41:22.92457   at 
> org.apache.cassandra.service.StorageService.onChange(StorageService.java:1473)
>  
> 2015-09-10_06:41:22.92457   at 
> org.apache.cassandra.service.StorageService.onJoin(StorageService.java:2099) 
> 2015-09-10_06:41:22.92457   at 
> org.apache.cassandra.gms.Gossiper.handleMajorStateChange(Gossiper.java:1009) 
> 2015-09-10_06:41:22.92458   at 
> org.apache.cassandra.gms.Gossiper.applyStateLocally(Gossiper.java:1085) 
> 2015-09-10_06:41:22.92458   at 
> org.apache.cassandra.gms.GossipDigestAck2VerbHandler.doVerb(GossipDigestAck2VerbHandler.java:49)
>  
> 2015-09-10_06:41:22.92458   at 
> org.apache.cassandra.net.MessageDeliveryTask.run(MessageDeliveryTask.java:62) 
> 2015-09-10_06:41:22.92459   at 
> java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
>  ~[na:1.7.0_45]
> 2015-09-10_06:41:22.92460   at 
> java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
>  ~[na:1.7.0_45]
> {code}



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

[jira] [Comment Edited] (CASSANDRA-10365) Store types by their CQL names in schema tables instead of fully-qualified internal class names

[Robert Stupp (JIRA)]

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

Robert Stupp edited comment on CASSANDRA-10365 at 11/4/15 2:09 PM:
---

Rebased the UDA/initcond fork of Aleksey's branch. Cassci's currently working 
on 
[testall|http://cassci.datastax.com/view/Dev/view/snazy/job/snazy-10365-uda-3.0-testall/]
 and 
[dtests|http://cassci.datastax.com/view/Dev/view/snazy/job/snazy-10365-uda-3.0-dtest/].


was (Author: snazy):
Rebased the UDA/initcond fork of Aleksey's branch. Cassia's currently working 
on 
[testall|http://cassci.datastax.com/view/Dev/view/snazy/job/snazy-10365-uda-3.0-testall/]
 and 
[dtests|http://cassci.datastax.com/view/Dev/view/snazy/job/snazy-10365-uda-3.0-dtest/].

> Store types by their CQL names in schema tables instead of fully-qualified 
> internal class names
> ---
>
> Key: CASSANDRA-10365
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10365
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Aleksey Yeschenko
>Assignee: Aleksey Yeschenko
>  Labels: client-impacting
> Fix For: 3.0.0
>
>
> Consider saving CQL types names for column, UDF/UDA arguments and return 
> types, and UDT components.



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

[jira] [Commented] (CASSANDRA-9304) COPY TO improvements

[T Jake Luciani (JIRA)]

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

T Jake Luciani commented on CASSANDRA-9304:
---

bq. I expect it's acceptable for COPY on Windows to only work from 2.2 onward

Agreed. [~Stefania] I had to do this for CASSANDRA-9795



> COPY TO improvements
> 
>
> Key: CASSANDRA-9304
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9304
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Jonathan Ellis
>Assignee: Stefania
>Priority: Minor
>  Labels: cqlsh
> Fix For: 3.x, 2.1.x, 2.2.x
>
>
> COPY FROM has gotten a lot of love.  COPY TO not so much.  One obvious 
> improvement could be to parallelize reading and writing (write one page of 
> data while fetching the next).



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

[1/3] cassandra git commit: Revert "Revert "Update cqlsh driver for new driver execution API""

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 8f985852f -> 1d340befa


Revert "Revert "Update cqlsh driver for new driver execution API""

This reverts commit 0fbf715916b48a8e8abad5911e2697791b49f824.


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

Branch: refs/heads/cassandra-3.0
Commit: 9404fed01ae2f354f90e68d52c7d0b92196cc62a
Parents: 5a2d529
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 14:21:18 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:21:18 2015 +

--
 bin/cqlsh.py|  69 +--
 lib/cassandra-driver-internal-only-2.7.2.zip| Bin 229600 -> 0 bytes
 ...iver-internal-only-3.0.0a2.post0-95c6008.zip | Bin 0 -> 233564 bytes
 3 files changed, 31 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9404fed0/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 09da020..17bddd3 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -111,13 +111,13 @@ except ImportError, e:
  'Error: %s\n' % (sys.executable, sys.path, e))
 
 from cassandra.auth import PlainTextAuthProvider
-from cassandra.cluster import Cluster, PagedResult
+from cassandra.cluster import Cluster
 from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata,
 TableMetadata, protect_name, protect_names,
 protect_value)
 from cassandra.policies import WhiteListRoundRobinPolicy
 from cassandra.protocol import QueryMessage, ResultMessage
-from cassandra.query import SimpleStatement, ordered_dict_factory
+from cassandra.query import SimpleStatement, ordered_dict_factory, 
TraceUnavailable
 
 # cqlsh should run correctly when run out of a Cassandra source tree,
 # out of an unpacked Cassandra tarball, and after a proper package install.
@@ -675,6 +675,7 @@ class Shell(cmd.Cmd):
 
 self.session.default_timeout = client_timeout
 self.session.row_factory = ordered_dict_factory
+self.session.default_consistency_level = cassandra.ConsistencyLevel.ONE
 self.get_connection_versions()
 
 self.current_keyspace = keyspace
@@ -1121,8 +1122,8 @@ class Shell(cmd.Cmd):
 
 def do_use(self, parsed):
 ksname = parsed.get_binding('ksname')
-result, future = 
self.perform_simple_statement(SimpleStatement(parsed.extract_orig()))
-if result:
+success, _ = 
self.perform_simple_statement(SimpleStatement(parsed.extract_orig()))
+if success:
 if ksname[0] == '"' and ksname[-1] == '"':
 self.current_keyspace = self.cql_unprotect_name(ksname)
 else:
@@ -1139,7 +1140,7 @@ class Shell(cmd.Cmd):
 
 def perform_statement(self, statement):
 stmt = SimpleStatement(statement, 
consistency_level=self.consistency_level, 
serial_consistency_level=self.serial_consistency_level, 
fetch_size=self.page_size if self.use_paging else None)
-result, future = self.perform_simple_statement(stmt)
+success, future = self.perform_simple_statement(stmt)
 
 if future:
 if future.warnings:
@@ -1147,19 +1148,17 @@ class Shell(cmd.Cmd):
 
 if self.tracing_enabled:
 try:
-trace = future.get_query_trace(self.max_trace_wait)
-if trace:
+for trace in 
future.get_all_query_traces(self.max_trace_wait):
 print_trace(self, trace)
-elif stmt.trace_id:
-self.writeresult("This statement trace may be 
incomplete", color=RED)
-self.show_session(stmt.trace_id)
-else:
-msg = "Statement trace did not complete within %d 
seconds" % (self.session.max_trace_wait)
-self.writeresult(msg, color=RED)
+except TraceUnavailable:
+msg = "Statement trace did not complete within %d seconds; 
trace data may be incomplete." % (self.session.max_trace_wait,)
+self.writeresult(msg, color=RED)
+for trace_id in future.get_query_trace_ids():
+self.show_session(trace_id)
 except Exception, err:
 self.printerr("Unable to fetch query trace: %s" % 
(str(err),))
 
-return result
+return success
 
 def parse_for_table_meta(self, query_string):
 try:
@@ -1177,7 +1176,7 @@ class Shell(cmd.Cmd):
  

[3/3] cassandra git commit: Revert "Revert "Update cqlsh driver for new driver execution API""

[aleksey]

Revert "Revert "Update cqlsh driver for new driver execution API""

This reverts commit 0fbf715916b48a8e8abad5911e2697791b49f824.


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

Branch: refs/heads/cassandra-3.0
Commit: 1d340befafa62e7d6fbe05fd7d0acb6cf1611c88
Parents: e3936ff
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 14:36:05 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:36:05 2015 +

--
 bin/cqlsh.py|  67 +--
 lib/cassandra-driver-internal-only-2.7.2.zip| Bin 229600 -> 0 bytes
 ...iver-internal-only-3.0.0a2.post0-95c6008.zip | Bin 0 -> 233564 bytes
 3 files changed, 30 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d340bef/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index e092d44..c92a6b9 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -111,13 +111,13 @@ except ImportError, e:
  'Error: %s\n' % (sys.executable, sys.path, e))
 
 from cassandra.auth import PlainTextAuthProvider
-from cassandra.cluster import Cluster, PagedResult
+from cassandra.cluster import Cluster
 from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata,
 TableMetadata, protect_name, protect_names,
 protect_value)
 from cassandra.policies import WhiteListRoundRobinPolicy
 from cassandra.protocol import QueryMessage, ResultMessage
-from cassandra.query import SimpleStatement, ordered_dict_factory
+from cassandra.query import SimpleStatement, ordered_dict_factory, 
TraceUnavailable
 
 # cqlsh should run correctly when run out of a Cassandra source tree,
 # out of an unpacked Cassandra tarball, and after a proper package install.
@@ -680,6 +680,7 @@ class Shell(cmd.Cmd):
 
 self.session.default_timeout = client_timeout
 self.session.row_factory = ordered_dict_factory
+self.session.default_consistency_level = cassandra.ConsistencyLevel.ONE
 self.get_connection_versions()
 
 self.current_keyspace = keyspace
@@ -1143,8 +1144,8 @@ class Shell(cmd.Cmd):
 
 def do_use(self, parsed):
 ksname = parsed.get_binding('ksname')
-result, future = 
self.perform_simple_statement(SimpleStatement(parsed.extract_orig()))
-if result:
+success, _ = 
self.perform_simple_statement(SimpleStatement(parsed.extract_orig()))
+if success:
 if ksname[0] == '"' and ksname[-1] == '"':
 self.current_keyspace = self.cql_unprotect_name(ksname)
 else:
@@ -1161,7 +1162,7 @@ class Shell(cmd.Cmd):
 
 def perform_statement(self, statement):
 stmt = SimpleStatement(statement, 
consistency_level=self.consistency_level, 
serial_consistency_level=self.serial_consistency_level, 
fetch_size=self.page_size if self.use_paging else None)
-result, future = self.perform_simple_statement(stmt)
+success, future = self.perform_simple_statement(stmt)
 
 if future:
 if future.warnings:
@@ -1169,19 +1170,17 @@ class Shell(cmd.Cmd):
 
 if self.tracing_enabled:
 try:
-trace = future.get_query_trace(self.max_trace_wait)
-if trace:
+for trace in 
future.get_all_query_traces(self.max_trace_wait):
 print_trace(self, trace)
-elif stmt.trace_id:
-self.writeresult("This statement trace may be 
incomplete", color=RED)
-self.show_session(stmt.trace_id)
-else:
-msg = "Statement trace did not complete within %d 
seconds" % (self.session.max_trace_wait)
-self.writeresult(msg, color=RED)
+except TraceUnavailable:
+msg = "Statement trace did not complete within %d seconds; 
trace data may be incomplete." % (self.session.max_trace_wait,)
+self.writeresult(msg, color=RED)
+for trace_id in future.get_query_trace_ids():
+self.show_session(trace_id)
 except Exception, err:
 self.printerr("Unable to fetch query trace: %s" % 
(str(err),))
 
-return result
+return success
 
 def parse_for_select_meta(self, query_string):
 try:
@@ -1214,7 +1213,7 @@ class Shell(cmd.Cmd):
 while True:
 try:
 future = 

[2/4] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: e3936ff1b16fddedd27713c1942d88c29897cf67
Parents: 8f98585 9404fed
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 14:24:01 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:24:01 2015 +

--

--

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

[aleksey]

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 85c52bb742a95f247b4af6dddfe048331ed5582b
Parents: 82189ee 1d340be
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 14:36:36 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:36:36 2015 +

--
 bin/cqlsh.py|  67 +--
 lib/cassandra-driver-internal-only-2.7.2.zip| Bin 229600 -> 0 bytes
 ...iver-internal-only-3.0.0a2.post0-95c6008.zip | Bin 0 -> 233564 bytes
 3 files changed, 30 insertions(+), 37 deletions(-)
--

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

[aleksey]

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: fda0754c1e47a492820d63048296b2299c17ccdc
Parents: 85c52bb b761b86
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 14:39:55 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:39:55 2015 +

--
 pylib/cqlshlib/formatting.py | 1 +
 1 file changed, 1 insertion(+)
--

[1/3] cassandra git commit: Fix SortedSet cqlsh formatting (follow-up to CASSANDRA-10513)

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 85c52bb74 -> fda0754c1


Fix SortedSet cqlsh formatting (follow-up to CASSANDRA-10513)


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

Branch: refs/heads/trunk
Commit: a306a1bf32d43af1db17ec1cf592fa8780464ccc
Parents: 9404fed
Author: Paulo Motta 
Authored: Fri Oct 30 08:21:33 2015 -0700
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:38:42 2015 +

--
 pylib/cqlshlib/formatting.py | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a306a1bf/pylib/cqlshlib/formatting.py
--
diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py
index e95df9f..fe1786a 100644
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@ -270,6 +270,7 @@ def format_value_set(val, encoding, colormap, 
date_time_format, float_precision,
 date_time_format, float_precision, nullval)
 formatter_for('frozenset')(format_value_set)
 formatter_for('sortedset')(format_value_set)
+formatter_for('SortedSet')(format_value_set)
 
 
 @formatter_for('dict')

[3/4] cassandra git commit: Revert "Revert "Update cqlsh driver for new driver execution API""

[aleksey]

Revert "Revert "Update cqlsh driver for new driver execution API""

This reverts commit 0fbf715916b48a8e8abad5911e2697791b49f824.


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

Branch: refs/heads/trunk
Commit: 1d340befafa62e7d6fbe05fd7d0acb6cf1611c88
Parents: e3936ff
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 14:36:05 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:36:05 2015 +

--
 bin/cqlsh.py|  67 +--
 lib/cassandra-driver-internal-only-2.7.2.zip| Bin 229600 -> 0 bytes
 ...iver-internal-only-3.0.0a2.post0-95c6008.zip | Bin 0 -> 233564 bytes
 3 files changed, 30 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d340bef/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index e092d44..c92a6b9 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -111,13 +111,13 @@ except ImportError, e:
  'Error: %s\n' % (sys.executable, sys.path, e))
 
 from cassandra.auth import PlainTextAuthProvider
-from cassandra.cluster import Cluster, PagedResult
+from cassandra.cluster import Cluster
 from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata,
 TableMetadata, protect_name, protect_names,
 protect_value)
 from cassandra.policies import WhiteListRoundRobinPolicy
 from cassandra.protocol import QueryMessage, ResultMessage
-from cassandra.query import SimpleStatement, ordered_dict_factory
+from cassandra.query import SimpleStatement, ordered_dict_factory, 
TraceUnavailable
 
 # cqlsh should run correctly when run out of a Cassandra source tree,
 # out of an unpacked Cassandra tarball, and after a proper package install.
@@ -680,6 +680,7 @@ class Shell(cmd.Cmd):
 
 self.session.default_timeout = client_timeout
 self.session.row_factory = ordered_dict_factory
+self.session.default_consistency_level = cassandra.ConsistencyLevel.ONE
 self.get_connection_versions()
 
 self.current_keyspace = keyspace
@@ -1143,8 +1144,8 @@ class Shell(cmd.Cmd):
 
 def do_use(self, parsed):
 ksname = parsed.get_binding('ksname')
-result, future = 
self.perform_simple_statement(SimpleStatement(parsed.extract_orig()))
-if result:
+success, _ = 
self.perform_simple_statement(SimpleStatement(parsed.extract_orig()))
+if success:
 if ksname[0] == '"' and ksname[-1] == '"':
 self.current_keyspace = self.cql_unprotect_name(ksname)
 else:
@@ -1161,7 +1162,7 @@ class Shell(cmd.Cmd):
 
 def perform_statement(self, statement):
 stmt = SimpleStatement(statement, 
consistency_level=self.consistency_level, 
serial_consistency_level=self.serial_consistency_level, 
fetch_size=self.page_size if self.use_paging else None)
-result, future = self.perform_simple_statement(stmt)
+success, future = self.perform_simple_statement(stmt)
 
 if future:
 if future.warnings:
@@ -1169,19 +1170,17 @@ class Shell(cmd.Cmd):
 
 if self.tracing_enabled:
 try:
-trace = future.get_query_trace(self.max_trace_wait)
-if trace:
+for trace in 
future.get_all_query_traces(self.max_trace_wait):
 print_trace(self, trace)
-elif stmt.trace_id:
-self.writeresult("This statement trace may be 
incomplete", color=RED)
-self.show_session(stmt.trace_id)
-else:
-msg = "Statement trace did not complete within %d 
seconds" % (self.session.max_trace_wait)
-self.writeresult(msg, color=RED)
+except TraceUnavailable:
+msg = "Statement trace did not complete within %d seconds; 
trace data may be incomplete." % (self.session.max_trace_wait,)
+self.writeresult(msg, color=RED)
+for trace_id in future.get_query_trace_ids():
+self.show_session(trace_id)
 except Exception, err:
 self.printerr("Unable to fetch query trace: %s" % 
(str(err),))
 
-return result
+return success
 
 def parse_for_select_meta(self, query_string):
 try:
@@ -1214,7 +1213,7 @@ class Shell(cmd.Cmd):
 while True:
 try:
 future = 

[1/4] cassandra git commit: Revert "Revert "Update cqlsh driver for new driver execution API""

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 82189ee32 -> 85c52bb74


Revert "Revert "Update cqlsh driver for new driver execution API""

This reverts commit 0fbf715916b48a8e8abad5911e2697791b49f824.


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

Branch: refs/heads/trunk
Commit: 9404fed01ae2f354f90e68d52c7d0b92196cc62a
Parents: 5a2d529
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 14:21:18 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:21:18 2015 +

--
 bin/cqlsh.py|  69 +--
 lib/cassandra-driver-internal-only-2.7.2.zip| Bin 229600 -> 0 bytes
 ...iver-internal-only-3.0.0a2.post0-95c6008.zip | Bin 0 -> 233564 bytes
 3 files changed, 31 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9404fed0/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 09da020..17bddd3 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -111,13 +111,13 @@ except ImportError, e:
  'Error: %s\n' % (sys.executable, sys.path, e))
 
 from cassandra.auth import PlainTextAuthProvider
-from cassandra.cluster import Cluster, PagedResult
+from cassandra.cluster import Cluster
 from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata,
 TableMetadata, protect_name, protect_names,
 protect_value)
 from cassandra.policies import WhiteListRoundRobinPolicy
 from cassandra.protocol import QueryMessage, ResultMessage
-from cassandra.query import SimpleStatement, ordered_dict_factory
+from cassandra.query import SimpleStatement, ordered_dict_factory, 
TraceUnavailable
 
 # cqlsh should run correctly when run out of a Cassandra source tree,
 # out of an unpacked Cassandra tarball, and after a proper package install.
@@ -675,6 +675,7 @@ class Shell(cmd.Cmd):
 
 self.session.default_timeout = client_timeout
 self.session.row_factory = ordered_dict_factory
+self.session.default_consistency_level = cassandra.ConsistencyLevel.ONE
 self.get_connection_versions()
 
 self.current_keyspace = keyspace
@@ -1121,8 +1122,8 @@ class Shell(cmd.Cmd):
 
 def do_use(self, parsed):
 ksname = parsed.get_binding('ksname')
-result, future = 
self.perform_simple_statement(SimpleStatement(parsed.extract_orig()))
-if result:
+success, _ = 
self.perform_simple_statement(SimpleStatement(parsed.extract_orig()))
+if success:
 if ksname[0] == '"' and ksname[-1] == '"':
 self.current_keyspace = self.cql_unprotect_name(ksname)
 else:
@@ -1139,7 +1140,7 @@ class Shell(cmd.Cmd):
 
 def perform_statement(self, statement):
 stmt = SimpleStatement(statement, 
consistency_level=self.consistency_level, 
serial_consistency_level=self.serial_consistency_level, 
fetch_size=self.page_size if self.use_paging else None)
-result, future = self.perform_simple_statement(stmt)
+success, future = self.perform_simple_statement(stmt)
 
 if future:
 if future.warnings:
@@ -1147,19 +1148,17 @@ class Shell(cmd.Cmd):
 
 if self.tracing_enabled:
 try:
-trace = future.get_query_trace(self.max_trace_wait)
-if trace:
+for trace in 
future.get_all_query_traces(self.max_trace_wait):
 print_trace(self, trace)
-elif stmt.trace_id:
-self.writeresult("This statement trace may be 
incomplete", color=RED)
-self.show_session(stmt.trace_id)
-else:
-msg = "Statement trace did not complete within %d 
seconds" % (self.session.max_trace_wait)
-self.writeresult(msg, color=RED)
+except TraceUnavailable:
+msg = "Statement trace did not complete within %d seconds; 
trace data may be incomplete." % (self.session.max_trace_wait,)
+self.writeresult(msg, color=RED)
+for trace_id in future.get_query_trace_ids():
+self.show_session(trace_id)
 except Exception, err:
 self.printerr("Unable to fetch query trace: %s" % 
(str(err),))
 
-return result
+return success
 
 def parse_for_table_meta(self, query_string):
 try:
@@ -1177,7 +1176,7 @@ class Shell(cmd.Cmd):
 while 

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

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: e3936ff1b16fddedd27713c1942d88c29897cf67
Parents: 8f98585 9404fed
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 14:24:01 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:24:01 2015 +

--

--

[jira] [Commented] (CASSANDRA-10513) Update cqlsh for new driver execution API

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko commented on CASSANDRA-10513:
---

Reverted the reverts, merged up, committed the additional commit, and merged 
dtest PR.

Reverting the revert on 3.0 was a bit tricky and involved some manual 
wrangling. [~pauloricardomg] Can you please have a look at 3.0 branch and 
double-check that I haven't messed up anything? Thanks.

> Update cqlsh for new driver execution API
> -
>
> Key: CASSANDRA-10513
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10513
> Project: Cassandra
>  Issue Type: New Feature
>  Components: Tools
>Reporter: Adam Holmberg
>Assignee: Adam Holmberg
>Priority: Minor
>  Labels: cqlsh
> Fix For: 2.2.4, 3.0.0
>
> Attachments: 10513-2.1.txt, 10513-2.2.txt, 10513.txt
>
>
> The 3.0 Python driver will have a few tweaks to the execution API. We'll need 
> to update cqlsh in a couple of minor ways.
> [Results are always returned as an iterable 
> ResultSet|https://datastax-oss.atlassian.net/browse/PYTHON-368]
> [Trace data is always attached to the 
> ResultSet|https://datastax-oss.atlassian.net/browse/PYTHON-318] (instead of 
> being attached to a statement)



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

[jira] [Commented] (CASSANDRA-9304) COPY TO improvements

[Philip Thompson (JIRA)]

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

Philip Thompson commented on CASSANDRA-9304:


I expect it's acceptable for COPY on Windows to only work from 2.2 onward, 
given 2.2 is when Windows support became official, and not just beta. 
[~JoshuaMcKenzie], thoughts?

> COPY TO improvements
> 
>
> Key: CASSANDRA-9304
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9304
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Jonathan Ellis
>Assignee: Stefania
>Priority: Minor
>  Labels: cqlsh
> Fix For: 3.x, 2.1.x, 2.2.x
>
>
> COPY FROM has gotten a lot of love.  COPY TO not so much.  One obvious 
> improvement could be to parallelize reading and writing (write one page of 
> data while fetching the next).



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

[jira] [Commented] (CASSANDRA-8263) Cqlshlib tests are mostly stubs

[Paulo Motta (JIRA)]

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

Paulo Motta commented on CASSANDRA-8263:


We also need to wait until there is a decision on CASSANDRA-10541, as the whole 
suite might needs to be reimplemented in order to provide windows compatibility,

> Cqlshlib tests are mostly stubs
> ---
>
> Key: CASSANDRA-8263
> URL: https://issues.apache.org/jira/browse/CASSANDRA-8263
> Project: Cassandra
>  Issue Type: Test
>Reporter: Philip Thompson
>Assignee: Jim Witschey
>  Labels: cqlsh
> Fix For: 2.1.x
>
>
> Most of the tests in cqlshlib/tests are just stubs that look like: {code}
> def test_parse_create_index(self):
> pass
> def test_parse_drop_index(self):
> pass
> {code}
> These tests need implemented.



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

[jira] [Commented] (CASSANDRA-10365) Store types by their CQL names in schema tables instead of fully-qualified internal class names

[Robert Stupp (JIRA)]

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

Robert Stupp commented on CASSANDRA-10365:
--

Rebased the UDA/initcond fork of Aleksey's branch. Cassia's currently working 
on 
[testall|http://cassci.datastax.com/view/Dev/view/snazy/job/snazy-10365-uda-3.0-testall/]
 and 
[dtests|http://cassci.datastax.com/view/Dev/view/snazy/job/snazy-10365-uda-3.0-dtest/].

> Store types by their CQL names in schema tables instead of fully-qualified 
> internal class names
> ---
>
> Key: CASSANDRA-10365
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10365
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Aleksey Yeschenko
>Assignee: Aleksey Yeschenko
>  Labels: client-impacting
> Fix For: 3.0.0
>
>
> Consider saving CQL types names for column, UDF/UDA arguments and return 
> types, and UDT components.



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

[jira] [Commented] (CASSANDRA-10365) Store types by their CQL names in schema tables instead of fully-qualified internal class names

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne commented on CASSANDRA-10365:
--

Remarks (and some nits) on the last commits:
* I'm actually not that convinced it's worth pulling a new dependency for 
dealing with nested UDT. Granted the previous method was brute-force, but it 
was simple and most likely good enough for all practical purposes. In fact, I 
wouldn't be that surprised to see the previous method be faster than the new 
one on most common cases where you have a vast majority of top-level UDT and a 
few 2-3 level deep ones. And none of this is in a very critical path anyway. 
Avoiding the new {{jgrapht}} dependecy would avoid the questioning of the next 
point.
* {{jgrapht}} uses the "Eclipse Public License". It's mentioned in 
http://www.apache.org/legal/resolved.html#category-b: I'm not sure I understand 
all the requirements but at the very least we should add a mention to the 
{{NOTICE}} file with a link to the library web page. The page also talks about 
"requiring an explicit action by the user" and I'm not sure about that. We 
might be fine here but I can't personally certify so with a high degree of 
confidence.
* Could make {{Types.none()}} return the same singleton object since we do call 
it in a bunch of places.
* It sadens me that the type of the {{Types.types}} field is not 
{{ImmutableMap}} (the reason seems to be to that the {{RawBuilder}} abuses 
{{Types}}).
* In {{SchemaKeyspace.fetchTypes}}, the use of {{Types}} have been expended to 
their fqn ({{org.apache.cassandra.schema.Types}}). Not a big deal but I don't 
think that's necessary.


> Store types by their CQL names in schema tables instead of fully-qualified 
> internal class names
> ---
>
> Key: CASSANDRA-10365
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10365
> Project: Cassandra
>  Issue Type: Improvement
>Reporter: Aleksey Yeschenko
>Assignee: Aleksey Yeschenko
>  Labels: client-impacting
> Fix For: 3.0.0
>
>
> Consider saving CQL types names for column, UDF/UDA arguments and return 
> types, and UDT components.



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

cassandra git commit: Revert "Revert "Update cqlsh driver for new driver execution API""

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 5a2d52984 -> 9404fed01


Revert "Revert "Update cqlsh driver for new driver execution API""

This reverts commit 0fbf715916b48a8e8abad5911e2697791b49f824.


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

Branch: refs/heads/cassandra-2.2
Commit: 9404fed01ae2f354f90e68d52c7d0b92196cc62a
Parents: 5a2d529
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 14:21:18 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:21:18 2015 +

--
 bin/cqlsh.py|  69 +--
 lib/cassandra-driver-internal-only-2.7.2.zip| Bin 229600 -> 0 bytes
 ...iver-internal-only-3.0.0a2.post0-95c6008.zip | Bin 0 -> 233564 bytes
 3 files changed, 31 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9404fed0/bin/cqlsh.py
--
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 09da020..17bddd3 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -111,13 +111,13 @@ except ImportError, e:
  'Error: %s\n' % (sys.executable, sys.path, e))
 
 from cassandra.auth import PlainTextAuthProvider
-from cassandra.cluster import Cluster, PagedResult
+from cassandra.cluster import Cluster
 from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata,
 TableMetadata, protect_name, protect_names,
 protect_value)
 from cassandra.policies import WhiteListRoundRobinPolicy
 from cassandra.protocol import QueryMessage, ResultMessage
-from cassandra.query import SimpleStatement, ordered_dict_factory
+from cassandra.query import SimpleStatement, ordered_dict_factory, 
TraceUnavailable
 
 # cqlsh should run correctly when run out of a Cassandra source tree,
 # out of an unpacked Cassandra tarball, and after a proper package install.
@@ -675,6 +675,7 @@ class Shell(cmd.Cmd):
 
 self.session.default_timeout = client_timeout
 self.session.row_factory = ordered_dict_factory
+self.session.default_consistency_level = cassandra.ConsistencyLevel.ONE
 self.get_connection_versions()
 
 self.current_keyspace = keyspace
@@ -1121,8 +1122,8 @@ class Shell(cmd.Cmd):
 
 def do_use(self, parsed):
 ksname = parsed.get_binding('ksname')
-result, future = 
self.perform_simple_statement(SimpleStatement(parsed.extract_orig()))
-if result:
+success, _ = 
self.perform_simple_statement(SimpleStatement(parsed.extract_orig()))
+if success:
 if ksname[0] == '"' and ksname[-1] == '"':
 self.current_keyspace = self.cql_unprotect_name(ksname)
 else:
@@ -1139,7 +1140,7 @@ class Shell(cmd.Cmd):
 
 def perform_statement(self, statement):
 stmt = SimpleStatement(statement, 
consistency_level=self.consistency_level, 
serial_consistency_level=self.serial_consistency_level, 
fetch_size=self.page_size if self.use_paging else None)
-result, future = self.perform_simple_statement(stmt)
+success, future = self.perform_simple_statement(stmt)
 
 if future:
 if future.warnings:
@@ -1147,19 +1148,17 @@ class Shell(cmd.Cmd):
 
 if self.tracing_enabled:
 try:
-trace = future.get_query_trace(self.max_trace_wait)
-if trace:
+for trace in 
future.get_all_query_traces(self.max_trace_wait):
 print_trace(self, trace)
-elif stmt.trace_id:
-self.writeresult("This statement trace may be 
incomplete", color=RED)
-self.show_session(stmt.trace_id)
-else:
-msg = "Statement trace did not complete within %d 
seconds" % (self.session.max_trace_wait)
-self.writeresult(msg, color=RED)
+except TraceUnavailable:
+msg = "Statement trace did not complete within %d seconds; 
trace data may be incomplete." % (self.session.max_trace_wait,)
+self.writeresult(msg, color=RED)
+for trace_id in future.get_query_trace_ids():
+self.show_session(trace_id)
 except Exception, err:
 self.printerr("Unable to fetch query trace: %s" % 
(str(err),))
 
-return result
+return success
 
 def parse_for_table_meta(self, query_string):
 try:
@@ -1177,7 +1176,7 @@ class Shell(cmd.Cmd):
  

cassandra git commit: Fix SortedSet cqlsh formatting (follow-up to CASSANDRA-10513)

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 9404fed01 -> a306a1bf3


Fix SortedSet cqlsh formatting (follow-up to CASSANDRA-10513)


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

Branch: refs/heads/cassandra-2.2
Commit: a306a1bf32d43af1db17ec1cf592fa8780464ccc
Parents: 9404fed
Author: Paulo Motta 
Authored: Fri Oct 30 08:21:33 2015 -0700
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:38:42 2015 +

--
 pylib/cqlshlib/formatting.py | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a306a1bf/pylib/cqlshlib/formatting.py
--
diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py
index e95df9f..fe1786a 100644
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@ -270,6 +270,7 @@ def format_value_set(val, encoding, colormap, 
date_time_format, float_precision,
 date_time_format, float_precision, nullval)
 formatter_for('frozenset')(format_value_set)
 formatter_for('sortedset')(format_value_set)
+formatter_for('SortedSet')(format_value_set)
 
 
 @formatter_for('dict')

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

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: b761b8659b330e7a5bec925420e1f71025b8ab46
Parents: 1d340be a306a1b
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 14:39:37 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:39:37 2015 +

--
 pylib/cqlshlib/formatting.py | 1 +
 1 file changed, 1 insertion(+)
--

[1/2] cassandra git commit: Fix SortedSet cqlsh formatting (follow-up to CASSANDRA-10513)

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 1d340befa -> b761b8659


Fix SortedSet cqlsh formatting (follow-up to CASSANDRA-10513)


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

Branch: refs/heads/cassandra-3.0
Commit: a306a1bf32d43af1db17ec1cf592fa8780464ccc
Parents: 9404fed
Author: Paulo Motta 
Authored: Fri Oct 30 08:21:33 2015 -0700
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:38:42 2015 +

--
 pylib/cqlshlib/formatting.py | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a306a1bf/pylib/cqlshlib/formatting.py
--
diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py
index e95df9f..fe1786a 100644
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@ -270,6 +270,7 @@ def format_value_set(val, encoding, colormap, 
date_time_format, float_precision,
 date_time_format, float_precision, nullval)
 formatter_for('frozenset')(format_value_set)
 formatter_for('sortedset')(format_value_set)
+formatter_for('SortedSet')(format_value_set)
 
 
 @formatter_for('dict')

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

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: b761b8659b330e7a5bec925420e1f71025b8ab46
Parents: 1d340be a306a1b
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 14:39:37 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:39:37 2015 +

--
 pylib/cqlshlib/formatting.py | 1 +
 1 file changed, 1 insertion(+)
--

[jira] [Updated] (CASSANDRA-10513) Update cqlsh for new driver execution API

[Paulo Motta (JIRA)]

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

Paulo Motta updated CASSANDRA-10513:

Attachment: 10513-3.0-fix.patch

Apparently a few things on cqlsh.py were missed. Attached patch file with diff 
of cqlsh.py on 3.0 HEAD and original patch.

> Update cqlsh for new driver execution API
> -
>
> Key: CASSANDRA-10513
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10513
> Project: Cassandra
>  Issue Type: New Feature
>  Components: Tools
>Reporter: Adam Holmberg
>Assignee: Adam Holmberg
>Priority: Minor
>  Labels: cqlsh
> Fix For: 2.2.4, 3.0.0
>
> Attachments: 10513-2.1.txt, 10513-2.2.txt, 10513-3.0-fix.patch, 
> 10513.txt
>
>
> The 3.0 Python driver will have a few tweaks to the execution API. We'll need 
> to update cqlsh in a couple of minor ways.
> [Results are always returned as an iterable 
> ResultSet|https://datastax-oss.atlassian.net/browse/PYTHON-368]
> [Trace data is always attached to the 
> ResultSet|https://datastax-oss.atlassian.net/browse/PYTHON-318] (instead of 
> being attached to a statement)



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

[jira] [Created] (CASSANDRA-10650) Fix INITCOND after 10365

[Robert Stupp (JIRA)]

Robert Stupp created CASSANDRA-10650:


 Summary: Fix INITCOND after 10365
 Key: CASSANDRA-10650
 URL: https://issues.apache.org/jira/browse/CASSANDRA-10650
 Project: Cassandra
  Issue Type: Bug
Reporter: Robert Stupp
Assignee: Robert Stupp
 Fix For: 3.0.0


CASSANDRA-10365 changed UDA's _initcond_ type to text. That required 
CASSANDRA-10617 to be able to transform the serialized data to a valid CQL3 
literal.

This ticket is about to fix the _initcond_ thing broken in CASSANDRA-10365 
after CASSANDRA-10617.



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

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

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: d2b7864fe9b9f5f740e7f76f0d31b8bbd31b45c9
Parents: c0c9555 b4b2684
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 12:59:27 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 12:59:27 2015 +

--
 CHANGES.txt| 2 ++
 conf/logback-tools.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2b7864f/CHANGES.txt
--
diff --cc CHANGES.txt
index e9f92c6,f25ac7e..dfb0f17
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,13 +1,30 @@@
 -2.2.4
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
 +3.0
 + * Fix bug when adding a column to thrift with the same name than a primary 
key (CASSANDRA-10608)
 + * Add client address argument to IAuthenticator::newSaslNegotiator 
(CASSANDRA-8068)
 + * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
 + * Don't use 'names query' read path for counters (CASSANDRA-10572)
 + * Fix backward compatibility for counters (CASSANDRA-10470)
 + * Remove memory_allocator paramter from cassandra.yaml (CASSANDRA-10581)
 + * Execute the metadata reload task of all registered indexes on CFS::reload 
(CASSANDRA-10604)
 + * Fix thrift cas operations with defined columns (CASSANDRA-10576)
 + * Fix PartitionUpdate.operationCount()for updates with static column 
operations (CASSANDRA-10606)
 + * Fix thrift get() queries with defined columns (CASSANDRA-10586)
 + * Fix marking of indexes as built and removed (CASSANDRA-10601)
 + * Skip initialization of non-registered 2i instances, remove 
Index::getIndexName (CASSANDRA-10595)
 + * Fix batches on multiple tables (CASSANDRA-10554)
 + * Ensure compaction options are validated when updating KeyspaceMetadata 
(CASSANDRA-10569)
 + * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)
 + * Remove token generator (CASSANDRA-5261)
 + * RolesCache should not be created for any authenticator that does not 
requireAuthentication (CASSANDRA-10562)
 + * Fix LogTransaction checking only a single directory for files 
(CASSANDRA-10421)
 + * Fix handling of range tombstones when reading old format sstables 
(CASSANDRA-10360)
 + * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
 +Merged from 2.2:
   * Expose phi values from failure detector via JMX and tweak debug
 and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * Fix logback-tools.xml incorrectly configured for outputing to System.err
+(CASSANDRA-9937)
   * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)
   * Add validation method to PerRowSecondaryIndex (CASSANDRA-10092)
   * Support encrypted and plain traffic on the same port (CASSANDRA-10559)

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

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: b4b268407f6bf1d1137099c1b34ca3fb91733bd1
Parents: a549bd0 dc73c0b
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 12:58:21 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 12:58:21 2015 +

--
 CHANGES.txt| 2 ++
 conf/logback-tools.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4b26840/CHANGES.txt
--
diff --cc CHANGES.txt
index 5c23acf,fd6c8a1..f25ac7e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,6 +1,13 @@@
 -2.1.12
 +2.2.4
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * Fix logback-tools.xml incorrectly configured for outputing to System.err
+(CASSANDRA-9937)
   * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)
   * Add validation method to PerRowSecondaryIndex (CASSANDRA-10092)
   * Support encrypted and plain traffic on the same port (CASSANDRA-10559)

[1/3] cassandra git commit: Fix logback-tools.xml incorrectly configured for outputing to System.err

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 c0c955537 -> d2b7864fe


Fix logback-tools.xml incorrectly configured for outputing to System.err

patch by Mike Adamson; reviewed by Jeremiah Jordan for CASSANDRA-9937


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

Branch: refs/heads/cassandra-3.0
Commit: dc73c0b31feb399750c5a6823854714ee711152e
Parents: 068614c
Author: Mike Adamson 
Authored: Wed Nov 4 12:21:54 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 12:26:12 2015 +

--
 CHANGES.txt| 2 ++
 conf/logback-tools.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc73c0b3/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 4c24b35..fd6c8a1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 2.1.12
+ * Fix logback-tools.xml incorrectly configured for outputing to System.err
+   (CASSANDRA-9937)
  * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)
  * Add validation method to PerRowSecondaryIndex (CASSANDRA-10092)
  * Support encrypted and plain traffic on the same port (CASSANDRA-10559)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc73c0b3/conf/logback-tools.xml
--
diff --git a/conf/logback-tools.xml b/conf/logback-tools.xml
index ade6c12..e47985e 100644
--- a/conf/logback-tools.xml
+++ b/conf/logback-tools.xml
@@ -18,7 +18,8 @@
 -->
 
 
-  
+  
+System.err
 
   %-5level %date{HH:mm:ss,SSS} %msg%n
 

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

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: d2b7864fe9b9f5f740e7f76f0d31b8bbd31b45c9
Parents: c0c9555 b4b2684
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 12:59:27 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 12:59:27 2015 +

--
 CHANGES.txt| 2 ++
 conf/logback-tools.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2b7864f/CHANGES.txt
--
diff --cc CHANGES.txt
index e9f92c6,f25ac7e..dfb0f17
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,13 +1,30 @@@
 -2.2.4
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
 +3.0
 + * Fix bug when adding a column to thrift with the same name than a primary 
key (CASSANDRA-10608)
 + * Add client address argument to IAuthenticator::newSaslNegotiator 
(CASSANDRA-8068)
 + * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
 + * Don't use 'names query' read path for counters (CASSANDRA-10572)
 + * Fix backward compatibility for counters (CASSANDRA-10470)
 + * Remove memory_allocator paramter from cassandra.yaml (CASSANDRA-10581)
 + * Execute the metadata reload task of all registered indexes on CFS::reload 
(CASSANDRA-10604)
 + * Fix thrift cas operations with defined columns (CASSANDRA-10576)
 + * Fix PartitionUpdate.operationCount()for updates with static column 
operations (CASSANDRA-10606)
 + * Fix thrift get() queries with defined columns (CASSANDRA-10586)
 + * Fix marking of indexes as built and removed (CASSANDRA-10601)
 + * Skip initialization of non-registered 2i instances, remove 
Index::getIndexName (CASSANDRA-10595)
 + * Fix batches on multiple tables (CASSANDRA-10554)
 + * Ensure compaction options are validated when updating KeyspaceMetadata 
(CASSANDRA-10569)
 + * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)
 + * Remove token generator (CASSANDRA-5261)
 + * RolesCache should not be created for any authenticator that does not 
requireAuthentication (CASSANDRA-10562)
 + * Fix LogTransaction checking only a single directory for files 
(CASSANDRA-10421)
 + * Fix handling of range tombstones when reading old format sstables 
(CASSANDRA-10360)
 + * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
 +Merged from 2.2:
   * Expose phi values from failure detector via JMX and tweak debug
 and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * Fix logback-tools.xml incorrectly configured for outputing to System.err
+(CASSANDRA-9937)
   * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)
   * Add validation method to PerRowSecondaryIndex (CASSANDRA-10092)
   * Support encrypted and plain traffic on the same port (CASSANDRA-10559)

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

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: b4b268407f6bf1d1137099c1b34ca3fb91733bd1
Parents: a549bd0 dc73c0b
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 12:58:21 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 12:58:21 2015 +

--
 CHANGES.txt| 2 ++
 conf/logback-tools.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4b26840/CHANGES.txt
--
diff --cc CHANGES.txt
index 5c23acf,fd6c8a1..f25ac7e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,6 +1,13 @@@
 -2.1.12
 +2.2.4
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * Fix logback-tools.xml incorrectly configured for outputing to System.err
+(CASSANDRA-9937)
   * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)
   * Add validation method to PerRowSecondaryIndex (CASSANDRA-10092)
   * Support encrypted and plain traffic on the same port (CASSANDRA-10559)

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

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: b4b268407f6bf1d1137099c1b34ca3fb91733bd1
Parents: a549bd0 dc73c0b
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 12:58:21 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 12:58:21 2015 +

--
 CHANGES.txt| 2 ++
 conf/logback-tools.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4b26840/CHANGES.txt
--
diff --cc CHANGES.txt
index 5c23acf,fd6c8a1..f25ac7e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,6 +1,13 @@@
 -2.1.12
 +2.2.4
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * Fix logback-tools.xml incorrectly configured for outputing to System.err
+(CASSANDRA-9937)
   * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)
   * Add validation method to PerRowSecondaryIndex (CASSANDRA-10092)
   * Support encrypted and plain traffic on the same port (CASSANDRA-10559)

[jira] [Commented] (CASSANDRA-9937) logback-tools.xml is incorrectly configured for outputing to System.err

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko commented on CASSANDRA-9937:
--

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

> logback-tools.xml is incorrectly configured for outputing to System.err
> ---
>
> Key: CASSANDRA-9937
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9937
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Mike Adamson
>Assignee: Mike Adamson
>Priority: Minor
> Fix For: 2.2.4, 2.1.12, 3.0.0
>
> Attachments: 9937.txt
>
>
> {{logback-tools.xml}} is configured incorrectly in that it doesn't send 
> output to {{System.err}} as it appears to want to do.
> {noformat}
>  class="ch.qos.logback.core.ConsoleAppender">
> {noformat}
> should be
> {noformat}
>   
> System.err
> {noformat}
> As a result output goes to {{System.out}}
> Attaching a patch



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

[1/2] cassandra git commit: Guard batchlog replay against integer division by zero

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/trunk b14423c8b -> 81e1b15db


Guard batchlog replay against integer division by zero

patch by Branimir Lambov; reviewed by Stefania Alborghetti for
CASSANDRA-9223


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

Branch: refs/heads/trunk
Commit: 1492be07cdf12afbba662645365cb991f223443d
Parents: d2b7864
Author: Branimir Lambov 
Authored: Wed Oct 28 17:11:35 2015 +0200
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 13:12:59 2015 +

--
 CHANGES.txt |  1 +
 .../cassandra/batchlog/BatchlogManager.java |  8 +++-
 .../cassandra/batchlog/BatchlogManagerTest.java | 40 
 3 files changed, 48 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1492be07/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index dfb0f17..61cc92e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0
+ * Guard batchlog replay against integer division by zero (CASSANDRA-9223)
  * Fix bug when adding a column to thrift with the same name than a primary 
key (CASSANDRA-10608)
  * Add client address argument to IAuthenticator::newSaslNegotiator 
(CASSANDRA-8068)
  * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1492be07/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
--
diff --git a/src/java/org/apache/cassandra/batchlog/BatchlogManager.java 
b/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
index 8bc4c26..1c98c2a 100644
--- a/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
@@ -178,7 +178,13 @@ public class BatchlogManager implements 
BatchlogManagerMBean
 
 // rate limit is in bytes per second. Uses Double.MAX_VALUE if 
disabled (set to 0 in cassandra.yaml).
 // max rate is scaled by the number of nodes in the cluster (same as 
for HHOM - see CASSANDRA-5272).
-int throttleInKB = DatabaseDescriptor.getBatchlogReplayThrottleInKB() 
/ StorageService.instance.getTokenMetadata().getAllEndpoints().size();
+int endpointsCount = 
StorageService.instance.getTokenMetadata().getAllEndpoints().size();
+if (endpointsCount <= 0)
+{
+logger.trace("Replay cancelled as there are no peers in the 
ring.");
+return;
+}
+int throttleInKB = DatabaseDescriptor.getBatchlogReplayThrottleInKB() 
/ endpointsCount;
 RateLimiter rateLimiter = RateLimiter.create(throttleInKB == 0 ? 
Double.MAX_VALUE : throttleInKB * 1024);
 
 UUID limitUuid = UUIDGen.maxTimeUUID(System.currentTimeMillis() - 
getBatchlogTimeout());

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1492be07/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java
--
diff --git a/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java 
b/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java
index dfb17c3..dd5444f 100644
--- a/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java
+++ b/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
 import com.google.common.collect.Lists;
+
 import org.junit.*;
 
 import org.apache.cassandra.SchemaLoader;
@@ -457,4 +458,43 @@ public class BatchlogManagerTest
 assertNotNull(result);
 assertEquals(0L, result.one().getLong("count"));
 }
+
+// CASSANRDA-9223
+@Test
+public void testReplayWithNoPeers() throws Exception
+{
+
StorageService.instance.getTokenMetadata().removeEndpoint(InetAddress.getByName("127.0.0.1"));
+
+long initialAllBatches = BatchlogManager.instance.countAllBatches();
+long initialReplayedBatches = 
BatchlogManager.instance.getTotalBatchesReplayed();
+
+CFMetaData cfm = 
Keyspace.open(KEYSPACE1).getColumnFamilyStore(CF_STANDARD1).metadata;
+
+long timestamp = (System.currentTimeMillis() - 
DatabaseDescriptor.getWriteRpcTimeout() * 2) * 1000;
+UUID uuid = UUIDGen.getTimeUUID();
+
+// Add a batch with 10 mutations
+List mutations = new ArrayList<>(10);
+for (int j = 0; j < 10; j++)
+{
+mutations.add(new 

cassandra git commit: Guard batchlog replay against integer division by zero

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 d2b7864fe -> 1492be07c


Guard batchlog replay against integer division by zero

patch by Branimir Lambov; reviewed by Stefania Alborghetti for
CASSANDRA-9223


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

Branch: refs/heads/cassandra-3.0
Commit: 1492be07cdf12afbba662645365cb991f223443d
Parents: d2b7864
Author: Branimir Lambov 
Authored: Wed Oct 28 17:11:35 2015 +0200
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 13:12:59 2015 +

--
 CHANGES.txt |  1 +
 .../cassandra/batchlog/BatchlogManager.java |  8 +++-
 .../cassandra/batchlog/BatchlogManagerTest.java | 40 
 3 files changed, 48 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1492be07/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index dfb0f17..61cc92e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0
+ * Guard batchlog replay against integer division by zero (CASSANDRA-9223)
  * Fix bug when adding a column to thrift with the same name than a primary 
key (CASSANDRA-10608)
  * Add client address argument to IAuthenticator::newSaslNegotiator 
(CASSANDRA-8068)
  * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1492be07/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
--
diff --git a/src/java/org/apache/cassandra/batchlog/BatchlogManager.java 
b/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
index 8bc4c26..1c98c2a 100644
--- a/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
@@ -178,7 +178,13 @@ public class BatchlogManager implements 
BatchlogManagerMBean
 
 // rate limit is in bytes per second. Uses Double.MAX_VALUE if 
disabled (set to 0 in cassandra.yaml).
 // max rate is scaled by the number of nodes in the cluster (same as 
for HHOM - see CASSANDRA-5272).
-int throttleInKB = DatabaseDescriptor.getBatchlogReplayThrottleInKB() 
/ StorageService.instance.getTokenMetadata().getAllEndpoints().size();
+int endpointsCount = 
StorageService.instance.getTokenMetadata().getAllEndpoints().size();
+if (endpointsCount <= 0)
+{
+logger.trace("Replay cancelled as there are no peers in the 
ring.");
+return;
+}
+int throttleInKB = DatabaseDescriptor.getBatchlogReplayThrottleInKB() 
/ endpointsCount;
 RateLimiter rateLimiter = RateLimiter.create(throttleInKB == 0 ? 
Double.MAX_VALUE : throttleInKB * 1024);
 
 UUID limitUuid = UUIDGen.maxTimeUUID(System.currentTimeMillis() - 
getBatchlogTimeout());

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1492be07/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java
--
diff --git a/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java 
b/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java
index dfb17c3..dd5444f 100644
--- a/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java
+++ b/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
 import com.google.common.collect.Lists;
+
 import org.junit.*;
 
 import org.apache.cassandra.SchemaLoader;
@@ -457,4 +458,43 @@ public class BatchlogManagerTest
 assertNotNull(result);
 assertEquals(0L, result.one().getLong("count"));
 }
+
+// CASSANRDA-9223
+@Test
+public void testReplayWithNoPeers() throws Exception
+{
+
StorageService.instance.getTokenMetadata().removeEndpoint(InetAddress.getByName("127.0.0.1"));
+
+long initialAllBatches = BatchlogManager.instance.countAllBatches();
+long initialReplayedBatches = 
BatchlogManager.instance.getTotalBatchesReplayed();
+
+CFMetaData cfm = 
Keyspace.open(KEYSPACE1).getColumnFamilyStore(CF_STANDARD1).metadata;
+
+long timestamp = (System.currentTimeMillis() - 
DatabaseDescriptor.getWriteRpcTimeout() * 2) * 1000;
+UUID uuid = UUIDGen.getTimeUUID();
+
+// Add a batch with 10 mutations
+List mutations = new ArrayList<>(10);
+for (int j = 0; j < 10; j++)
+{
+

[jira] [Commented] (CASSANDRA-10614) AssertionError while flushing memtables

[Alan Boudreault (JIRA)]

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

Alan Boudreault commented on CASSANDRA-10614:
-

on it!

> AssertionError while flushing memtables
> ---
>
> Key: CASSANDRA-10614
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10614
> Project: Cassandra
>  Issue Type: Bug
>  Components: Local Write-Read Paths
>Reporter: Tyler Hobbs
>Assignee: Tyler Hobbs
>Priority: Critical
> Fix For: 3.0.0
>
> Attachments: debug.log, system.log
>
>
> While running mvbench against a single local node, I noticed this stacktrace 
> showing up multiple times in the logs:
> {noformat}
> ERROR 16:40:01 Exception in thread Thread[MemtableFlushWriter:1,5,main]
> java.lang.AssertionError: null
>   at org.apache.cassandra.db.rows.Rows.collectStats(Rows.java:70) 
> ~[main/:na]
>   at 
> org.apache.cassandra.io.sstable.format.big.BigTableWriter$StatsCollector.applyToRow(BigTableWriter.java:197)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.transform.BaseRows.hasNext(BaseRows.java:116) 
> ~[main/:na]
>   at 
> org.apache.cassandra.db.transform.UnfilteredRows.isEmpty(UnfilteredRows.java:38)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.ColumnIndex.writeAndBuildIndex(ColumnIndex.java:49) 
> ~[main/:na]
>   at 
> org.apache.cassandra.io.sstable.format.big.BigTableWriter.append(BigTableWriter.java:149)
>  ~[main/:na]
>   at 
> org.apache.cassandra.io.sstable.SimpleSSTableMultiWriter.append(SimpleSSTableMultiWriter.java:45)
>  ~[main/:na]
>   at 
> org.apache.cassandra.io.sstable.SSTableTxnWriter.append(SSTableTxnWriter.java:52)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.Memtable$FlushRunnable.writeSortedContents(Memtable.java:389)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.Memtable$FlushRunnable.runMayThrow(Memtable.java:352) 
> ~[main/:na]
>   at 
> org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) 
> ~[main/:na]
>   at 
> com.google.common.util.concurrent.MoreExecutors$DirectExecutorService.execute(MoreExecutors.java:299)
>  ~[guava-18.0.jar:na]
>   at 
> org.apache.cassandra.db.ColumnFamilyStore$Flush.run(ColumnFamilyStore.java:1037)
>  ~[main/:na]
>   at 
> java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
>  ~[na:1.8.0_45]
>   at 
> java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
>  ~[na:1.8.0_45]
>   at java.lang.Thread.run(Thread.java:745) ~[na:1.8.0_45]
> {noformat}
> To reproduce, run mvbench with the regular schema and the following arguments:
> {noformat}
> mvn exec:java -Dexec.args="--num-users 10 --num-songs 100 
> --num-artists 1 -n 50 --endpoint 127.0.0.1"
> {noformat}



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

[jira] [Commented] (CASSANDRA-9543) Integrate release 2.2 java driver

[Sylvain Lebresne (JIRA)]

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

Sylvain Lebresne commented on CASSANDRA-9543:
-

Can someone remind me what bug upgrading the java driver fixes? Our policies so 
far as been to not upgrade dependencies in stable releases unless there is a 
very good reason to, so unless doing so fix a serious bug, I'm kind of -1 on 
that ticket in general.

> Integrate release 2.2 java driver
> -
>
> Key: CASSANDRA-9543
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9543
> Project: Cassandra
>  Issue Type: Task
>Reporter: Robert Stupp
>Assignee: Jeremiah Jordan
> Fix For: 2.2.x
>
>
> Follow-up of CASSANDRA-9493.
> Hint: cleanup {{build.xml}} for commented out {{çassandra-driver-core}} maven 
> dependencies.



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

[jira] [Updated] (CASSANDRA-9937) logback-tools.xml is incorrectly configured for outputing to System.err

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko updated CASSANDRA-9937:
-
Priority: Minor  (was: Major)

> logback-tools.xml is incorrectly configured for outputing to System.err
> ---
>
> Key: CASSANDRA-9937
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9937
> Project: Cassandra
>  Issue Type: Bug
>  Components: Tools
>Reporter: Mike Adamson
>Assignee: Mike Adamson
>Priority: Minor
> Fix For: 2.1.x
>
> Attachments: 9937.txt
>
>
> {{logback-tools.xml}} is configured incorrectly in that it doesn't send 
> output to {{System.err}} as it appears to want to do.
> {noformat}
>  class="ch.qos.logback.core.ConsoleAppender">
> {noformat}
> should be
> {noformat}
>   
> System.err
> {noformat}
> As a result output goes to {{System.out}}
> Attaching a patch



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

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

[aleksey]

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: fca83d812533c1a2d268431bc815547b8ee5b3ba
Parents: b40527f d2b7864
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 13:00:02 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 13:00:02 2015 +

--
 CHANGES.txt| 2 ++
 conf/logback-tools.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


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

[1/4] cassandra git commit: Fix logback-tools.xml incorrectly configured for outputing to System.err

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/trunk b40527fcc -> fca83d812


Fix logback-tools.xml incorrectly configured for outputing to System.err

patch by Mike Adamson; reviewed by Jeremiah Jordan for CASSANDRA-9937


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

Branch: refs/heads/trunk
Commit: dc73c0b31feb399750c5a6823854714ee711152e
Parents: 068614c
Author: Mike Adamson 
Authored: Wed Nov 4 12:21:54 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 12:26:12 2015 +

--
 CHANGES.txt| 2 ++
 conf/logback-tools.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc73c0b3/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 4c24b35..fd6c8a1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 2.1.12
+ * Fix logback-tools.xml incorrectly configured for outputing to System.err
+   (CASSANDRA-9937)
  * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)
  * Add validation method to PerRowSecondaryIndex (CASSANDRA-10092)
  * Support encrypted and plain traffic on the same port (CASSANDRA-10559)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc73c0b3/conf/logback-tools.xml
--
diff --git a/conf/logback-tools.xml b/conf/logback-tools.xml
index ade6c12..e47985e 100644
--- a/conf/logback-tools.xml
+++ b/conf/logback-tools.xml
@@ -18,7 +18,8 @@
 -->
 
 
-  
+  
+System.err
 
   %-5level %date{HH:mm:ss,SSS} %msg%n
 

[1/2] cassandra git commit: Improve handling of dead nodes in gossip

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 b4b268407 -> 5a2d52984


Improve handling of dead nodes in gossip

patch by Dikang Gu; reviewed by Stefania Alborghetti for CASSANDRA-10298


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

Branch: refs/heads/cassandra-2.2
Commit: b6015fa4883182531d66527780fce34c9b125e46
Parents: dc73c0b
Author: Dikang Gu 
Authored: Wed Nov 4 13:50:33 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 13:56:42 2015 +

--
 CHANGES.txt  |  1 +
 .../apache/cassandra/db/HintedHandOffManager.java|  4 
 .../org/apache/cassandra/service/StorageService.java | 15 ---
 3 files changed, 17 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6015fa4/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index fd6c8a1..5ceabb4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.12
+ * Improve handling of dead nodes in gossip (CASSANDRA-10298)
  * Fix logback-tools.xml incorrectly configured for outputing to System.err
(CASSANDRA-9937)
  * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6015fa4/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java 
b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 6f9d0b1..4fbdd27 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -213,7 +213,11 @@ public class HintedHandOffManager implements 
HintedHandOffManagerMBean
 {
 if (!StorageService.instance.getTokenMetadata().isMember(endpoint))
 return;
+
 UUID hostId = 
StorageService.instance.getTokenMetadata().getHostId(endpoint);
+if (hostId == null)
+return;
+
 ByteBuffer hostIdBytes = ByteBuffer.wrap(UUIDGen.decompose(hostId));
 final Mutation mutation = new Mutation(Keyspace.SYSTEM_KS, 
hostIdBytes);
 mutation.delete(SystemKeyspace.HINTS_CF, System.currentTimeMillis());

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6015fa4/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 7e5b67b..d02a572 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1858,8 +1858,16 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 private void handleStateLeft(InetAddress endpoint, String[] pieces)
 {
 assert pieces.length >= 2;
-Collection tokens;
-tokens = getTokensFor(endpoint);
+Collection tokens = null;
+try
+{
+tokens = getTokensFor(endpoint);
+}
+catch (Throwable th)
+{
+JVMStabilityInspector.inspectThrowable(th);
+logger.warn("Unable to calculate tokens for {}.", endpoint);
+}
 
 if (logger.isDebugEnabled())
 logger.debug("Node {} state left, tokens {}", endpoint, tokens);
@@ -1948,7 +1956,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 HintedHandOffManager.instance.deleteHintsForEndpoint(endpoint);
 removeEndpoint(endpoint);
 tokenMetadata.removeEndpoint(endpoint);
-tokenMetadata.removeBootstrapTokens(tokens);
+if (tokens != null)
+tokenMetadata.removeBootstrapTokens(tokens);
 
 if (!isClientMode)
 {

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

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: 5a2d5298423dc4501fad0d53183e7ac93d83e76c
Parents: b4b2684 b6015fa
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 13:59:17 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 13:59:17 2015 +

--
 CHANGES.txt  |  1 +
 .../apache/cassandra/db/HintedHandOffManager.java|  4 
 .../org/apache/cassandra/service/StorageService.java | 15 ---
 3 files changed, 17 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a2d5298/CHANGES.txt
--
diff --cc CHANGES.txt
index f25ac7e,5ceabb4..60bf565
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 -2.1.12
 +2.2.4
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * Improve handling of dead nodes in gossip (CASSANDRA-10298)
   * Fix logback-tools.xml incorrectly configured for outputing to System.err
 (CASSANDRA-9937)
   * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a2d5298/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--
diff --cc src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 179c611,4fbdd27..4ec5d62
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@@ -213,10 -213,14 +213,14 @@@ public class HintedHandOffManager imple
  {
  if (!StorageService.instance.getTokenMetadata().isMember(endpoint))
  return;
+ 
  UUID hostId = 
StorageService.instance.getTokenMetadata().getHostId(endpoint);
+ if (hostId == null)
+ return;
+ 
  ByteBuffer hostIdBytes = ByteBuffer.wrap(UUIDGen.decompose(hostId));
 -final Mutation mutation = new Mutation(Keyspace.SYSTEM_KS, 
hostIdBytes);
 -mutation.delete(SystemKeyspace.HINTS_CF, System.currentTimeMillis());
 +final Mutation mutation = new Mutation(SystemKeyspace.NAME, 
hostIdBytes);
 +mutation.delete(SystemKeyspace.HINTS, System.currentTimeMillis());
  
  // execute asynchronously to avoid blocking caller (which may be 
processing gossip)
  Runnable runnable = new Runnable()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a2d5298/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index f162f7c,d02a572..45ed493
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -2139,9 -1956,14 +2147,10 @@@ public class StorageService extends Not
  HintedHandOffManager.instance.deleteHintsForEndpoint(endpoint);
  removeEndpoint(endpoint);
  tokenMetadata.removeEndpoint(endpoint);
- tokenMetadata.removeBootstrapTokens(tokens);
+ if (tokens != null)
+ tokenMetadata.removeBootstrapTokens(tokens);
  
 -if (!isClientMode)
 -{
 -for (IEndpointLifecycleSubscriber subscriber : 
lifecycleSubscribers)
 -subscriber.onLeaveCluster(endpoint);
 -}
 +notifyLeft(endpoint);
  PendingRangeCalculatorService.instance.update();
  }
  

[jira] [Commented] (CASSANDRA-10592) IllegalArgumentException in DataOutputBuffer.reallocate

[Benedict (JIRA)]

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

Benedict commented on CASSANDRA-10592:
--

Patch LGTM.

> IllegalArgumentException in DataOutputBuffer.reallocate
> ---
>
> Key: CASSANDRA-10592
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10592
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Sebastian Estevez
>Assignee: Ariel Weisberg
> Fix For: 2.2.4, 3.0.0
>
>
> CORRECTION-
> It turns out the exception occurs when running a read using a thrift jdbc 
> driver. Once you have loaded the data with stress below, run 
> SELECT * FROM "autogeneratedtest"."transaction_by_retailer" using this tool - 
> http://www.aquafold.com/aquadatastudio_downloads.html
>  
> The exception:
> {code}
> WARN  [SharedPool-Worker-1] 2015-10-22 12:58:20,792 
> AbstractTracingAwareExecutorService.java:169 - Uncaught exception on thread 
> Thread[SharedPool-Worker-1,5,main]: {}
> java.lang.RuntimeException: java.lang.IllegalArgumentException
>   at 
> org.apache.cassandra.service.StorageProxy$DroppableRunnable.run(StorageProxy.java:2366)
>  ~[main/:na]
>   at 
> java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) 
> ~[na:1.8.0_60]
>   at 
> org.apache.cassandra.concurrent.AbstractTracingAwareExecutorService$FutureTask.run(AbstractTracingAwareExecutorService.java:164)
>  ~[main/:na]
>   at org.apache.cassandra.concurrent.SEPWorker.run(SEPWorker.java:105) 
> [main/:na]
>   at java.lang.Thread.run(Thread.java:745) [na:1.8.0_60]
> Caused by: java.lang.IllegalArgumentException: null
>   at java.nio.ByteBuffer.allocate(ByteBuffer.java:334) ~[na:1.8.0_60]
>   at 
> org.apache.cassandra.io.util.DataOutputBuffer.reallocate(DataOutputBuffer.java:63)
>  ~[main/:na]
>   at 
> org.apache.cassandra.io.util.DataOutputBuffer.doFlush(DataOutputBuffer.java:57)
>  ~[main/:na]
>   at 
> org.apache.cassandra.io.util.BufferedDataOutputStreamPlus.write(BufferedDataOutputStreamPlus.java:132)
>  ~[main/:na]
>   at 
> org.apache.cassandra.io.util.BufferedDataOutputStreamPlus.write(BufferedDataOutputStreamPlus.java:151)
>  ~[main/:na]
>   at 
> org.apache.cassandra.utils.ByteBufferUtil.writeWithVIntLength(ByteBufferUtil.java:296)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.marshal.AbstractType.writeValue(AbstractType.java:374)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.BufferCell$Serializer.serialize(BufferCell.java:263)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredSerializer.serialize(UnfilteredSerializer.java:183)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredSerializer.serialize(UnfilteredSerializer.java:108)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredSerializer.serialize(UnfilteredSerializer.java:96)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer.serialize(UnfilteredRowIteratorSerializer.java:132)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer.serialize(UnfilteredRowIteratorSerializer.java:87)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer.serialize(UnfilteredRowIteratorSerializer.java:77)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.partitions.UnfilteredPartitionIterators$Serializer.serialize(UnfilteredPartitionIterators.java:381)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.ReadResponse$LocalDataResponse.build(ReadResponse.java:136)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.ReadResponse$LocalDataResponse.(ReadResponse.java:128)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.ReadResponse$LocalDataResponse.(ReadResponse.java:123)
>  ~[main/:na]
>   at 
> org.apache.cassandra.db.ReadResponse.createDataResponse(ReadResponse.java:65) 
> ~[main/:na]
>   at 
> org.apache.cassandra.db.ReadCommand.createResponse(ReadCommand.java:289) 
> ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageProxy$LocalReadRunnable.runMayThrow(StorageProxy.java:1697)
>  ~[main/:na]
>   at 
> org.apache.cassandra.service.StorageProxy$DroppableRunnable.run(StorageProxy.java:2362)
>  ~[main/:na]
>   ... 4 common frames omitted
> {code}
> I was running this command:
> {code}
> tools/bin/cassandra-stress user 
> profile=~/Desktop/startup/stress/stress.yaml n=10 ops\(insert=1\) -rate 
> threads=30
> {code}
> Here's the stress.yaml UPDATED!
> {code}
> ### DML ### THIS IS UNDER CONSTRUCTION!!!
> # Keyspace Name
> keyspace: autogeneratedtest
> # The CQL for creating a keyspace (optional if it already exists)
> keyspace_definition: |
>   CREATE KEYSPACE autogeneratedtest WITH replication = {'class': 
> 'SimpleStrategy', 'replication_factor': 1};
> # 

[jira] [Commented] (CASSANDRA-9543) Integrate release 2.2 java driver

[Jeremiah Jordan (JIRA)]

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

Jeremiah Jordan commented on CASSANDRA-9543:


The biggest thing to me is that you can't use stress with the latest Java 
driver meant to run against this C* version without going and getting the 
stress from 3.0.  Which means you aren't able to test things under the same 
conditions you application will be under.

> Integrate release 2.2 java driver
> -
>
> Key: CASSANDRA-9543
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9543
> Project: Cassandra
>  Issue Type: Task
>Reporter: Robert Stupp
>Assignee: Jeremiah Jordan
> Fix For: 2.2.x
>
>
> Follow-up of CASSANDRA-9493.
> Hint: cleanup {{build.xml}} for commented out {{çassandra-driver-core}} maven 
> dependencies.



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

[1/2] cassandra git commit: Fix logback-tools.xml incorrectly configured for outputing to System.err

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 a549bd085 -> b4b268407


Fix logback-tools.xml incorrectly configured for outputing to System.err

patch by Mike Adamson; reviewed by Jeremiah Jordan for CASSANDRA-9937


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

Branch: refs/heads/cassandra-2.2
Commit: dc73c0b31feb399750c5a6823854714ee711152e
Parents: 068614c
Author: Mike Adamson 
Authored: Wed Nov 4 12:21:54 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 12:26:12 2015 +

--
 CHANGES.txt| 2 ++
 conf/logback-tools.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc73c0b3/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 4c24b35..fd6c8a1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 2.1.12
+ * Fix logback-tools.xml incorrectly configured for outputing to System.err
+   (CASSANDRA-9937)
  * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)
  * Add validation method to PerRowSecondaryIndex (CASSANDRA-10092)
  * Support encrypted and plain traffic on the same port (CASSANDRA-10559)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc73c0b3/conf/logback-tools.xml
--
diff --git a/conf/logback-tools.xml b/conf/logback-tools.xml
index ade6c12..e47985e 100644
--- a/conf/logback-tools.xml
+++ b/conf/logback-tools.xml
@@ -18,7 +18,8 @@
 -->
 
 
-  
+  
+System.err
 
   %-5level %date{HH:mm:ss,SSS} %msg%n
 

[jira] [Commented] (CASSANDRA-9223) ArithmeticException after decommission

[Aleksey Yeschenko (JIRA)]

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

Aleksey Yeschenko commented on CASSANDRA-9223:
--

Committed as 
[1492be07cdf12afbba662645365cb991f223443d|https://github.com/apache/cassandra/commit/1492be07cdf12afbba662645365cb991f223443d]
 to 3.0 and merged with trunk, thanks.

> ArithmeticException after decommission
> --
>
> Key: CASSANDRA-9223
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9223
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Brandon Williams
>Assignee: Branimir Lambov
>Priority: Minor
> Fix For: 3.0.0
>
>
> Also seen on trunk while working on CASSANDRA-8072:
> {noformat}
> ERROR 19:21:33 Exception in thread Thread[BatchlogTasks:1,5,main]
> java.lang.ArithmeticException: / by zero
>  at 
> org.apache.cassandra.db.BatchlogManager.replayAllFailedBatches(BatchlogManager.java:173)
>  ~[main/:na]
>  at 
> org.apache.cassandra.db.BatchlogManager.access$000(BatchlogManager.java:61) 
> ~[main/:na]
>  at 
> org.apache.cassandra.db.BatchlogManager$1.runMayThrow(BatchlogManager.java:91)
>  ~[main/:na]
>  at org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) 
> ~[main/:na]
>  at 
> org.apache.cassandra.concurrent.DebuggableScheduledThreadPoolExecutor$UncomplainingRunnable.run(DebuggableScheduledThreadPoolExecutor.java:82)
>  ~[main/:na]
>  at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) 
> [na:1.7.0_76]
>  at java.util.concurrent.FutureTask.runAndReset(FutureTask.java:304) 
> [na:1.7.0_76]
>  at 
> java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$301(ScheduledThreadPoolExecutor.java:178)
>  [na:1.7.0_76]
>  at 
> java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:293)
>  [na:1.7.0_76]
>  at 
> java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
>  [na:1.7.0_76]
>  at 
> java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
>  [na:1.7.0_76]
>  at java.lang.Thread.run(Thread.java:745) [na:1.7.0_76]
> {noformat}



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

[1/3] cassandra git commit: Improve handling of dead nodes in gossip

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 1492be07c -> 8f985852f


Improve handling of dead nodes in gossip

patch by Dikang Gu; reviewed by Stefania Alborghetti for CASSANDRA-10298


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

Branch: refs/heads/cassandra-3.0
Commit: b6015fa4883182531d66527780fce34c9b125e46
Parents: dc73c0b
Author: Dikang Gu 
Authored: Wed Nov 4 13:50:33 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 13:56:42 2015 +

--
 CHANGES.txt  |  1 +
 .../apache/cassandra/db/HintedHandOffManager.java|  4 
 .../org/apache/cassandra/service/StorageService.java | 15 ---
 3 files changed, 17 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6015fa4/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index fd6c8a1..5ceabb4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.12
+ * Improve handling of dead nodes in gossip (CASSANDRA-10298)
  * Fix logback-tools.xml incorrectly configured for outputing to System.err
(CASSANDRA-9937)
  * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6015fa4/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java 
b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 6f9d0b1..4fbdd27 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -213,7 +213,11 @@ public class HintedHandOffManager implements 
HintedHandOffManagerMBean
 {
 if (!StorageService.instance.getTokenMetadata().isMember(endpoint))
 return;
+
 UUID hostId = 
StorageService.instance.getTokenMetadata().getHostId(endpoint);
+if (hostId == null)
+return;
+
 ByteBuffer hostIdBytes = ByteBuffer.wrap(UUIDGen.decompose(hostId));
 final Mutation mutation = new Mutation(Keyspace.SYSTEM_KS, 
hostIdBytes);
 mutation.delete(SystemKeyspace.HINTS_CF, System.currentTimeMillis());

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6015fa4/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 7e5b67b..d02a572 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1858,8 +1858,16 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 private void handleStateLeft(InetAddress endpoint, String[] pieces)
 {
 assert pieces.length >= 2;
-Collection tokens;
-tokens = getTokensFor(endpoint);
+Collection tokens = null;
+try
+{
+tokens = getTokensFor(endpoint);
+}
+catch (Throwable th)
+{
+JVMStabilityInspector.inspectThrowable(th);
+logger.warn("Unable to calculate tokens for {}.", endpoint);
+}
 
 if (logger.isDebugEnabled())
 logger.debug("Node {} state left, tokens {}", endpoint, tokens);
@@ -1948,7 +1956,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 HintedHandOffManager.instance.deleteHintsForEndpoint(endpoint);
 removeEndpoint(endpoint);
 tokenMetadata.removeEndpoint(endpoint);
-tokenMetadata.removeBootstrapTokens(tokens);
+if (tokens != null)
+tokenMetadata.removeBootstrapTokens(tokens);
 
 if (!isClientMode)
 {

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

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 5a2d5298423dc4501fad0d53183e7ac93d83e76c
Parents: b4b2684 b6015fa
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 13:59:17 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 13:59:17 2015 +

--
 CHANGES.txt  |  1 +
 .../apache/cassandra/db/HintedHandOffManager.java|  4 
 .../org/apache/cassandra/service/StorageService.java | 15 ---
 3 files changed, 17 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a2d5298/CHANGES.txt
--
diff --cc CHANGES.txt
index f25ac7e,5ceabb4..60bf565
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 -2.1.12
 +2.2.4
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * Improve handling of dead nodes in gossip (CASSANDRA-10298)
   * Fix logback-tools.xml incorrectly configured for outputing to System.err
 (CASSANDRA-9937)
   * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a2d5298/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--
diff --cc src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 179c611,4fbdd27..4ec5d62
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@@ -213,10 -213,14 +213,14 @@@ public class HintedHandOffManager imple
  {
  if (!StorageService.instance.getTokenMetadata().isMember(endpoint))
  return;
+ 
  UUID hostId = 
StorageService.instance.getTokenMetadata().getHostId(endpoint);
+ if (hostId == null)
+ return;
+ 
  ByteBuffer hostIdBytes = ByteBuffer.wrap(UUIDGen.decompose(hostId));
 -final Mutation mutation = new Mutation(Keyspace.SYSTEM_KS, 
hostIdBytes);
 -mutation.delete(SystemKeyspace.HINTS_CF, System.currentTimeMillis());
 +final Mutation mutation = new Mutation(SystemKeyspace.NAME, 
hostIdBytes);
 +mutation.delete(SystemKeyspace.HINTS, System.currentTimeMillis());
  
  // execute asynchronously to avoid blocking caller (which may be 
processing gossip)
  Runnable runnable = new Runnable()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a2d5298/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index f162f7c,d02a572..45ed493
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -2139,9 -1956,14 +2147,10 @@@ public class StorageService extends Not
  HintedHandOffManager.instance.deleteHintsForEndpoint(endpoint);
  removeEndpoint(endpoint);
  tokenMetadata.removeEndpoint(endpoint);
- tokenMetadata.removeBootstrapTokens(tokens);
+ if (tokens != null)
+ tokenMetadata.removeBootstrapTokens(tokens);
  
 -if (!isClientMode)
 -{
 -for (IEndpointLifecycleSubscriber subscriber : 
lifecycleSubscribers)
 -subscriber.onLeaveCluster(endpoint);
 -}
 +notifyLeft(endpoint);
  PendingRangeCalculatorService.instance.update();
  }
  

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

[aleksey]

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 8f985852f11c9501137c150b0f25cfd0c17d3db8
Parents: 1492be0 5a2d529
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 14:05:00 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:05:00 2015 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f985852/CHANGES.txt
--
diff --cc CHANGES.txt
index 61cc92e,60bf565..eb575e8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,12 +1,30 @@@
 -2.2.4
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
 +3.0
 + * Guard batchlog replay against integer division by zero (CASSANDRA-9223)
 + * Fix bug when adding a column to thrift with the same name than a primary 
key (CASSANDRA-10608)
 + * Add client address argument to IAuthenticator::newSaslNegotiator 
(CASSANDRA-8068)
 + * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
 + * Don't use 'names query' read path for counters (CASSANDRA-10572)
 + * Fix backward compatibility for counters (CASSANDRA-10470)
 + * Remove memory_allocator paramter from cassandra.yaml (CASSANDRA-10581)
 + * Execute the metadata reload task of all registered indexes on CFS::reload 
(CASSANDRA-10604)
 + * Fix thrift cas operations with defined columns (CASSANDRA-10576)
 + * Fix PartitionUpdate.operationCount()for updates with static column 
operations (CASSANDRA-10606)
 + * Fix thrift get() queries with defined columns (CASSANDRA-10586)
 + * Fix marking of indexes as built and removed (CASSANDRA-10601)
 + * Skip initialization of non-registered 2i instances, remove 
Index::getIndexName (CASSANDRA-10595)
 + * Fix batches on multiple tables (CASSANDRA-10554)
 + * Ensure compaction options are validated when updating KeyspaceMetadata 
(CASSANDRA-10569)
 + * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)
 + * Remove token generator (CASSANDRA-5261)
 + * RolesCache should not be created for any authenticator that does not 
requireAuthentication (CASSANDRA-10562)
 + * Fix LogTransaction checking only a single directory for files 
(CASSANDRA-10421)
 + * Fix handling of range tombstones when reading old format sstables 
(CASSANDRA-10360)
 + * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
 +Merged from 2.2:
   * Expose phi values from failure detector via JMX and tweak debug
 and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * Improve handling of dead nodes in gossip (CASSANDRA-10298)
   * Fix logback-tools.xml incorrectly configured for outputing to System.err
 (CASSANDRA-9937)
   * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f985852/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index fb1edf6,45ed493..75c2fd9
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -2159,13 -2144,12 +2159,14 @@@ public class StorageService extends Not
  private void excise(Collection tokens, InetAddress endpoint)
  {
  logger.info("Removing tokens {} for {}", tokens, endpoint);
 -HintedHandOffManager.instance.deleteHintsForEndpoint(endpoint);
 +
 +if (tokenMetadata.isMember(endpoint))
 +HintsService.instance.excise(tokenMetadata.getHostId(endpoint));
 +
  removeEndpoint(endpoint);
  tokenMetadata.removeEndpoint(endpoint);
- tokenMetadata.removeBootstrapTokens(tokens);
+ if (tokens != null)
+ tokenMetadata.removeBootstrapTokens(tokens);
 -
  notifyLeft(endpoint);
  PendingRangeCalculatorService.instance.update();
  }

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

[aleksey]

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 82189ee3290c481da26f10b55ea73e4b47cc33a4
Parents: 81e1b15 8f98585
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 14:05:48 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:05:48 2015 +

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


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

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

[aleksey]

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: 5a2d5298423dc4501fad0d53183e7ac93d83e76c
Parents: b4b2684 b6015fa
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 13:59:17 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 13:59:17 2015 +

--
 CHANGES.txt  |  1 +
 .../apache/cassandra/db/HintedHandOffManager.java|  4 
 .../org/apache/cassandra/service/StorageService.java | 15 ---
 3 files changed, 17 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a2d5298/CHANGES.txt
--
diff --cc CHANGES.txt
index f25ac7e,5ceabb4..60bf565
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 -2.1.12
 +2.2.4
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * Improve handling of dead nodes in gossip (CASSANDRA-10298)
   * Fix logback-tools.xml incorrectly configured for outputing to System.err
 (CASSANDRA-9937)
   * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a2d5298/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--
diff --cc src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 179c611,4fbdd27..4ec5d62
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@@ -213,10 -213,14 +213,14 @@@ public class HintedHandOffManager imple
  {
  if (!StorageService.instance.getTokenMetadata().isMember(endpoint))
  return;
+ 
  UUID hostId = 
StorageService.instance.getTokenMetadata().getHostId(endpoint);
+ if (hostId == null)
+ return;
+ 
  ByteBuffer hostIdBytes = ByteBuffer.wrap(UUIDGen.decompose(hostId));
 -final Mutation mutation = new Mutation(Keyspace.SYSTEM_KS, 
hostIdBytes);
 -mutation.delete(SystemKeyspace.HINTS_CF, System.currentTimeMillis());
 +final Mutation mutation = new Mutation(SystemKeyspace.NAME, 
hostIdBytes);
 +mutation.delete(SystemKeyspace.HINTS, System.currentTimeMillis());
  
  // execute asynchronously to avoid blocking caller (which may be 
processing gossip)
  Runnable runnable = new Runnable()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a2d5298/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index f162f7c,d02a572..45ed493
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -2139,9 -1956,14 +2147,10 @@@ public class StorageService extends Not
  HintedHandOffManager.instance.deleteHintsForEndpoint(endpoint);
  removeEndpoint(endpoint);
  tokenMetadata.removeEndpoint(endpoint);
- tokenMetadata.removeBootstrapTokens(tokens);
+ if (tokens != null)
+ tokenMetadata.removeBootstrapTokens(tokens);
  
 -if (!isClientMode)
 -{
 -for (IEndpointLifecycleSubscriber subscriber : 
lifecycleSubscribers)
 -subscriber.onLeaveCluster(endpoint);
 -}
 +notifyLeft(endpoint);
  PendingRangeCalculatorService.instance.update();
  }
  

[1/4] cassandra git commit: Improve handling of dead nodes in gossip

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 81e1b15db -> 82189ee32


Improve handling of dead nodes in gossip

patch by Dikang Gu; reviewed by Stefania Alborghetti for CASSANDRA-10298


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

Branch: refs/heads/trunk
Commit: b6015fa4883182531d66527780fce34c9b125e46
Parents: dc73c0b
Author: Dikang Gu 
Authored: Wed Nov 4 13:50:33 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 13:56:42 2015 +

--
 CHANGES.txt  |  1 +
 .../apache/cassandra/db/HintedHandOffManager.java|  4 
 .../org/apache/cassandra/service/StorageService.java | 15 ---
 3 files changed, 17 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6015fa4/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index fd6c8a1..5ceabb4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.12
+ * Improve handling of dead nodes in gossip (CASSANDRA-10298)
  * Fix logback-tools.xml incorrectly configured for outputing to System.err
(CASSANDRA-9937)
  * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6015fa4/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java 
b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 6f9d0b1..4fbdd27 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -213,7 +213,11 @@ public class HintedHandOffManager implements 
HintedHandOffManagerMBean
 {
 if (!StorageService.instance.getTokenMetadata().isMember(endpoint))
 return;
+
 UUID hostId = 
StorageService.instance.getTokenMetadata().getHostId(endpoint);
+if (hostId == null)
+return;
+
 ByteBuffer hostIdBytes = ByteBuffer.wrap(UUIDGen.decompose(hostId));
 final Mutation mutation = new Mutation(Keyspace.SYSTEM_KS, 
hostIdBytes);
 mutation.delete(SystemKeyspace.HINTS_CF, System.currentTimeMillis());

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6015fa4/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 7e5b67b..d02a572 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1858,8 +1858,16 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 private void handleStateLeft(InetAddress endpoint, String[] pieces)
 {
 assert pieces.length >= 2;
-Collection tokens;
-tokens = getTokensFor(endpoint);
+Collection tokens = null;
+try
+{
+tokens = getTokensFor(endpoint);
+}
+catch (Throwable th)
+{
+JVMStabilityInspector.inspectThrowable(th);
+logger.warn("Unable to calculate tokens for {}.", endpoint);
+}
 
 if (logger.isDebugEnabled())
 logger.debug("Node {} state left, tokens {}", endpoint, tokens);
@@ -1948,7 +1956,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 HintedHandOffManager.instance.deleteHintsForEndpoint(endpoint);
 removeEndpoint(endpoint);
 tokenMetadata.removeEndpoint(endpoint);
-tokenMetadata.removeBootstrapTokens(tokens);
+if (tokens != null)
+tokenMetadata.removeBootstrapTokens(tokens);
 
 if (!isClientMode)
 {

cassandra git commit: Fix logback-tools.xml incorrectly configured for outputing to System.err

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 068614ccc -> dc73c0b31


Fix logback-tools.xml incorrectly configured for outputing to System.err

patch by Mike Adamson; reviewed by Jeremiah Jordan for CASSANDRA-9937


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

Branch: refs/heads/cassandra-2.1
Commit: dc73c0b31feb399750c5a6823854714ee711152e
Parents: 068614c
Author: Mike Adamson 
Authored: Wed Nov 4 12:21:54 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 12:26:12 2015 +

--
 CHANGES.txt| 2 ++
 conf/logback-tools.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc73c0b3/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 4c24b35..fd6c8a1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 2.1.12
+ * Fix logback-tools.xml incorrectly configured for outputing to System.err
+   (CASSANDRA-9937)
  * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)
  * Add validation method to PerRowSecondaryIndex (CASSANDRA-10092)
  * Support encrypted and plain traffic on the same port (CASSANDRA-10559)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc73c0b3/conf/logback-tools.xml
--
diff --git a/conf/logback-tools.xml b/conf/logback-tools.xml
index ade6c12..e47985e 100644
--- a/conf/logback-tools.xml
+++ b/conf/logback-tools.xml
@@ -18,7 +18,8 @@
 -->
 
 
-  
+  
+System.err
 
   %-5level %date{HH:mm:ss,SSS} %msg%n
 

cassandra git commit: Allow jacoco report merging

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/trunk fca83d812 -> b14423c8b


Allow jacoco report merging

patch by Russ Hatch; reviewed by Philip Thompson and Ariel Weisberg for
CASSANDRA-10616


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

Branch: refs/heads/trunk
Commit: b14423c8b4c26f3ac84c901ff078d7635aaddfb8
Parents: fca83d8
Author: Russ Hatch 
Authored: Tue Oct 27 15:19:12 2015 -0600
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 13:07:02 2015 +

--
 build.xml | 22 --
 1 file changed, 16 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b14423c8/build.xml
--
diff --git a/build.xml b/build.xml
index 57a4e4f..a7296e1 100644
--- a/build.xml
+++ b/build.xml
@@ -112,8 +112,10 @@
 
 
 
-
-
+
+
+
+
 
 
 
@@ -196,6 +198,7 @@
 
 
 
+
 
 
 
@@ -205,6 +208,7 @@
 
 
 
+
 
 
 
@@ -1160,7 +1164,7 @@
 
 
   
 
   
@@ -1463,10 +1467,16 @@
 
   
 
-  
+  
+
+
+
+  
+
+  
 
   
-
+
   
   
 
@@ -1489,7 +1499,7 @@
   
 
   
-
+
 
   
 

cassandra git commit: Improve handling of dead nodes in gossip

[aleksey]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 dc73c0b31 -> b6015fa48


Improve handling of dead nodes in gossip

patch by Dikang Gu; reviewed by Stefania Alborghetti for CASSANDRA-10298


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

Branch: refs/heads/cassandra-2.1
Commit: b6015fa4883182531d66527780fce34c9b125e46
Parents: dc73c0b
Author: Dikang Gu 
Authored: Wed Nov 4 13:50:33 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 13:56:42 2015 +

--
 CHANGES.txt  |  1 +
 .../apache/cassandra/db/HintedHandOffManager.java|  4 
 .../org/apache/cassandra/service/StorageService.java | 15 ---
 3 files changed, 17 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6015fa4/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index fd6c8a1..5ceabb4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.12
+ * Improve handling of dead nodes in gossip (CASSANDRA-10298)
  * Fix logback-tools.xml incorrectly configured for outputing to System.err
(CASSANDRA-9937)
  * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6015fa4/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java 
b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 6f9d0b1..4fbdd27 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -213,7 +213,11 @@ public class HintedHandOffManager implements 
HintedHandOffManagerMBean
 {
 if (!StorageService.instance.getTokenMetadata().isMember(endpoint))
 return;
+
 UUID hostId = 
StorageService.instance.getTokenMetadata().getHostId(endpoint);
+if (hostId == null)
+return;
+
 ByteBuffer hostIdBytes = ByteBuffer.wrap(UUIDGen.decompose(hostId));
 final Mutation mutation = new Mutation(Keyspace.SYSTEM_KS, 
hostIdBytes);
 mutation.delete(SystemKeyspace.HINTS_CF, System.currentTimeMillis());

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6015fa4/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 7e5b67b..d02a572 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1858,8 +1858,16 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 private void handleStateLeft(InetAddress endpoint, String[] pieces)
 {
 assert pieces.length >= 2;
-Collection tokens;
-tokens = getTokensFor(endpoint);
+Collection tokens = null;
+try
+{
+tokens = getTokensFor(endpoint);
+}
+catch (Throwable th)
+{
+JVMStabilityInspector.inspectThrowable(th);
+logger.warn("Unable to calculate tokens for {}.", endpoint);
+}
 
 if (logger.isDebugEnabled())
 logger.debug("Node {} state left, tokens {}", endpoint, tokens);
@@ -1948,7 +1956,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 HintedHandOffManager.instance.deleteHintsForEndpoint(endpoint);
 removeEndpoint(endpoint);
 tokenMetadata.removeEndpoint(endpoint);
-tokenMetadata.removeBootstrapTokens(tokens);
+if (tokens != null)
+tokenMetadata.removeBootstrapTokens(tokens);
 
 if (!isClientMode)
 {