[jira] [Commented] (CASSANDRA-6848) stress (2.1) spams console with java.util.NoSuchElementException when run against nodes recently created

2014-03-13 Thread Benedict (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6848?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13933900#comment-13933900
 ] 

Benedict commented on CASSANDRA-6848:
-

Weird. Stress retains no state. Can you try running stress from the branch I 
uploaded for CASSANDRA-6849, and passing -log level=verbose ?

 stress (2.1) spams console with java.util.NoSuchElementException when run 
 against nodes recently created
 

 Key: CASSANDRA-6848
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6848
 Project: Cassandra
  Issue Type: Bug
Reporter: Russ Hatch
Assignee: Benedict
 Fix For: 2.1 beta2


 I don't get any stack trace on the console, but I get two 
 java.util.NoSuchElementException for each operation stress is doing.
 This seems to occur when stress is being run against a recently created node 
 (such as one from ccm).
 To reproduce: create a ccm cluster, and run stress against it within a few 
 minutes . Run a simple stress command like cassandra-stress write n=10 .



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6846) Provide standard interface for deep application server integration

2014-03-13 Thread Edward Capriolo (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6846?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13933931#comment-13933931
 ] 

Edward Capriolo commented on CASSANDRA-6846:


{quote}
So let's continue to use this ticket to explore what the gap is between what I 
proposed, and what you see as a minimally viable versions of the need expressed 
by #2 and #3.
{quote}

Most of what I want from Cassandra can be achieved by implementing 
IDiskAtomFilter instances directly.

Imagine I want all columns that that have a value that matches a regex. In CQL 
it would be something like this:
{code}
SELECT * FROM TABLE WHERE regex_like(COLUMN_VALUE,'?whateverrevex')==true
{code}
A valid point that this can be done with CQL. I agree, IF I knew how to write 
a query parser, and a planner, antlr and yada yada. I agree it can be done. But 
I do not know that stuff, and what I am talking about is a trivial task when 
your on the server side.

Maybe I want to express this something like this:
{code}
columnFamily.stream( {rowkey: 1}).filter ( 
Pattern(whatever).matches(column.value) );
{code}
That would be a deep integration to me. Living below CQL, give me access to 
the ColumnFamily and get out of my way!






 Provide standard interface for deep application server integration
 --

 Key: CASSANDRA-6846
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6846
 Project: Cassandra
  Issue Type: New Feature
  Components: API, Core
Reporter: Tupshin Harper
Assignee: Tupshin Harper
Priority: Minor
  Labels: ponies

 Instead of creating a pluggable interface for Thrift, I'd like to create a 
 pluggable interface for arbitrary app-server deep integration.
 Inspired by both the existence of intravert-ug, as well as there being a long 
 history of various parties embedding tomcat or jetty servlet engines inside 
 Cassandra, I'd like to propose the creation an internal somewhat stable 
 (versioned?) interface that could allow any app server to achieve deep 
 integration with Cassandra, and as a result, these servers could 
 1) host their own apis (REST, for example
 2) extend core functionality by having limited (see triggers and wide row 
 scanners) access to the internals of cassandra
 The hand wavey part comes because while I have been mulling this about for a 
 while, I have not spent any significant time into looking at the actual 
 surface area of intravert-ug's integration. But, using it as a model, and 
 also keeping in minds the general needs of your more traditional servlet/j2ee 
 containers, I believe we could come up with a reasonable interface to allow 
 any jvm app server to be integrated and maintained in or out of the Cassandra 
 tree.
 This would satisfy the needs that many of us (Both Ed and I, for example) to 
 have a much greater degree of control over server side execution, and to be 
 able to start building much more interestingly (and simply) tiered 
 applications.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6376) Pig tests are failing

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6376?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13933940#comment-13933940
 ] 

Jonathan Ellis commented on CASSANDRA-6376:
---

where does that leave us here?

 Pig tests are failing
 -

 Key: CASSANDRA-6376
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6376
 Project: Cassandra
  Issue Type: Bug
Reporter: Sylvain Lebresne
Assignee: Alex Liu
Priority: Minor
 Attachments: 6376-1.2-branch.txt


 On my box, all pig tests are failing with the following stack:
 {noformat}
 [junit] Testcase: org.apache.cassandra.pig.CqlTableDataTypeTest:  Caused 
 an ERROR
 [junit] null
 [junit] java.lang.ExceptionInInitializerError
 [junit]   at 
 org.apache.cassandra.pig.PigTestBase.startHadoopCluster(PigTestBase.java:104)
 [junit]   at 
 org.apache.cassandra.pig.CqlTableDataTypeTest.setup(CqlTableDataTypeTest.java:198)
 [junit] Caused by: java.lang.NullPointerException
 [junit]   at 
 org.apache.hadoop.hdfs.MiniDFSCluster.startDataNodes(MiniDFSCluster.java:422)
 [junit]   at 
 org.apache.hadoop.hdfs.MiniDFSCluster.init(MiniDFSCluster.java:280)
 [junit]   at 
 org.apache.hadoop.hdfs.MiniDFSCluster.init(MiniDFSCluster.java:124)
 [junit]   at 
 org.apache.pig.test.MiniCluster.setupMiniDfsAndMrClusters(MiniCluster.java:50)
 [junit]   at 
 org.apache.pig.test.MiniGenericCluster.init(MiniGenericCluster.java:49)
 [junit]   at org.apache.pig.test.MiniCluster.init(MiniCluster.java:31)
 [junit]   at 
 org.apache.pig.test.MiniGenericCluster.clinit(MiniGenericCluster.java:45)
 {noformat}
 On CASSANDRA-6375, Brandon reported that it was the case on his box too, so I 
 don't think it's a local to my machine. Seems to be a relatively basic setup 
 thing though, not an actual test failure.
 I'll also note that we have a specific target for pig tests and that this 
 target uses a longer timeout than the one for the test target. If that's 
 because pig tests typically don't finish within the test timeout, then it 
 would be nice to exclude them from the normal test target (and maybe include 
 them in the long-test target).



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6848) stress (2.1) spams console with java.util.NoSuchElementException when run against nodes recently created

2014-03-13 Thread Russ Hatch (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6848?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13933944#comment-13933944
 ] 

Russ Hatch commented on CASSANDRA-6848:
---

here's the exception printed from your branch with verbose logging:
{noformat}
java.util.NoSuchElementException
at 
com.google.common.collect.AbstractIndexedListIterator.next(AbstractIndexedListIterator.java:82)
at 
org.apache.cassandra.stress.util.SmartThriftClient.get(SmartThriftClient.java:117)
at 
org.apache.cassandra.stress.util.SmartThriftClient.batch_mutate(SmartThriftClient.java:137)
at 
org.apache.cassandra.stress.operations.ThriftCounterAdder$1.run(ThriftCounterAdder.java:77)
at 
org.apache.cassandra.stress.Operation.timeWithRetry(Operation.java:251)
at 
org.apache.cassandra.stress.operations.ThriftCounterAdder.run(ThriftCounterAdder.java:72)
at 
org.apache.cassandra.stress.StressAction$Consumer.run(StressAction.java:304)
{noformat}

 stress (2.1) spams console with java.util.NoSuchElementException when run 
 against nodes recently created
 

 Key: CASSANDRA-6848
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6848
 Project: Cassandra
  Issue Type: Bug
Reporter: Russ Hatch
Assignee: Benedict
 Fix For: 2.1 beta2


 I don't get any stack trace on the console, but I get two 
 java.util.NoSuchElementException for each operation stress is doing.
 This seems to occur when stress is being run against a recently created node 
 (such as one from ccm).
 To reproduce: create a ccm cluster, and run stress against it within a few 
 minutes . Run a simple stress command like cassandra-stress write n=10 .



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6846) Provide standard interface for deep application server integration

2014-03-13 Thread Peter (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6846?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13933963#comment-13933963
 ] 

Peter commented on CASSANDRA-6846:
--


Having implemented an expert system shell in the past and a LISP interpreter, 
UDF's are good for a class of problems. Where performance really matters, being 
able to do it at a lower level definitely gives more options for optimizing 
performance. Writing query planners isn't that hard, writing a really good one 
is very very hard. Being able to integrate at IDiskAtomFilter level should 
give users the ability to optimize for their specific needs.
If we look at RDBMS history, most of them had low level hooks for customers 
that needed them. 99% of the users never had to use it, but those that did were 
glad it was there. Of course it's also ripe for abuse on benchmarks when 
vendors took advantage to game TPC-C.
A really dumb question, how likely is it that IDiskAtomFilter will change? I 
took a quick look on github and it looks like it has been fairly stable since 
2012. I would imagine if the storage format changes, IDiskAtomFilter would need 
to be updated. I ask for a couple of reasons. I'm interesting in implementing 
Bitmap indexes for Cassandra. I haven't dug deep enough to know what it would 
take to add bitmap indexes. I've been reading over the index code the last 2 
weeks in my spare time.

 Provide standard interface for deep application server integration
 --

 Key: CASSANDRA-6846
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6846
 Project: Cassandra
  Issue Type: New Feature
  Components: API, Core
Reporter: Tupshin Harper
Assignee: Tupshin Harper
Priority: Minor
  Labels: ponies

 Instead of creating a pluggable interface for Thrift, I'd like to create a 
 pluggable interface for arbitrary app-server deep integration.
 Inspired by both the existence of intravert-ug, as well as there being a long 
 history of various parties embedding tomcat or jetty servlet engines inside 
 Cassandra, I'd like to propose the creation an internal somewhat stable 
 (versioned?) interface that could allow any app server to achieve deep 
 integration with Cassandra, and as a result, these servers could 
 1) host their own apis (REST, for example
 2) extend core functionality by having limited (see triggers and wide row 
 scanners) access to the internals of cassandra
 The hand wavey part comes because while I have been mulling this about for a 
 while, I have not spent any significant time into looking at the actual 
 surface area of intravert-ug's integration. But, using it as a model, and 
 also keeping in minds the general needs of your more traditional servlet/j2ee 
 containers, I believe we could come up with a reasonable interface to allow 
 any jvm app server to be integrated and maintained in or out of the Cassandra 
 tree.
 This would satisfy the needs that many of us (Both Ed and I, for example) to 
 have a much greater degree of control over server side execution, and to be 
 able to start building much more interestingly (and simply) tiered 
 applications.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6848) stress (2.1) spams console with java.util.NoSuchElementException when run against nodes recently created

2014-03-13 Thread Benedict (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6848?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13933965#comment-13933965
 ] 

Benedict commented on CASSANDRA-6848:
-

[Patch|https://github.com/belliottsmith/cassandra/tree/iss-6848]

Was a bug when round-robining for smart routing, which is why disabling smart 
routing works. Not sure why it would _ever_ work for a RF3 cluster though. 
Basically, hadn't been run against RF1 before I don't think.

 stress (2.1) spams console with java.util.NoSuchElementException when run 
 against nodes recently created
 

 Key: CASSANDRA-6848
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6848
 Project: Cassandra
  Issue Type: Bug
Reporter: Russ Hatch
Assignee: Benedict
 Fix For: 2.1 beta2


 I don't get any stack trace on the console, but I get two 
 java.util.NoSuchElementException for each operation stress is doing.
 This seems to occur when stress is being run against a recently created node 
 (such as one from ccm).
 To reproduce: create a ccm cluster, and run stress against it within a few 
 minutes . Run a simple stress command like cassandra-stress write n=10 .



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6848) stress (2.1) spams console with java.util.NoSuchElementException when run against nodes recently created

2014-03-13 Thread Benedict (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6848?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13933971#comment-13933971
 ] 

Benedict commented on CASSANDRA-6848:
-

[~xedin] this tree includes all of the minor stress modifications made 
recently. The last two mostly just a few lines, so if you're reviewing 
CASSANDRA-6824, might as well just look here.

 stress (2.1) spams console with java.util.NoSuchElementException when run 
 against nodes recently created
 

 Key: CASSANDRA-6848
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6848
 Project: Cassandra
  Issue Type: Bug
Reporter: Russ Hatch
Assignee: Benedict
 Fix For: 2.1 beta2


 I don't get any stack trace on the console, but I get two 
 java.util.NoSuchElementException for each operation stress is doing.
 This seems to occur when stress is being run against a recently created node 
 (such as one from ccm).
 To reproduce: create a ccm cluster, and run stress against it within a few 
 minutes . Run a simple stress command like cassandra-stress write n=10 .



--
This message was sent by Atlassian JIRA
(v6.2#6252)


git commit: Load a truststore if client certificate authentication is enabled

2014-03-13 Thread mishail
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-1.2 52cf09dba - 173df48bb


Load a truststore if client certificate authentication is enabled

patch by Mikhail Stepura; reviewed by Jason Brown for CASSANDRA-6847


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

Branch: refs/heads/cassandra-1.2
Commit: 173df48bb36402bf59accb02537450703b8eedd8
Parents: 52cf09d
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 11:27:43 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 13:05:31 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/173df48b/src/java/org/apache/cassandra/transport/Server.java
--
diff --git a/src/java/org/apache/cassandra/transport/Server.java 
b/src/java/org/apache/cassandra/transport/Server.java
index 0ffb92b..5773728 100644
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@ -257,7 +257,7 @@ public class Server implements CassandraDaemon.Server
 this.encryptionOptions = encryptionOptions;
 try
 {
-this.sslContext = 
SSLFactory.createSSLContext(encryptionOptions, false);
+this.sslContext = 
SSLFactory.createSSLContext(encryptionOptions, 
encryptionOptions.require_client_auth);
 }
 catch (IOException e)
 {



[jira] [Updated] (CASSANDRA-5483) Repair tracing

2014-03-13 Thread Ben Chan (JIRA)

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

Ben Chan updated CASSANDRA-5483:


Attachment: cqlsh-left-justify-text-columns.patch

Public TODO list; please comment if any should be not-TODO:
* Trace streaming and/or lack thereof (I think hooking {{Differencer#run}} and 
related threads should be enough).
* Maybe exclude {{system_traces}} from repair if a repair trace is going on. 
There seems to be a feedback loop triggering multiple repair commands otherwise.
* Maybe add a placeholder row with a null {{duration}} for ongoing repair 
sessions. Makes it easier to find the {{session_id}} for queries. Update with 
the final duration at the end.
* Populate {{started_at}}, {{request}}, etc in {{system_traces.sessions}}.
* Send the {{session_id}} back to nodetool.
* Shorten/simplify trace messages.
* Verbose option; dump all traces to nodetool.

Implementation thoughts follow; please warn of potential problems.

---

Verbose option:

To send local traces back to nodetool, adding a parallel {{sendNotification}} 
is easy enough. Getting the remote traces seems like it would involve 
monitoring updates to {{system_traces.events}}.

At first I thought triggers, but the docs say that triggers run on the 
coordinator node, which is not necessarily the node you're repairing. So that 
leaves polling the table with heuristics that are hopefully good enough to 
reduce the amount of extra work.

---

Simplify trace messages:

Skipping to the point of difference:

It looks like each sub-RepairSession has a unique session id (a timeuuid but 
different from either {{session_id}} or {{event_id}}). Here is a section of the 
select above aligned and simplified to increase SNR. The redacted parts are 
identical.
{noformat}
[repair #fedc3790-...] Received merkle tree for events from /127.0.0.1
[repair #fef40550-...] new session: will sync /127.0.0.1, /127.0.0.2 on range 
(3074457345618258602,-9223372036854775808] for system_traces.[sessions, events]
[repair #fef40550-...] requesting merkle trees for sessions (to [/127.0.0.2, 
/127.0.0.1])
[repair #fedc3790-...] session completed successfully
[repair #fef40550-...] Sending completed merkle tree to /127.0.0.1 for 
system_traces/sessions
{noformat}
In the example above, you can see some overlap in the repair session traces, so 
the sub-session_id (so to speak) has some use in distinguishing these. Since 
this sub-session_id only has to be unique for a particular repair session, 
maybe it would be worth it to map each one to a small integer?

For convenience, I attached a small, not-very-pretty patch that left-justifies 
columns of type text in cqlsh (makes it easier to read the traces).

---

Trace streaming:

Is there a simple way to create a situation where a repair requires streaming? 
Here is what I'm currently doing, but it doesn't work.

{noformat}
#/bin/sh
ccm create $(mktemp -u 5483-XXX) 
ccm populate -n 3 
ccm updateconf --no-hinted-handoff 
ccm start 
ccm node1 cqlsh E
CREATE SCHEMA s1
WITH replication = { 'class' : 'SimpleStrategy', 'replication_factor' : 2 };

CREATE TABLE s1.users (
  user_id varchar PRIMARY KEY,
  first varchar,
  last varchar,
  age int)
WITH read_repair_chance = 0.0;

INSERT INTO s1.users (user_id, first, last, age)
  VALUES ('jsmith', 'John', 'Smith', 42);
E

ccm node1 stop 
python - E | ccm node2 cqlsh
import random as r
fs=[John,Art,Skip,Doug,Koala]
ls=[Jackson,Jacobs,Jefferson,Smythe]
for (f, l) in [(f,l) for f in fs for l in ls]:
  print (
insert into s1.users (user_id, age, first, last) 
values('%s', %d, '%s', '%s');
  ) % ((f[0]+l).lower(), r.randint(10,100), f, l)
E
ccm node2 cqlsh E
select count(*) from s1.users;
E
ccm node1 start
ccm node1 cqlsh E
select count(*) from s1.users;
E
nodetool -p $(ccm node1 show | awk -F= '/jmx_port/{print $2}') repair -tr s1
{noformat}

The problem is that despite disabling hinted handoff and setting 
{{read_repair_chance}} to 0, the endpoints are still reported as consistent in 
{{Differencer#run}}. Yet node1 is clearly missing some rows prior to the 
repair, and has them at the end. Somehow the streaming repair is getting done 
somewhere other than {{Differencer#run}}. Is some sort of handoff still being 
done somewhere? I'm sure there is something simple, but I'm missing it.


 Repair tracing
 --

 Key: CASSANDRA-5483
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5483
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Reporter: Yuki Morishita
Assignee: Ben Chan
Priority: Minor
  Labels: repair
 Attachments: 5483-full-trunk.txt, 
 5483-v06-04-Allow-tracing-ttl-to-be-configured.patch, 
 5483-v06-05-Add-a-command-column-to-system_traces.events.patch, 
 5483-v06-06-Fix-interruption-in-tracestate-propagation.patch, 
 

[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-03-13 Thread mishail
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/cassandra-2.0
Commit: dce5599953adfabb5a6ecace37a5c4c6de3e7885
Parents: da2d971 173df48
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 13:05:52 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 13:05:52 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dce55999/src/java/org/apache/cassandra/transport/Server.java
--



[1/2] git commit: Load a truststore if client certificate authentication is enabled

2014-03-13 Thread mishail
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 da2d97142 - dce559995


Load a truststore if client certificate authentication is enabled

patch by Mikhail Stepura; reviewed by Jason Brown for CASSANDRA-6847


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

Branch: refs/heads/cassandra-2.0
Commit: 173df48bb36402bf59accb02537450703b8eedd8
Parents: 52cf09d
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 11:27:43 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 13:05:31 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/173df48b/src/java/org/apache/cassandra/transport/Server.java
--
diff --git a/src/java/org/apache/cassandra/transport/Server.java 
b/src/java/org/apache/cassandra/transport/Server.java
index 0ffb92b..5773728 100644
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@ -257,7 +257,7 @@ public class Server implements CassandraDaemon.Server
 this.encryptionOptions = encryptionOptions;
 try
 {
-this.sslContext = 
SSLFactory.createSSLContext(encryptionOptions, false);
+this.sslContext = 
SSLFactory.createSSLContext(encryptionOptions, 
encryptionOptions.require_client_auth);
 }
 catch (IOException e)
 {



[1/3] git commit: Load a truststore if client certificate authentication is enabled

2014-03-13 Thread mishail
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 4c22b165c - 51220ffe2


Load a truststore if client certificate authentication is enabled

patch by Mikhail Stepura; reviewed by Jason Brown for CASSANDRA-6847


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

Branch: refs/heads/cassandra-2.1
Commit: 173df48bb36402bf59accb02537450703b8eedd8
Parents: 52cf09d
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 11:27:43 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 13:05:31 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/173df48b/src/java/org/apache/cassandra/transport/Server.java
--
diff --git a/src/java/org/apache/cassandra/transport/Server.java 
b/src/java/org/apache/cassandra/transport/Server.java
index 0ffb92b..5773728 100644
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@ -257,7 +257,7 @@ public class Server implements CassandraDaemon.Server
 this.encryptionOptions = encryptionOptions;
 try
 {
-this.sslContext = 
SSLFactory.createSSLContext(encryptionOptions, false);
+this.sslContext = 
SSLFactory.createSSLContext(encryptionOptions, 
encryptionOptions.require_client_auth);
 }
 catch (IOException e)
 {



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

2014-03-13 Thread mishail
Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 51220ffe2a2b73fc976635da5464573d0cb7ea93
Parents: 4c22b16 dce5599
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 13:06:03 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 13:06:03 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/51220ffe/src/java/org/apache/cassandra/transport/Server.java
--



[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-03-13 Thread mishail
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/cassandra-2.1
Commit: dce5599953adfabb5a6ecace37a5c4c6de3e7885
Parents: da2d971 173df48
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 13:05:52 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 13:05:52 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dce55999/src/java/org/apache/cassandra/transport/Server.java
--



[jira] [Commented] (CASSANDRA-6376) Pig tests are failing

2014-03-13 Thread Brandon Williams (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6376?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13933978#comment-13933978
 ] 

Brandon Williams commented on CASSANDRA-6376:
-

Now they seem to execute fine, but have an error:

{noformat}
[junit] Testcase: 
testCqlStorageCollectionColumnTable(org.apache.cassandra.pig.CqlTableTest): 
  FAILED
[junit] expected:3 but was:2
[junit] junit.framework.AssertionFailedError: expected:3 but was:2
[junit] at 
org.apache.cassandra.pig.CqlTableTest.testCqlStorageCollectionColumnTable(CqlTableTest.java:186)
{noformat}

 Pig tests are failing
 -

 Key: CASSANDRA-6376
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6376
 Project: Cassandra
  Issue Type: Bug
Reporter: Sylvain Lebresne
Assignee: Alex Liu
Priority: Minor
 Attachments: 6376-1.2-branch.txt


 On my box, all pig tests are failing with the following stack:
 {noformat}
 [junit] Testcase: org.apache.cassandra.pig.CqlTableDataTypeTest:  Caused 
 an ERROR
 [junit] null
 [junit] java.lang.ExceptionInInitializerError
 [junit]   at 
 org.apache.cassandra.pig.PigTestBase.startHadoopCluster(PigTestBase.java:104)
 [junit]   at 
 org.apache.cassandra.pig.CqlTableDataTypeTest.setup(CqlTableDataTypeTest.java:198)
 [junit] Caused by: java.lang.NullPointerException
 [junit]   at 
 org.apache.hadoop.hdfs.MiniDFSCluster.startDataNodes(MiniDFSCluster.java:422)
 [junit]   at 
 org.apache.hadoop.hdfs.MiniDFSCluster.init(MiniDFSCluster.java:280)
 [junit]   at 
 org.apache.hadoop.hdfs.MiniDFSCluster.init(MiniDFSCluster.java:124)
 [junit]   at 
 org.apache.pig.test.MiniCluster.setupMiniDfsAndMrClusters(MiniCluster.java:50)
 [junit]   at 
 org.apache.pig.test.MiniGenericCluster.init(MiniGenericCluster.java:49)
 [junit]   at org.apache.pig.test.MiniCluster.init(MiniCluster.java:31)
 [junit]   at 
 org.apache.pig.test.MiniGenericCluster.clinit(MiniGenericCluster.java:45)
 {noformat}
 On CASSANDRA-6375, Brandon reported that it was the case on his box too, so I 
 don't think it's a local to my machine. Seems to be a relatively basic setup 
 thing though, not an actual test failure.
 I'll also note that we have a specific target for pig tests and that this 
 target uses a longer timeout than the one for the test target. If that's 
 because pig tests typically don't finish within the test timeout, then it 
 would be nice to exclude them from the normal test target (and maybe include 
 them in the long-test target).



--
This message was sent by Atlassian JIRA
(v6.2#6252)


git commit: Adjusted cqlshlib tests for CASSANDRA-6745

2014-03-13 Thread mishail
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 51220ffe2 - c3f40fd7b


Adjusted cqlshlib tests for CASSANDRA-6745


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

Branch: refs/heads/cassandra-2.1
Commit: c3f40fd7b34e35a6438a2b06d78827173cd2eca4
Parents: 51220ff
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 13:27:26 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 13:27:26 2014 -0700

--
 pylib/cqlshlib/test/test_cqlsh_output.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3f40fd7/pylib/cqlshlib/test/test_cqlsh_output.py
--
diff --git a/pylib/cqlshlib/test/test_cqlsh_output.py 
b/pylib/cqlshlib/test/test_cqlsh_output.py
index f3e9b57..212f847 100644
--- a/pylib/cqlshlib/test/test_cqlsh_output.py
+++ b/pylib/cqlshlib/test/test_cqlsh_output.py
@@ -652,7 +652,7 @@ class TestCqlshOutput(BaseTestCase):
 varcharcol text,
 varintcol varint
 ) WITH bloom_filter_fp_chance = 0.01
-AND caching = 'KEYS_ONLY'
+AND caching = '{keys:ALL, rows_per_partition:NONE}'
 AND comment = ''
 AND compaction = {'min_threshold': '4', 'class': 
'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy', 
'max_threshold': '32'}
 AND compression = {'sstable_compression': 
'org.apache.cassandra.io.compress.LZ4Compressor'}
@@ -663,7 +663,6 @@ class TestCqlshOutput(BaseTestCase):
 AND min_index_interval = 128
 AND populate_io_cache_on_flush = false
 AND read_repair_chance = 0.1
-AND rows_per_partition_to_cache = '100'
 AND speculative_retry = '99.0PERCENTILE';
 
  % quote_name(get_test_keyspace()))



[jira] [Updated] (CASSANDRA-6719) redesign loadnewsstables

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6719:
--

Labels: lhf  (was: )

 redesign loadnewsstables
 

 Key: CASSANDRA-6719
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6719
 Project: Cassandra
  Issue Type: New Feature
  Components: Tools
Reporter: Jonathan Ellis
Priority: Minor
  Labels: lhf
 Fix For: 2.1 beta2


 CFSMBean.loadNewSSTables scans data directories for new sstables dropped 
 there by an external agent.  This is dangerous because of possible filename 
 conflicts with existing or newly generated sstables.
 Instead, we should support leaving the new sstables in a separate directory 
 (specified by a parameter, or configured as a new location in yaml) and take 
 care of renaming as necessary automagically.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[1/2] git commit: Delimiter not working for special characters in COPY command from CQLSH

2014-03-13 Thread mishail
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 dce559995 - 3dcc8c25e


Delimiter not working for special characters in COPY command from CQLSH

patch by Shiti Saxena; reviewed by Mikhail Stepura for CASSANDRA-6773


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

Branch: refs/heads/cassandra-2.0
Commit: 972d3da2e87d2e6770ed70ab45aa9dedc0fdf779
Parents: 173df48
Author: Shiti Saxena ssaxena@gmail.com
Authored: Thu Mar 13 14:06:51 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 14:06:51 2014 -0700

--
 bin/cqlsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/972d3da2/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index 5ccab3d..4bf1b76 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1635,7 +1635,8 @@ class Shell(cmd.Cmd):
 fname = os.path.expanduser(self.cql_unprotect_value(fname))
 copyoptnames = map(str.lower, parsed.get_binding('optnames', ()))
 copyoptvals = map(self.cql_unprotect_value, 
parsed.get_binding('optvals', ()))
-opts = dict(zip(copyoptnames, copyoptvals))
+cleancopyoptvals  = [optval.decode('string-escape') for optval in 
copyoptvals]
+opts = dict(zip(copyoptnames, cleancopyoptvals))
 
 timestart = time.time()
 



[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-03-13 Thread mishail
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/cassandra-2.0
Commit: 3dcc8c25e542d5473a78404a027ca6acb3cc065f
Parents: dce5599 972d3da
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 14:07:04 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 14:07:04 2014 -0700

--
 bin/cqlsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3dcc8c25/bin/cqlsh
--



git commit: Delimiter not working for special characters in COPY command from CQLSH

2014-03-13 Thread mishail
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-1.2 173df48bb - 972d3da2e


Delimiter not working for special characters in COPY command from CQLSH

patch by Shiti Saxena; reviewed by Mikhail Stepura for CASSANDRA-6773


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

Branch: refs/heads/cassandra-1.2
Commit: 972d3da2e87d2e6770ed70ab45aa9dedc0fdf779
Parents: 173df48
Author: Shiti Saxena ssaxena@gmail.com
Authored: Thu Mar 13 14:06:51 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 14:06:51 2014 -0700

--
 bin/cqlsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/972d3da2/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index 5ccab3d..4bf1b76 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1635,7 +1635,8 @@ class Shell(cmd.Cmd):
 fname = os.path.expanduser(self.cql_unprotect_value(fname))
 copyoptnames = map(str.lower, parsed.get_binding('optnames', ()))
 copyoptvals = map(self.cql_unprotect_value, 
parsed.get_binding('optvals', ()))
-opts = dict(zip(copyoptnames, copyoptvals))
+cleancopyoptvals  = [optval.decode('string-escape') for optval in 
copyoptvals]
+opts = dict(zip(copyoptnames, cleancopyoptvals))
 
 timestart = time.time()
 



[1/3] git commit: Delimiter not working for special characters in COPY command from CQLSH

2014-03-13 Thread mishail
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 c3f40fd7b - f49df8c9b


Delimiter not working for special characters in COPY command from CQLSH

patch by Shiti Saxena; reviewed by Mikhail Stepura for CASSANDRA-6773


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

Branch: refs/heads/cassandra-2.1
Commit: 972d3da2e87d2e6770ed70ab45aa9dedc0fdf779
Parents: 173df48
Author: Shiti Saxena ssaxena@gmail.com
Authored: Thu Mar 13 14:06:51 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 14:06:51 2014 -0700

--
 bin/cqlsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/972d3da2/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index 5ccab3d..4bf1b76 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1635,7 +1635,8 @@ class Shell(cmd.Cmd):
 fname = os.path.expanduser(self.cql_unprotect_value(fname))
 copyoptnames = map(str.lower, parsed.get_binding('optnames', ()))
 copyoptvals = map(self.cql_unprotect_value, 
parsed.get_binding('optvals', ()))
-opts = dict(zip(copyoptnames, copyoptvals))
+cleancopyoptvals  = [optval.decode('string-escape') for optval in 
copyoptvals]
+opts = dict(zip(copyoptnames, cleancopyoptvals))
 
 timestart = time.time()
 



[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-03-13 Thread mishail
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/cassandra-2.1
Commit: 3dcc8c25e542d5473a78404a027ca6acb3cc065f
Parents: dce5599 972d3da
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 14:07:04 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 14:07:04 2014 -0700

--
 bin/cqlsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3dcc8c25/bin/cqlsh
--



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

2014-03-13 Thread mishail
Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: f49df8c9b0e37bb23e981c3ce2cb17735051e068
Parents: c3f40fd 3dcc8c2
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 14:07:15 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 14:07:15 2014 -0700

--
 bin/cqlsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49df8c9/bin/cqlsh
--



[jira] [Commented] (CASSANDRA-3362) allow sub-row repair

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3362?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934075#comment-13934075
 ] 

Jonathan Ellis commented on CASSANDRA-3362:
---

I don't think this will be necessary with CASSANDRA-5351 completed.

 allow sub-row repair
 

 Key: CASSANDRA-3362
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3362
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Jonathan Ellis
  Labels: repair

 With large rows, it would be nice to not have to send an entire row if a 
 small part is out of sync.  Could we use the row index blocks as repair atoms 
 instead of the full row?



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Resolved] (CASSANDRA-3362) allow sub-row repair

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis resolved CASSANDRA-3362.
---

   Resolution: Won't Fix
Fix Version/s: (was: 2.1 beta2)

 allow sub-row repair
 

 Key: CASSANDRA-3362
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3362
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Jonathan Ellis
  Labels: repair

 With large rows, it would be nice to not have to send an entire row if a 
 small part is out of sync.  Could we use the row index blocks as repair atoms 
 instead of the full row?



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-5657) remove deprecated metrics

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-5657:
--

Fix Version/s: (was: 2.1 beta2)
   3.0

 remove deprecated metrics
 -

 Key: CASSANDRA-5657
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5657
 Project: Cassandra
  Issue Type: Task
  Components: Tools
Reporter: Jonathan Ellis
Assignee: Yuki Morishita
 Fix For: 3.0






--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-5657) remove deprecated metrics

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-5657?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934083#comment-13934083
 ] 

Jonathan Ellis commented on CASSANDRA-5657:
---

3.0 is probably the right place to do this.

 remove deprecated metrics
 -

 Key: CASSANDRA-5657
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5657
 Project: Cassandra
  Issue Type: Task
  Components: Tools
Reporter: Jonathan Ellis
Assignee: Yuki Morishita
 Fix For: 3.0






--
This message was sent by Atlassian JIRA
(v6.2#6252)


[04/15] git commit: add #2635 to CHANGES

2014-03-13 Thread xedin
add #2635 to CHANGES


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

Branch: refs/heads/trunk
Commit: 5030d4215d9d8c380bf48c25fddee7c863599382
Parents: 91d220b
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Mar 13 12:00:47 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Mar 13 12:00:47 2014 -0500

--
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5030d421/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b3c0a35..a68e8ac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -889,6 +889,7 @@ Merged from 1.0:
 
 
 1.1.1
+ * add populate_io_cache_on_flush option (CASSANDRA-2635)
  * allow larger cache capacities than 2GB (CASSANDRA-4150)
  * add getsstables command to nodetool (CASSANDRA-4199)
  * apply parent CF compaction settings to secondary index CFs (CASSANDRA-4280)



[jira] [Resolved] (CASSANDRA-6821) Cassandra can't delete snapshots for keyspaces/tables that no longer exist.

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis resolved CASSANDRA-6821.
---

Resolution: Duplicate

 Cassandra can't delete snapshots for keyspaces/tables that no longer exist.
 ---

 Key: CASSANDRA-6821
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6821
 Project: Cassandra
  Issue Type: Improvement
Reporter: Nick Bailey

 If you drop a keyspace or table you can no longer clean up the snapshots for 
 that keyspace/table without resorting to the command line. It would be nice 
 to be able clean up those via jmx, especially for external tools.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[09/15] git commit: merge from 1.2

2014-03-13 Thread xedin
merge from 1.2


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

Branch: refs/heads/trunk
Commit: a3b314908b5b7b666e7ce782ef4a1a91615847f1
Parents: 92b6d7a 52cf09d
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Mar 13 13:05:11 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Mar 13 13:05:11 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3b31490/CHANGES.txt
--
diff --cc CHANGES.txt
index ce01e5c,325c623..2413b51
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,54 -1,9 +1,57 @@@
 -1.2.16
 +2.0.7
 + * Fix saving triggers to schema (CASSANDRA-6789)
 + * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
 + * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)
 + * Fix static counter columns (CASSANDRA-6827)
 + * Restore expiring-deleted (cell) compaction optimization (CASSANDRA-6844)
 + * Fix CompactionManager.needsCleanup (CASSANDRA-6845)
 + * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779)
++Merged from 1.2:
+  * fix nodetool getsstables for blob PK (CASSANDRA-6803)
++
 +
 +2.0.6
 + * Avoid race-prone second scrub of system keyspace (CASSANDRA-6797)
 + * Pool CqlRecordWriter clients by inetaddress rather than Range 
 +   (CASSANDRA-6665)
 + * Fix compaction_history timestamps (CASSANDRA-6784)
 + * Compare scores of full replica ordering in DES (CASSANDRA-6883)
 + * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577)
 + * Allow repairing between specific replicas (CASSANDRA-6440)
 + * Allow per-dc enabling of hints (CASSANDRA-6157)
 + * Add compatibility for Hadoop 0.2.x (CASSANDRA-5201)
 + * Fix EstimatedHistogram races (CASSANDRA-6682)
 + * Failure detector correctly converts initial value to nanos (CASSANDRA-6658)
 + * Add nodetool taketoken to relocate vnodes (CASSANDRA-4445)
 + * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
 + * Improve nodetool cfhistograms formatting (CASSANDRA-6360)
 + * Expose bulk loading progress over JMX (CASSANDRA-4757)
 + * Correctly handle null with IF conditions and TTL (CASSANDRA-6623)
 + * Account for range/row tombstones in tombstone drop
 +   time histogram (CASSANDRA-6522)
 + * Stop CommitLogSegment.close() from calling sync() (CASSANDRA-6652)
 + * Make commitlog failure handling configurable (CASSANDRA-6364)
 + * Avoid overlaps in LCS (CASSANDRA-6688)
 + * Improve support for paginating over composites (CASSANDRA-4851)
 + * Fix count(*) queries in a mixed cluster (CASSANDRA-6707)
 + * Improve repair tasks(snapshot, differencing) concurrency (CASSANDRA-6566)
 + * Fix replaying pre-2.0 commit logs (CASSANDRA-6714)
 + * Add static columns to CQL3 (CASSANDRA-6561)
 + * Optimize single partition batch statements (CASSANDRA-6737)
 + * Disallow post-query re-ordering when paging (CASSANDRA-6722)
 + * Fix potential paging bug with deleted columns (CASSANDRA-6748)
 + * Fix NPE on BulkLoader caused by losing StreamEvent (CASSANDRA-6636)
 + * Fix truncating compression metadata (CASSANDRA-6791)
 + * Fix UPDATE updating PRIMARY KEY columns implicitly (CASSANDRA-6782)
 + * Fix IllegalArgumentException when updating from 1.2 with SuperColumns
 +   (CASSANDRA-6733)
 + * FBUtilities.singleton() should use the CF comparator (CASSANDRA-6778)
 + * Fix CQLSStableWriter.addRow(MapString, Object) (CASSANDRA-6526)
 + * Fix HSHA server introducing corrupt data (CASSANDRA-6285)
 + * Fix CAS conditions for COMPACT STORAGE tables (CASSANDRA-6813)
 +Merged from 1.2:
   * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541)
   * Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
 - * Don't attempt cross-dc forwarding in mixed-version cluster with 1.1 
 -   (CASSANDRA-6732)
   * Fix broken streams when replacing with same IP (CASSANDRA-6622)
   * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
   * Fix partition and range deletes not triggering flush (CASSANDRA-6655)

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



[03/15] git commit: Move ByteBuffer functions to ByteBufferUtil and avoid duplication

2014-03-13 Thread xedin
Move ByteBuffer functions to ByteBufferUtil and avoid duplication


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

Branch: refs/heads/trunk
Commit: 8a52f5af4f97a9a3062fca2db914ad2fe7e93162
Parents: 3e2c610
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Mar 13 09:11:44 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Mar 13 09:12:13 2014 +0100

--
 .../db/composites/AbstractComposite.java|  5 +-
 .../db/marshal/AbstractCompositeType.java   | 63 
 .../cassandra/db/marshal/CollectionType.java|  6 --
 .../cassandra/db/marshal/CompositeType.java | 12 ++--
 .../db/marshal/DynamicCompositeType.java| 14 ++---
 .../serializers/CollectionSerializer.java   |  6 --
 .../cassandra/serializers/ListSerializer.java   |  9 ++-
 .../cassandra/serializers/MapSerializer.java| 17 ++
 .../cassandra/serializers/SetSerializer.java|  9 ++-
 .../apache/cassandra/utils/ByteBufferUtil.java  | 37 
 10 files changed, 80 insertions(+), 98 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a52f5af/src/java/org/apache/cassandra/db/composites/AbstractComposite.java
--
diff --git a/src/java/org/apache/cassandra/db/composites/AbstractComposite.java 
b/src/java/org/apache/cassandra/db/composites/AbstractComposite.java
index fbff930..9741767 100644
--- a/src/java/org/apache/cassandra/db/composites/AbstractComposite.java
+++ b/src/java/org/apache/cassandra/db/composites/AbstractComposite.java
@@ -22,6 +22,7 @@ import java.nio.ByteBuffer;
 import org.apache.cassandra.db.filter.ColumnSlice;
 import org.apache.cassandra.db.marshal.AbstractCompositeType;
 import org.apache.cassandra.db.marshal.CompositeType;
+import org.apache.cassandra.utils.ByteBufferUtil;
 
 public abstract class AbstractComposite implements Composite
 {
@@ -75,12 +76,12 @@ public abstract class AbstractComposite implements Composite
 // See org.apache.cassandra.db.marshal.CompositeType for details.
 ByteBuffer result = ByteBuffer.allocate(dataSize() + 3 * size() + 
(isStatic() ? 2 : 0));
 if (isStatic())
-AbstractCompositeType.putShortLength(result, 
CompositeType.STATIC_MARKER);
+ByteBufferUtil.writeShortLength(result, 
CompositeType.STATIC_MARKER);
 
 for (int i = 0; i  size(); i++)
 {
 ByteBuffer bb = get(i);
-AbstractCompositeType.putShortLength(result, bb.remaining());
+ByteBufferUtil.writeShortLength(result, bb.remaining());
 result.put(bb.duplicate());
 result.put((byte)0);
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a52f5af/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
--
diff --git 
a/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java 
b/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
index 236abc7..8f3aec4 100644
--- a/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
@@ -17,15 +17,16 @@
  */
 package org.apache.cassandra.db.marshal;
 
-import org.apache.cassandra.serializers.TypeSerializer;
-import org.apache.cassandra.serializers.BytesSerializer;
-import org.apache.cassandra.serializers.MarshalException;
-
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.cassandra.serializers.TypeSerializer;
+import org.apache.cassandra.serializers.BytesSerializer;
+import org.apache.cassandra.serializers.MarshalException;
+import org.apache.cassandra.utils.ByteBufferUtil;
+
 /**
  * A class avoiding class duplication between CompositeType and
  * DynamicCompositeType.
@@ -34,44 +35,6 @@ import java.util.List;
  */
 public abstract class AbstractCompositeType extends AbstractTypeByteBuffer
 {
-
-// changes bb position
-public static int getShortLength(ByteBuffer bb)
-{
-int length = (bb.get()  0xFF)  8;
-return length | (bb.get()  0xFF);
-}
-
-// Doesn't change bb position
-protected static int getShortLength(ByteBuffer bb, int position)
-{
-int length = (bb.get(position)  0xFF)  8;
-return length | (bb.get(position + 1)  0xFF);
-}
-
-// changes bb position
-public static void putShortLength(ByteBuffer bb, int length)
-{
-bb.put((byte) ((length  8)  0xFF));
-bb.put((byte) (length  0xFF));
-  

[08/15] git commit: fix nodetool getsstables for blob PK patch by Nate McCall; reviewed by jbellis for CASSANDRA-6803

2014-03-13 Thread xedin
fix nodetool getsstables for blob PK
patch by Nate McCall; reviewed by jbellis for CASSANDRA-6803


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

Branch: refs/heads/trunk
Commit: 52cf09dbace356bafb846cb9f1fc9df71344f61f
Parents: 5030d42
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Mar 13 13:04:14 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Mar 13 13:04:14 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/52cf09db/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a68e8ac..325c623 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 1.2.16
+ * fix nodetool getsstables for blob PK (CASSANDRA-6803)
  * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541)
  * Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
  * Don't attempt cross-dc forwarding in mixed-version cluster with 1.1 
@@ -21,6 +22,7 @@
  * Fix bootstrapping when there is no schema (CASSANDRA-6685)
  * Fix truncating compression metadata (CASSANDRA-6791)
 
+
 1.2.15
  * Move handling of migration event source to solve bootstrap race 
(CASSANDRA-6648)
  * Make sure compaction throughput value doesn't overflow with int math 
(CASSANDRA-6647)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/52cf09db/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 3841397..9e6987d 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1370,7 +1370,7 @@ public class ColumnFamilyStore implements 
ColumnFamilyStoreMBean
 
 public ListString getSSTablesForKey(String key)
 {
-DecoratedKey dk = new 
DecoratedKey(partitioner.getToken(ByteBuffer.wrap(key.getBytes())), 
ByteBuffer.wrap(key.getBytes()));
+DecoratedKey dk = 
partitioner.decorateKey(metadata.getKeyValidator().fromString(key));
 ViewFragment view = markReferenced(dk);
 try
 {



[13/15] git commit: Fix leaking validator FH in StreamWriter patch by Joshua McKenzie; reviewed by jbellis for CASSANDRA-6832

2014-03-13 Thread xedin
Fix leaking validator FH in StreamWriter
patch by Joshua McKenzie; reviewed by jbellis for CASSANDRA-6832


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

Branch: refs/heads/trunk
Commit: da2d97142b9c76e5fb81df5f94c3d52ef46bf244
Parents: a3b3149
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Mar 13 13:13:48 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Mar 13 13:13:48 2014 -0500

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/streaming/StreamWriter.java | 8 
 2 files changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/da2d9714/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 2413b51..e208e21 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.7
+ * Fix leaking validator FH in StreamWriter (CASSANDRA-6832)
  * Fix saving triggers to schema (CASSANDRA-6789)
  * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
  * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/da2d9714/src/java/org/apache/cassandra/streaming/StreamWriter.java
--
diff --git a/src/java/org/apache/cassandra/streaming/StreamWriter.java 
b/src/java/org/apache/cassandra/streaming/StreamWriter.java
index 04301ba..dbc7390 100644
--- a/src/java/org/apache/cassandra/streaming/StreamWriter.java
+++ b/src/java/org/apache/cassandra/streaming/StreamWriter.java
@@ -71,10 +71,9 @@ public class StreamWriter
 {
 long totalSize = totalSize();
 RandomAccessReader file = sstable.openDataReader();
-ChecksumValidator validator = null;
-if (new File(sstable.descriptor.filenameFor(Component.CRC)).exists())
-validator = 
DataIntegrityMetadata.checksumValidator(sstable.descriptor);
-
+ChecksumValidator validator = new 
File(sstable.descriptor.filenameFor(Component.CRC)).exists()
+? 
DataIntegrityMetadata.checksumValidator(sstable.descriptor)
+: null;
 transferBuffer = validator == null ? new byte[DEFAULT_CHUNK_SIZE] : 
new byte[validator.chunkSize];
 
 // setting up data compression stream
@@ -114,6 +113,7 @@ public class StreamWriter
 {
 // no matter what happens close file
 FileUtils.closeQuietly(file);
+FileUtils.closeQuietly(validator);
 }
 
 // release reference only when completed successfully



[jira] [Resolved] (CASSANDRA-6817) Update gc_grace not taken into account

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis resolved CASSANDRA-6817.
---

Resolution: Cannot Reproduce

 Update gc_grace not taken into account
 --

 Key: CASSANDRA-6817
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6817
 Project: Cassandra
  Issue Type: Bug
  Components: API
 Environment: Red Hat Enterprise Linux ES release 4 (Nahant update 8)
Reporter: Hervé Toulan
Priority: Minor

 1 - connect cassandra using cassandra-cli  [OK]
 2 - select DB to use [OK]
 3 - update column family with;
 [default@BNPPFortis] update column family CallSafety with gc_grace=0;
 5aa7f6fc-968d-3fa5-9e3a-6ece15fe9c15
 Waiting for schema agreement...
 ... schemas agree across the cluster
 4 - check modificatios with:
 [default@BNPPFortis] show schema;
 create column family CallSafety
   with column_type = 'Super'
   and comparator = 'UTF8Type'
   and subcomparator = 'BytesType'
   and default_validation_class = 'BytesType'
   and key_validation_class = 'BytesType'
   and read_repair_chance = 0.1
   and dclocal_read_repair_chance = 0.0
   and gc_grace = 864000
   and min_compaction_threshold = 4
   and max_compaction_threshold = 32
   and replicate_on_write = true
   and compaction_strategy = 
 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
   and caching = 'KEYS_ONLY'
   and compression_options = {'sstable_compression' : 
 'org.apache.cassandra.io.compress.SnappyCompressor'};
 5 - value is not taken into account [KO] 
 6 - inspect system.log:
  INFO [MigrationStage:1] 2014-03-07 11:40:20,558 ColumnFamilyStore.java (line 
 634) Enqueuing flush of Memtable-schema_columnfamilies@24479498(1339/1673 
 serialized/live bytes, 21 ops)
  INFO [FlushWriter:4] 2014-03-07 11:40:20,559 Memtable.java (line 266) 
 Writing Memtable-schema_columnfamilies@24479498(1339/1673 serialized/live 
 bytes, 21 ops)
  INFO [FlushWriter:4] 2014-03-07 11:40:20,571 Memtable.java (line 307) 
 Completed flushing 
 /opt/Alcatel/database/data/system/schema_columnfamilies/system-schema_columnfamilies-hc-38-Data.db
  (1407 bytes)



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6817) Update gc_grace not taken into account

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6817?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934089#comment-13934089
 ] 

Jonathan Ellis commented on CASSANDRA-6817:
---

Feel free to reopen if it's still a problem in 2.0.5 or 2.0.6.

 Update gc_grace not taken into account
 --

 Key: CASSANDRA-6817
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6817
 Project: Cassandra
  Issue Type: Bug
  Components: API
 Environment: Red Hat Enterprise Linux ES release 4 (Nahant update 8)
Reporter: Hervé Toulan
Priority: Minor

 1 - connect cassandra using cassandra-cli  [OK]
 2 - select DB to use [OK]
 3 - update column family with;
 [default@BNPPFortis] update column family CallSafety with gc_grace=0;
 5aa7f6fc-968d-3fa5-9e3a-6ece15fe9c15
 Waiting for schema agreement...
 ... schemas agree across the cluster
 4 - check modificatios with:
 [default@BNPPFortis] show schema;
 create column family CallSafety
   with column_type = 'Super'
   and comparator = 'UTF8Type'
   and subcomparator = 'BytesType'
   and default_validation_class = 'BytesType'
   and key_validation_class = 'BytesType'
   and read_repair_chance = 0.1
   and dclocal_read_repair_chance = 0.0
   and gc_grace = 864000
   and min_compaction_threshold = 4
   and max_compaction_threshold = 32
   and replicate_on_write = true
   and compaction_strategy = 
 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
   and caching = 'KEYS_ONLY'
   and compression_options = {'sstable_compression' : 
 'org.apache.cassandra.io.compress.SnappyCompressor'};
 5 - value is not taken into account [KO] 
 6 - inspect system.log:
  INFO [MigrationStage:1] 2014-03-07 11:40:20,558 ColumnFamilyStore.java (line 
 634) Enqueuing flush of Memtable-schema_columnfamilies@24479498(1339/1673 
 serialized/live bytes, 21 ops)
  INFO [FlushWriter:4] 2014-03-07 11:40:20,559 Memtable.java (line 266) 
 Writing Memtable-schema_columnfamilies@24479498(1339/1673 serialized/live 
 bytes, 21 ops)
  INFO [FlushWriter:4] 2014-03-07 11:40:20,571 Memtable.java (line 307) 
 Completed flushing 
 /opt/Alcatel/database/data/system/schema_columnfamilies/system-schema_columnfamilies-hc-38-Data.db
  (1407 bytes)



--
This message was sent by Atlassian JIRA
(v6.2#6252)


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

2014-03-13 Thread xedin
Merge branch cassandra-2.1 into trunk


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

Branch: refs/heads/trunk
Commit: 67feb71eef95abc738048e7fecedff41355977ac
Parents: c0aa746 4c22b16
Author: Pavel Yaskevich xe...@apache.org
Authored: Thu Mar 13 14:21:49 2014 -0700
Committer: Pavel Yaskevich xe...@apache.org
Committed: Thu Mar 13 14:21:49 2014 -0700

--
 CHANGES.txt |  11 ++
 ...assandra-driver-internal-only-1.0.2.post.zip | Bin 95836 - 95846 bytes
 pylib/cqlshlib/cql3handling.py  |   6 +-
 .../apache/cassandra/db/ColumnFamilyStore.java  |   2 +-
 .../db/composites/AbstractComposite.java|   5 +-
 .../db/marshal/AbstractCompositeType.java   |  63 +++
 .../cassandra/db/marshal/CollectionType.java|   6 -
 .../cassandra/db/marshal/CompositeType.java |  12 +-
 .../db/marshal/DynamicCompositeType.java|  14 +--
 .../serializers/CollectionSerializer.java   |   6 -
 .../cassandra/serializers/ListSerializer.java   |   9 +-
 .../cassandra/serializers/MapSerializer.java|  17 +--
 .../cassandra/serializers/SetSerializer.java|   9 +-
 .../cassandra/streaming/StreamWriter.java   |   8 +-
 .../apache/cassandra/utils/ByteBufferUtil.java  |  37 +++
 .../org/apache/cassandra/utils/FBUtilities.java |   2 +-
 .../org/apache/cassandra/stress/Operation.java  | 109 +--
 .../apache/cassandra/stress/StressAction.java   |   4 +-
 .../cassandra/stress/generatedata/RowGen.java   |   1 +
 .../generatedata/RowGenDistributedSize.java |   7 ++
 .../stress/operations/CqlCounterAdder.java  |  21 ++--
 .../stress/operations/CqlCounterGetter.java |  13 ++-
 .../operations/CqlIndexedRangeSlicer.java   |  18 +--
 .../stress/operations/CqlInserter.java  |  10 +-
 .../stress/operations/CqlOperation.java |  68 
 .../stress/operations/CqlRangeSlicer.java   |   8 +-
 .../cassandra/stress/operations/CqlReader.java  |  12 +-
 .../stress/operations/ThriftCounterAdder.java   |  12 +-
 .../stress/operations/ThriftCounterGetter.java  |  15 +--
 .../operations/ThriftIndexedRangeSlicer.java|   5 +-
 .../stress/operations/ThriftInserter.java   |   6 +-
 .../stress/operations/ThriftMultiGetter.java|   3 +-
 .../stress/operations/ThriftRangeSlicer.java|   3 +-
 .../stress/operations/ThriftReader.java |  16 +--
 .../cassandra/stress/settings/Command.java  |  72 +++-
 .../cassandra/stress/settings/Option.java   |   1 +
 .../stress/settings/OptionDataGen.java  |   5 +
 .../stress/settings/OptionDistribution.java |  13 ++-
 .../cassandra/stress/settings/OptionMulti.java  |  39 ++-
 .../stress/settings/OptionReplication.java  |   2 +-
 .../cassandra/stress/settings/OptionSimple.java |   2 +-
 .../stress/settings/SettingsColumn.java |  29 +++--
 .../stress/settings/SettingsCommand.java|  30 ++---
 .../stress/settings/SettingsCommandMixed.java   |  46 
 .../stress/settings/SettingsCommandMulti.java   |  90 ---
 .../cassandra/stress/settings/SettingsKey.java  |   2 +-
 .../cassandra/stress/settings/SettingsMisc.java |   4 +-
 .../cassandra/stress/settings/SettingsMode.java |  31 +-
 .../stress/settings/SettingsSchema.java |   7 +-
 .../stress/settings/SettingsTransport.java  |   2 +-
 .../stress/settings/StressSettings.java |  30 +++--
 .../cassandra/stress/util/JavaDriverClient.java |   4 +-
 52 files changed, 506 insertions(+), 441 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/67feb71e/tools/stress/src/org/apache/cassandra/stress/Operation.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/67feb71e/tools/stress/src/org/apache/cassandra/stress/operations/CqlCounterAdder.java
--
diff --cc 
tools/stress/src/org/apache/cassandra/stress/operations/CqlCounterAdder.java
index 910b6ed,9a8c37d..4e333a4
--- 
a/tools/stress/src/org/apache/cassandra/stress/operations/CqlCounterAdder.java
+++ 
b/tools/stress/src/org/apache/cassandra/stress/operations/CqlCounterAdder.java
@@@ -22,9 -22,12 +22,9 @@@ package org.apache.cassandra.stress.ope
  
  
  import java.nio.ByteBuffer;
- import java.util.Collections;
+ import java.util.ArrayList;
 -import java.util.Collections;
  import java.util.List;
  
 -import 

[07/15] git commit: Minor tweaks for 'caching' option

2014-03-13 Thread xedin
Minor tweaks for 'caching' option


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

Branch: refs/heads/trunk
Commit: fab5509898152072ba1f6ecb3d208e2bbe234495
Parents: e344314
Author: Mikhail Stepura mish...@apache.org
Authored: Wed Mar 12 19:56:28 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 10:06:56 2014 -0700

--
 pylib/cqlshlib/cql3handling.py | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fab55098/pylib/cqlshlib/cql3handling.py
--
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index ae03cde..8e9f987 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -419,6 +419,8 @@ def cf_prop_val_completer(ctxt, cass):
 return [{'sstable_compression': ']
 if this_opt == 'compaction':
 return [{'class': ']
+if this_opt == 'caching':
+return [{'keys': ']
 if any(this_opt == opt[0] for opt in CqlRuleSet.obsolete_cf_options):
 return ['obsolete_option']
 if this_opt in ('read_repair_chance', 'bloom_filter_fp_chance',
@@ -472,9 +474,9 @@ def cf_prop_val_mapval_completer(ctxt, cass):
 return [Hint('option_value')]
 elif opt == 'caching':
 if key == 'rows_per_partition':
-return [Hint('ALL'), Hint('NONE'), Hint('#rows_per_partition')]
+return ['ALL', 'NONE', Hint('#rows_per_partition')]
 elif key == 'keys':
-return [Hint('ALL'), Hint('NONE')]
+return ['ALL', 'NONE']
 return ()
 
 def cf_prop_val_mapender_completer(ctxt, cass):



[jira] [Resolved] (CASSANDRA-6698) Many too small SSTables when full repair

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis resolved CASSANDRA-6698.
---

Resolution: Cannot Reproduce

 Many too small SSTables when full repair
 

 Key: CASSANDRA-6698
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6698
 Project: Cassandra
  Issue Type: Improvement
Reporter: Roman Skvazh
Priority: Minor
 Attachments: cassa-many-small-sstables.txt


 We have troubles when cassandra drops messages because there is too many 
 (over 10,000 on one column family) small (from 1Kb to 200Kb, and normal sizes 
 too) and many pending compactions (over 700).
 We are using Leveled compaction with 160Mb sstable size.
 PS. Temp fix: stop repair, disable thrift,gossip and wait for compactions to 
 be finished. Because this, we can not run full repair for about a month :(



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[01/15] Fix stress to do proper counter reads Patch by Benedict Elliott Smith; reviewed by Pavel Yaskevich for CASSANDRA-6835

2014-03-13 Thread xedin
Repository: cassandra
Updated Branches:
  refs/heads/trunk c0aa7467e - 67feb71ee


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e2c6105/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandMulti.java
--
diff --git 
a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandMulti.java
 
b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandMulti.java
deleted file mode 100644
index 79937b6..000
--- 
a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandMulti.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.apache.cassandra.stress.settings;
-/*
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- */
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-// Settings common to commands that operate over multiple keys at once
-public class SettingsCommandMulti extends SettingsCommand
-{
-
-public final int keysAtOnce;
-
-public SettingsCommandMulti(Command type, Options options)
-{
-super(type, options.parent);
-this.keysAtOnce = Integer.parseInt(options.maxKeys.value());
-}
-
-// Option Declarations
-
-static final class Options extends GroupedOptions
-{
-final GroupedOptions parent;
-Options(GroupedOptions parent)
-{
-this.parent = parent;
-}
-final OptionSimple maxKeys = new OptionSimple(at-once=, [0-9]+, 
1000, Number of keys per operation, false);
-
-@Override
-public List? extends Option options()
-{
-final ListOption options = new ArrayList();
-options.add(maxKeys);
-options.addAll(parent.options());
-return options;
-}
-}
-
-// CLI Utility Methods
-
-public static SettingsCommand build(Command type, String[] params)
-{
-GroupedOptions options = GroupedOptions.select(params, new Options(new 
Uncertainty()), new Options(new Count()));
-if (options == null)
-{
-printHelp(type);
-System.out.println(Invalid  + type +  options provided, see 
output for valid options);
-System.exit(1);
-}
-return new SettingsCommandMulti(type, (Options) options);
-}
-
-public static void printHelp(Command type)
-{
-GroupedOptions.printOptions(System.out, type.toString().toLowerCase(), 
new Options(new Uncertainty()), new Options(new Count()));
-}
-
-public static Runnable helpPrinter(final Command type)
-{
-return new Runnable()
-{
-@Override
-public void run()
-{
-printHelp(type);
-}
-};
-}
-}

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e2c6105/tools/stress/src/org/apache/cassandra/stress/settings/SettingsKey.java
--
diff --git 
a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsKey.java 
b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsKey.java
index c742274..9818d363 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsKey.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsKey.java
@@ -63,7 +63,7 @@ public class SettingsKey implements Serializable
 
 public DistributionOptions(String defaultLimit)
 {
-dist = new OptionDistribution(dist=, GAUSSIAN(1.. + 
defaultLimit + ));
+dist = new OptionDistribution(dist=, GAUSSIAN(1.. + 
defaultLimit + ), Keys are selected from this distribution);
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e2c6105/tools/stress/src/org/apache/cassandra/stress/settings/SettingsMisc.java
--
diff --git 
a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsMisc.java 
b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsMisc.java
index dfb29c5..e47f85f 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsMisc.java
+++ 

[jira] [Commented] (CASSANDRA-6633) Investigate Bloom Filter Improvements

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6633?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934111#comment-13934111
 ] 

Jonathan Ellis commented on CASSANDRA-6633:
---

so, close this as Later or Notaproblem?

 Investigate Bloom Filter Improvements
 -

 Key: CASSANDRA-6633
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6633
 Project: Cassandra
  Issue Type: Improvement
Reporter: Benedict

 Investigate various possible improvements to our bloom filters:
 1) Dynamic resizing would be useful. There are a few ways this could be 
 achieved: with some modification, downsampling could be supported; 
 partitioning the hash functions so that we may select the number of 
 hashes/bits dynamically, by loading/unloading a given partition; and there 
 are some related data structures, such as Quotient Filters that support 
 resizing and merging.
 2) Faster loading: should be possible to mmap the bloom filter representation 
 on disk
 3) Most ambitious of all, would be to try to reduce the memory requirement of 
 bloom filters. Golomb Coded Sets 
 [1|http://algo2.iti.kit.edu/singler/publications/cacheefficientbloomfilters-wea2007.pdf]
  are a possibility, as are other compressed hash structures 
 [2|http://www.it-c.dk/people/pagh/papers/bloom.pdf].



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[12/15] git commit: Python-driver without a hard dependency on `scales`

2014-03-13 Thread xedin
Python-driver without a hard dependency on `scales`


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

Branch: refs/heads/trunk
Commit: a2ceb22c59e9c2d1bb3717b2703a7cf181997d3d
Parents: c342965
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 11:06:23 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 11:07:09 2014 -0700

--
 ...assandra-driver-internal-only-1.0.2.post.zip | Bin 95836 - 95846 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2ceb22c/lib/cassandra-driver-internal-only-1.0.2.post.zip
--
diff --git a/lib/cassandra-driver-internal-only-1.0.2.post.zip 
b/lib/cassandra-driver-internal-only-1.0.2.post.zip
index 9f6af56..7ccd5f7 100644
Binary files a/lib/cassandra-driver-internal-only-1.0.2.post.zip and 
b/lib/cassandra-driver-internal-only-1.0.2.post.zip differ



[jira] [Updated] (CASSANDRA-6643) Limit user types to the keyspace they are defined in

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6643:
--

Assignee: Sylvain Lebresne

 Limit user types to the keyspace they are defined in
 

 Key: CASSANDRA-6643
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6643
 Project: Cassandra
  Issue Type: Bug
 Environment: java version 1.7.0_51
 cassandra from trunk, 4b54b8...
Reporter: Russ Hatch
Assignee: Sylvain Lebresne
Priority: Minor
 Fix For: 2.1 beta2


 I'm not 100% certain this is a bug.
 The current syntax for alter type rename requires the keyspace on the old 
 and new table name (if a keyspace is not active). So, to rename the type 
 'foo' to 'bar', you have to issue this statement:
 ALTER TYPE ks.foo rename to ks.bar .
 As a result, this syntax will also allow renaming the type into another 
 existing keyspace, which updates the metadata in system.schema_usertypes.
 I'm wondering if perhaps we can omit the second keyspace prefix and 
 implicitly rename into the same keyspace.
 To reproduce:
 {noformat}
 cqlsh create keyspace user_types with replication = 
 {'class':'SimpleStrategy', 'replication_factor':3} ;
 cqlsh create keyspace user_types2 with replication = 
 {'class':'SimpleStrategy', 'replication_factor':3} ;
 cqlsh CREATE TYPE user_types.simple_type (user_number int);
 cqlsh alter type user_types.simple_type rename to user_types2.simple_type;
 {noformat}
 Renaming to another keyspace is also possible when a keyspace is active, like 
 so:
 {noformat}
 cqlsh:user_types alter type simple_type rename to user_types2.simple_type;
 {noformat}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6643) Limit user types to the keyspace they are defined in

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6643:
--

Fix Version/s: 2.1 beta2

 Limit user types to the keyspace they are defined in
 

 Key: CASSANDRA-6643
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6643
 Project: Cassandra
  Issue Type: Bug
 Environment: java version 1.7.0_51
 cassandra from trunk, 4b54b8...
Reporter: Russ Hatch
Assignee: Sylvain Lebresne
Priority: Minor
 Fix For: 2.1 beta2


 I'm not 100% certain this is a bug.
 The current syntax for alter type rename requires the keyspace on the old 
 and new table name (if a keyspace is not active). So, to rename the type 
 'foo' to 'bar', you have to issue this statement:
 ALTER TYPE ks.foo rename to ks.bar .
 As a result, this syntax will also allow renaming the type into another 
 existing keyspace, which updates the metadata in system.schema_usertypes.
 I'm wondering if perhaps we can omit the second keyspace prefix and 
 implicitly rename into the same keyspace.
 To reproduce:
 {noformat}
 cqlsh create keyspace user_types with replication = 
 {'class':'SimpleStrategy', 'replication_factor':3} ;
 cqlsh create keyspace user_types2 with replication = 
 {'class':'SimpleStrategy', 'replication_factor':3} ;
 cqlsh CREATE TYPE user_types.simple_type (user_number int);
 cqlsh alter type user_types.simple_type rename to user_types2.simple_type;
 {noformat}
 Renaming to another keyspace is also possible when a keyspace is active, like 
 so:
 {noformat}
 cqlsh:user_types alter type simple_type rename to user_types2.simple_type;
 {noformat}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6646) Disk Failure Policy ignores CorruptBlockException

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6646:
--

Fix Version/s: 2.0.7
   2.1 beta2
 Assignee: Marcus Eriksson

 Disk Failure Policy ignores CorruptBlockException 
 --

 Key: CASSANDRA-6646
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6646
 Project: Cassandra
  Issue Type: Bug
Reporter: sankalp kohli
Assignee: Marcus Eriksson
Priority: Minor
 Fix For: 2.0.7, 2.1 beta2


 If Cassandra is using compression and has a bad drive or stable, it will 
 throw an CorruptBlockException. 
 Disk Failure Policy only works if it is an FSError and does not work for 
 IOExceptions like this. 
 We need to better handle such exceptions as it causes nodes to not respond to 
 the co-ordinator causing the client to timeout. 



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6646) Disk Failure Policy ignores CorruptBlockException

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6646:
--

Issue Type: Bug  (was: Improvement)

 Disk Failure Policy ignores CorruptBlockException 
 --

 Key: CASSANDRA-6646
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6646
 Project: Cassandra
  Issue Type: Bug
Reporter: sankalp kohli
Priority: Minor
 Fix For: 2.0.7, 2.1 beta2


 If Cassandra is using compression and has a bad drive or stable, it will 
 throw an CorruptBlockException. 
 Disk Failure Policy only works if it is an FSError and does not work for 
 IOExceptions like this. 
 We need to better handle such exceptions as it causes nodes to not respond to 
 the co-ordinator causing the client to timeout. 



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6816) CQL3 docs don't mention BATCH UNLOGGED

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6816:
--

Assignee: Tyler Hobbs

 CQL3 docs don't mention BATCH UNLOGGED
 --

 Key: CASSANDRA-6816
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6816
 Project: Cassandra
  Issue Type: Bug
  Components: Documentation  website
Reporter: Duncan Sands
Assignee: Tyler Hobbs
Priority: Minor

 Here http://cassandra.apache.org/doc/cql3/CQL.html#batchStmt there is no 
 mentioned of BATCH UNLOGGED or BATCH COUNTER.  The datastax documentation has 
 it: 
 http://www.datastax.com/documentation/cql/3.0/cql/cql_reference/batch_r.html



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[05/15] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-03-13 Thread xedin
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/trunk
Commit: 92b6d7a3900dbaf97a8ae7283aecd23aa1f2a25e
Parents: faffbf2 5030d42
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Mar 13 12:00:56 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Mar 13 12:00:56 2014 -0500

--
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
--


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



[jira] [Commented] (CASSANDRA-6621) STCS fallback is probably not optimal in some scenarios

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6621?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934115#comment-13934115
 ] 

Jonathan Ellis commented on CASSANDRA-6621:
---

bq. If we stream different regions from different nodes how can we get any 
overlaps?

This would work for bootstrap but not for repair.  Right now I don't think 
streaming distinguishes between those scenarios.

 STCS fallback is probably not optimal in some scenarios
 ---

 Key: CASSANDRA-6621
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6621
 Project: Cassandra
  Issue Type: Improvement
Reporter: Bartłomiej Romański

 The initial discussion started in (closed) CASSANDRA-5371. I've rewritten my 
 last comment here...
 After streaming (e.g. during boostrap) Cassandra places all sstables at L0. 
 At the end of the process we end up with huge number of sstables at the 
 lowest level. 
 Currently, Cassandra falls back to STCS until the number of sstables at L0 
 reaches the reasonable level (32 or something).
 I'm not sure if falling back to STCS is the best way to handle this 
 particular situation. I've read the comment in the code and I'm aware why it 
 is a good thing to do if we have to many sstables at L0 as a result of too 
 many random inserts. We have a lot of sstables, each of them covers the whole 
 ring, there's simply no better option.
 However, after the bootstrap situation looks a bit different. The loaded 
 sstables already have very small ranges! We just have to tidy up a bit and 
 everything should be OK. STCS ignores that completely and after a while we 
 have a bit less sstables but each of them covers the whole ring instead of 
 just a small part. I believe that in that case letting LCS do the job is a 
 better option that allowing STCS mix everything up before.
 Is there a way to disable STCS fallback? I'd like to test that scenario in 
 practice during our next bootstrap...
 Does Cassandra really have to put streamed sstables at L0? The only thing we 
 have to assure is that sstables at any given level do not overlap. If we 
 stream different regions from different nodes how can we get any overlaps?



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6621) STCS fallback is not optimal when bootstrapping

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6621:
--

Priority: Minor  (was: Major)
 Summary: STCS fallback is not optimal when bootstrapping  (was: STCS 
fallback is probably not optimal in some scenarios)

 STCS fallback is not optimal when bootstrapping
 ---

 Key: CASSANDRA-6621
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6621
 Project: Cassandra
  Issue Type: Improvement
Reporter: Bartłomiej Romański
Priority: Minor

 The initial discussion started in (closed) CASSANDRA-5371. I've rewritten my 
 last comment here...
 After streaming (e.g. during boostrap) Cassandra places all sstables at L0. 
 At the end of the process we end up with huge number of sstables at the 
 lowest level. 
 Currently, Cassandra falls back to STCS until the number of sstables at L0 
 reaches the reasonable level (32 or something).
 I'm not sure if falling back to STCS is the best way to handle this 
 particular situation. I've read the comment in the code and I'm aware why it 
 is a good thing to do if we have to many sstables at L0 as a result of too 
 many random inserts. We have a lot of sstables, each of them covers the whole 
 ring, there's simply no better option.
 However, after the bootstrap situation looks a bit different. The loaded 
 sstables already have very small ranges! We just have to tidy up a bit and 
 everything should be OK. STCS ignores that completely and after a while we 
 have a bit less sstables but each of them covers the whole ring instead of 
 just a small part. I believe that in that case letting LCS do the job is a 
 better option that allowing STCS mix everything up before.
 Is there a way to disable STCS fallback? I'd like to test that scenario in 
 practice during our next bootstrap...
 Does Cassandra really have to put streamed sstables at L0? The only thing we 
 have to assure is that sstables at any given level do not overlap. If we 
 stream different regions from different nodes how can we get any overlaps?



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6796) StorageProxy may submit hint to itself (with an assert) for CL.Any

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6796:
--

Fix Version/s: 2.0.7

 StorageProxy may submit hint to itself (with an assert) for CL.Any
 --

 Key: CASSANDRA-6796
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6796
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Viktor Kuzmin
Priority: Minor
 Fix For: 2.0.7


 StorageProxy.mutate may  produce WriteTimoutException and with 
 ConsistencyLevel.ANY it tries to submitHint. But submitHint function have 
 assertation - we may not send hints to ourself. That may lead to exception 
 (in case we're among natural endpoints) and hint will be not submitted to 
 other endpoints.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6800) ant codecoverage no longer works

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6800:
--

Summary: ant codecoverage no longer works  (was: ant codecoverage no longer 
works due jdk 1.7)

 ant codecoverage no longer works
 

 Key: CASSANDRA-6800
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6800
 Project: Cassandra
  Issue Type: Bug
  Components: Tests
Reporter: Edward Capriolo
Priority: Minor
 Fix For: 2.1 beta2


 Code coverage does not run currently due to cobertura jdk incompatibility. 
 Fix is coming. 



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[10/15] git commit: merge from 2.0

2014-03-13 Thread xedin
merge from 2.0


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

Branch: refs/heads/trunk
Commit: 105dcdbf320a068de9b28c4c182fd37bd1292906
Parents: e344314 a3b3149
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Mar 13 13:06:07 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Mar 13 13:06:07 2014 -0500

--
 CHANGES.txt | 8 
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/105dcdbf/CHANGES.txt
--
diff --cc CHANGES.txt
index 27cb235,2413b51..eb82a1c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,16 +1,30 @@@
 -2.0.7
 +2.1.0-beta2
 + * Apply DONTNEED fadvise to commitlog segments (CASSANDRA-6759)
 + * Switch CRC component to Adler and include it for compressed sstables 
 +   (CASSANDRA-4165)
 + * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451)
 + * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899)
 + * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897)
 + * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573)
 + * Fix ABTC NPE and apply update function correctly (CASSANDRA-6692)
 + * Allow nodetool to use a file or prompt for password (CASSANDRA-6660)
 + * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742)
 + * Fix assertion error in ALTER TYPE RENAME (CASSANDRA-6705)
 + * Scrub should not always clear out repaired status (CASSANDRA-5351)
 + * Improve handling of range tombstone for wide partitions (CASSANDRA-6446)
 + * Fix ClassCastException for compact table with composites (CASSANDRA-6738)
 + * Fix potentially repairing with wrong nodes (CASSANDRA-6808)
 + * Change caching option syntax (CASSANDRA-6745)
 + * Fix stress to do proper counter reads (CASSANDRA-6835)
 +Merged from 2.0:
++ * fix nodetool getsstables for blob PK (CASSANDRA-6803)
+  * Fix saving triggers to schema (CASSANDRA-6789)
+  * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
+  * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)
+  * Fix static counter columns (CASSANDRA-6827)
+  * Restore expiring-deleted (cell) compaction optimization (CASSANDRA-6844)
+  * Fix CompactionManager.needsCleanup (CASSANDRA-6845)
+  * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779)
 -Merged from 1.2:
 - * fix nodetool getsstables for blob PK (CASSANDRA-6803)
 -
 -
 -2.0.6
   * Avoid race-prone second scrub of system keyspace (CASSANDRA-6797)
   * Pool CqlRecordWriter clients by inetaddress rather than Range 
 (CASSANDRA-6665)

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



[11/15] git commit: Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1

2014-03-13 Thread xedin
Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: c342965810302bf13ed4bbb2f2301c6358dfb4a4
Parents: 105dcdb fab5509
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Mar 13 13:06:28 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Mar 13 13:06:28 2014 -0500

--
 pylib/cqlshlib/cql3handling.py | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--




[jira] [Resolved] (CASSANDRA-6616) Nodetool repair is taking a long time.

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis resolved CASSANDRA-6616.
---

Resolution: Not A Problem

 Nodetool repair is taking a long time. 
 ---

 Key: CASSANDRA-6616
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6616
 Project: Cassandra
  Issue Type: Bug
  Components: Core
 Environment: Cassandra Version 2.0.4 running on Redhat Version 6
Reporter: Dharsan Logendran

 We have a two  nodes cluster with the replication factor of 2.   The db has 
 more than 2500 column families(tables).   The 'nodetool -pr -par' repair on 
 an empty database(one or table has a litter data) takes about 30 hours to 
 complete.  
  



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[14/15] git commit: merge from 2.0

2014-03-13 Thread xedin
merge from 2.0


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

Branch: refs/heads/trunk
Commit: 4c22b165cb5ba89f0454f563eeb76e4de2b01367
Parents: a2ceb22 da2d971
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Mar 13 13:14:15 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Mar 13 13:14:15 2014 -0500

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/streaming/StreamWriter.java | 8 
 2 files changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c22b165/CHANGES.txt
--
diff --cc CHANGES.txt
index eb82a1c,e208e21..6a44d80
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,5 +1,24 @@@
 -2.0.7
 +2.1.0-beta2
 + * Apply DONTNEED fadvise to commitlog segments (CASSANDRA-6759)
 + * Switch CRC component to Adler and include it for compressed sstables 
 +   (CASSANDRA-4165)
 + * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451)
 + * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899)
 + * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897)
 + * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573)
 + * Fix ABTC NPE and apply update function correctly (CASSANDRA-6692)
 + * Allow nodetool to use a file or prompt for password (CASSANDRA-6660)
 + * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742)
 + * Fix assertion error in ALTER TYPE RENAME (CASSANDRA-6705)
 + * Scrub should not always clear out repaired status (CASSANDRA-5351)
 + * Improve handling of range tombstone for wide partitions (CASSANDRA-6446)
 + * Fix ClassCastException for compact table with composites (CASSANDRA-6738)
 + * Fix potentially repairing with wrong nodes (CASSANDRA-6808)
 + * Change caching option syntax (CASSANDRA-6745)
 + * Fix stress to do proper counter reads (CASSANDRA-6835)
 +Merged from 2.0:
+  * Fix leaking validator FH in StreamWriter (CASSANDRA-6832)
 + * fix nodetool getsstables for blob PK (CASSANDRA-6803)
   * Fix saving triggers to schema (CASSANDRA-6789)
   * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
   * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c22b165/src/java/org/apache/cassandra/streaming/StreamWriter.java
--



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

2014-03-13 Thread xedin
Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: e3443145c7126a1933d24246efa7ff17accd542e
Parents: 8a52f5a 92b6d7a
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Mar 13 12:01:13 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Mar 13 12:01:13 2014 -0500

--
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
--


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



[1/8] git commit: Load a truststore if client certificate authentication is enabled

2014-03-13 Thread mishail
Repository: cassandra
Updated Branches:
  refs/heads/trunk 67feb71ee - 17af71ee3


Load a truststore if client certificate authentication is enabled

patch by Mikhail Stepura; reviewed by Jason Brown for CASSANDRA-6847


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

Branch: refs/heads/trunk
Commit: 173df48bb36402bf59accb02537450703b8eedd8
Parents: 52cf09d
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 11:27:43 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 13:05:31 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/173df48b/src/java/org/apache/cassandra/transport/Server.java
--
diff --git a/src/java/org/apache/cassandra/transport/Server.java 
b/src/java/org/apache/cassandra/transport/Server.java
index 0ffb92b..5773728 100644
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@ -257,7 +257,7 @@ public class Server implements CassandraDaemon.Server
 this.encryptionOptions = encryptionOptions;
 try
 {
-this.sslContext = 
SSLFactory.createSSLContext(encryptionOptions, false);
+this.sslContext = 
SSLFactory.createSSLContext(encryptionOptions, 
encryptionOptions.require_client_auth);
 }
 catch (IOException e)
 {



[5/8] git commit: Delimiter not working for special characters in COPY command from CQLSH

2014-03-13 Thread mishail
Delimiter not working for special characters in COPY command from CQLSH

patch by Shiti Saxena; reviewed by Mikhail Stepura for CASSANDRA-6773


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

Branch: refs/heads/trunk
Commit: 972d3da2e87d2e6770ed70ab45aa9dedc0fdf779
Parents: 173df48
Author: Shiti Saxena ssaxena@gmail.com
Authored: Thu Mar 13 14:06:51 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 14:06:51 2014 -0700

--
 bin/cqlsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/972d3da2/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index 5ccab3d..4bf1b76 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1635,7 +1635,8 @@ class Shell(cmd.Cmd):
 fname = os.path.expanduser(self.cql_unprotect_value(fname))
 copyoptnames = map(str.lower, parsed.get_binding('optnames', ()))
 copyoptvals = map(self.cql_unprotect_value, 
parsed.get_binding('optvals', ()))
-opts = dict(zip(copyoptnames, copyoptvals))
+cleancopyoptvals  = [optval.decode('string-escape') for optval in 
copyoptvals]
+opts = dict(zip(copyoptnames, cleancopyoptvals))
 
 timestart = time.time()
 



[2/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-03-13 Thread mishail
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/trunk
Commit: dce5599953adfabb5a6ecace37a5c4c6de3e7885
Parents: da2d971 173df48
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 13:05:52 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 13:05:52 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dce55999/src/java/org/apache/cassandra/transport/Server.java
--



[6/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-03-13 Thread mishail
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/trunk
Commit: 3dcc8c25e542d5473a78404a027ca6acb3cc065f
Parents: dce5599 972d3da
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 14:07:04 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 14:07:04 2014 -0700

--
 bin/cqlsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3dcc8c25/bin/cqlsh
--



[8/8] git commit: Merge branch 'cassandra-2.1' into trunk

2014-03-13 Thread mishail
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 17af71ee31c084a470dead4144a1cfc73dc3bd0a
Parents: 67feb71 f49df8c
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 14:33:46 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 14:33:46 2014 -0700

--
 bin/cqlsh   | 3 ++-
 pylib/cqlshlib/test/test_cqlsh_output.py| 3 +--
 src/java/org/apache/cassandra/transport/Server.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
--




[jira] [Commented] (CASSANDRA-6613) Java 7u51 breaks internode encryption

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6613?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934120#comment-13934120
 ] 

Jonathan Ellis commented on CASSANDRA-6613:
---

How did that work for you, Ray?

 Java 7u51 breaks internode encryption
 -

 Key: CASSANDRA-6613
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6613
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Ray Sinnema
 Attachments: 6613.txt


 With the latest update of the Oracle JRE (7u51) internode encryption no 
 longer works, since none of the cipher suites 
 (TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA) that Cassandra 
 supports work anymore. 
 I see this in the log file:
 WARN  o.a.cassandra.security.SSLFactory - Filtering out 
 TLS_RSA_WITH_AES_256_CBC_SHA as it isnt supported by the socket
 See http://www.oracle.com/technetwork/java/javase/7u51-relnotes-2085002.html 
 (all the way at the bottom) for more information.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[4/8] git commit: Adjusted cqlshlib tests for CASSANDRA-6745

2014-03-13 Thread mishail
Adjusted cqlshlib tests for CASSANDRA-6745


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

Branch: refs/heads/trunk
Commit: c3f40fd7b34e35a6438a2b06d78827173cd2eca4
Parents: 51220ff
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 13:27:26 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 13:27:26 2014 -0700

--
 pylib/cqlshlib/test/test_cqlsh_output.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3f40fd7/pylib/cqlshlib/test/test_cqlsh_output.py
--
diff --git a/pylib/cqlshlib/test/test_cqlsh_output.py 
b/pylib/cqlshlib/test/test_cqlsh_output.py
index f3e9b57..212f847 100644
--- a/pylib/cqlshlib/test/test_cqlsh_output.py
+++ b/pylib/cqlshlib/test/test_cqlsh_output.py
@@ -652,7 +652,7 @@ class TestCqlshOutput(BaseTestCase):
 varcharcol text,
 varintcol varint
 ) WITH bloom_filter_fp_chance = 0.01
-AND caching = 'KEYS_ONLY'
+AND caching = '{keys:ALL, rows_per_partition:NONE}'
 AND comment = ''
 AND compaction = {'min_threshold': '4', 'class': 
'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy', 
'max_threshold': '32'}
 AND compression = {'sstable_compression': 
'org.apache.cassandra.io.compress.LZ4Compressor'}
@@ -663,7 +663,6 @@ class TestCqlshOutput(BaseTestCase):
 AND min_index_interval = 128
 AND populate_io_cache_on_flush = false
 AND read_repair_chance = 0.1
-AND rows_per_partition_to_cache = '100'
 AND speculative_retry = '99.0PERCENTILE';
 
  % quote_name(get_test_keyspace()))



[jira] [Updated] (CASSANDRA-6814) We should ensure that AbstractReadExecutor.makeDigestRequests never calls the local machine

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6814:
--

Assignee: Vijay

 We should ensure that AbstractReadExecutor.makeDigestRequests never calls the 
 local machine
 ---

 Key: CASSANDRA-6814
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6814
 Project: Cassandra
  Issue Type: Improvement
Reporter: Benedict
Assignee: Vijay
Priority: Minor
 Fix For: 3.0


 It should always opt to perform the actual read locally, when possible, and 
 this code path should assert that it does not read locally.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[3/8] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-03-13 Thread mishail
Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 51220ffe2a2b73fc976635da5464573d0cb7ea93
Parents: 4c22b16 dce5599
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 13:06:03 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 13:06:03 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/51220ffe/src/java/org/apache/cassandra/transport/Server.java
--



[7/8] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-03-13 Thread mishail
Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: f49df8c9b0e37bb23e981c3ce2cb17735051e068
Parents: c3f40fd 3dcc8c2
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 14:07:15 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 14:07:15 2014 -0700

--
 bin/cqlsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49df8c9/bin/cqlsh
--



[jira] [Commented] (CASSANDRA-6814) We should ensure that AbstractReadExecutor.makeDigestRequests never calls the local machine

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6814?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934092#comment-13934092
 ] 

Jonathan Ellis commented on CASSANDRA-6814:
---

Want to take a stab at this, Vijay?

 We should ensure that AbstractReadExecutor.makeDigestRequests never calls the 
 local machine
 ---

 Key: CASSANDRA-6814
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6814
 Project: Cassandra
  Issue Type: Improvement
Reporter: Benedict
Assignee: Vijay
Priority: Minor
 Fix For: 3.0


 It should always opt to perform the actual read locally, when possible, and 
 this code path should assert that it does not read locally.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6814) We should ensure that AbstractReadExecutor.makeDigestRequests never calls the local machine

2014-03-13 Thread Vijay (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6814?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934123#comment-13934123
 ] 

Vijay commented on CASSANDRA-6814:
--

Hi Jonathan Will do, Thanks!

 We should ensure that AbstractReadExecutor.makeDigestRequests never calls the 
 local machine
 ---

 Key: CASSANDRA-6814
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6814
 Project: Cassandra
  Issue Type: Improvement
Reporter: Benedict
Assignee: Vijay
Priority: Minor
 Fix For: 3.0


 It should always opt to perform the actual read locally, when possible, and 
 this code path should assert that it does not read locally.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6574) key cache shrinks on restart

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934122#comment-13934122
 ] 

Jonathan Ellis commented on CASSANDRA-6574:
---

Should we close this or are you still looking into it?

 key cache shrinks on restart
 

 Key: CASSANDRA-6574
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6574
 Project: Cassandra
  Issue Type: Bug
  Components: Core
 Environment: 1.2.12 + patches
Reporter: Chris Burroughs
 Attachments: key-cache-entries.png, key-cache-rate.png


 During a rolling restart the key number of entries the number of entries in 
 the key cache is shrinking.  That is far fewer entries are loaded than are 
 saved.  This has obvious bad consequences for post restart performance.
 {noformat}
 key_cache_size_in_mb: 48
 key_cache_save_period: 900
 # Number of keys from the key cache to save
 # Disabled by default, meaning all keys are going to be saved
 # key_cache_keys_to_save: 100
 row_cache_size_in_mb: 256
 row_cache_save_period: 300
 row_cache_keys_to_save: 5
 row_cache_provider: SerializingCacheProvider
 saved_caches_directory: /home/cassandra/shared/saved_caches
 {noformat}
 Same log lines:
 {noformat}
  INFO [CompactionExecutor:24543] 2014-01-11 11:35:47,783 AutoSavingCache.java 
 (line 289) Saved KeyCache (398028 items) in 1252 ms
 *** RESTART ***
  INFO [main] 2014-01-11 11:44:59,608 AutoSavingCache.java (line 140) reading 
 saved cache /home/cassandra/shared/saved_caches/ks-cf1-KeyCache-b.db
  INFO [main] 2014-01-11 11:45:00,509 AutoSavingCache.java (line 140) reading 
 saved cache /home/cassandra/shared/saved_caches/ks-cf2-RowCache-b.db
  INFO [main] 2014-01-11 12:02:48,675 ColumnFamilyStore.java (line 452) 
 completed loading (1068166 ms; 5 keys) row cache for ks.cf2
  INFO [main] 2014-01-11 12:02:48,769 CassandraDaemon.java (line 291) 
 completed pre-loading (67760 keys) key cache.
  INFO [main] 2014-01-11 12:02:48,769 CassandraDaemon.java (line 294) 
 completed pre-loading (5 keys) row cache.
  INFO [CompactionExecutor:1] 2014-01-11 12:02:49,133 AutoSavingCache.java 
 (line 289) Saved RowCache (5 items) in 266 ms
  INFO [CompactionExecutor:2] 2014-01-11 12:02:49,575 AutoSavingCache.java 
 (line 289) Saved KeyCache (67760 items) in 707 ms
 {noformat}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6546) disablethrift results in unclosed file descriptors

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6546:
--

Assignee: Ryan McGuire

 disablethrift results in unclosed file descriptors
 --

 Key: CASSANDRA-6546
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6546
 Project: Cassandra
  Issue Type: Bug
Reporter: Jason Harvey
Assignee: Ryan McGuire
Priority: Minor

 Disabling thrift results in unclosed thrift sockets being left around.
 Steps to reproduce and observe:
 1. Have a handful of clients connect via thrift.
 2. Disable thrift.
 3. Enable thrift, have the clients reconnect.
 4. Observe netstat or lsof, and you'll find a lot of thrift sockets in 
 CLOSE_WAIT state, and they'll never go away.
   * Also verifiable from 
 org.apache.cassandra.metrics:type=Client,name=connectedThriftClients MBean.
 What's extra fun about this is the leaked sockets still count towards your 
 maximum RPC thread count. As a result, toggling thrift enough times will 
 result in an rpc_max_threads number of CLOSED_WAIT sockets, with no new 
 clients able to connect.
 This was reproduced with HSHA. I haven't tried it in sync yet.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Assigned] (CASSANDRA-6525) Cannot select data which using WHERE

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis reassigned CASSANDRA-6525:
-

Assignee: Ryan McGuire

 Cannot select data which using WHERE
 --

 Key: CASSANDRA-6525
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6525
 Project: Cassandra
  Issue Type: Bug
 Environment: Linux RHEL5
 RAM: 1GB
 Cassandra 2.0.3
 CQL spec 3.1.1
 Thrift protocol 19.38.0
Reporter: Silence Chow
Assignee: Ryan McGuire

 I am developing a system on my single machine using VMware Player with 1GB 
 Ram and 1Gb HHD. When I select all data, I didn't have any problems. But when 
 I using WHERE and it has just below 10 records. I have got this error in 
 system log:
 ERROR [ReadStage:41] 2013-12-25 18:52:11,913 CassandraDaemon.java (line 187) 
 Exception in thread Thread[ReadStage:41,5,main]
 java.io.IOError: java.io.EOFException
 at org.apache.cassandra.db.Column$1.computeNext(Column.java:79)
 at org.apache.cassandra.db.Column$1.computeNext(Column.java:64)
 at 
 com.google.common.collect.AbstractIterator.tryToComputeNext(AbstractIterator.java:143)
 at 
 com.google.common.collect.AbstractIterator.hasNext(AbstractIterator.java:138)
 at 
 org.apache.cassandra.db.columniterator.SimpleSliceReader.computeNext(SimpleSliceReader.java:88)
 at 
 org.apache.cassandra.db.columniterator.SimpleSliceReader.computeNext(SimpleSliceReader.java:37)
 at 
 com.google.common.collect.AbstractIterator.tryToComputeNext(AbstractIterator.java:143)
 at 
 com.google.common.collect.AbstractIterator.hasNext(AbstractIterator.java:138)
 at 
 org.apache.cassandra.db.columniterator.SSTableSliceIterator.hasNext(SSTableSliceIterator.java:82)
 at 
 org.apache.cassandra.db.filter.QueryFilter$2.getNext(QueryFilter.java:157)
 at 
 org.apache.cassandra.db.filter.QueryFilter$2.hasNext(QueryFilter.java:140)
 at 
 org.apache.cassandra.utils.MergeIterator$Candidate.advance(MergeIterator.java:144)
 at 
 org.apache.cassandra.utils.MergeIterator$ManyToOne.init(MergeIterator.java:87)
 at org.apache.cassandra.utils.MergeIterator.get(MergeIterator.java:46)
 at 
 org.apache.cassandra.db.filter.QueryFilter.collateColumns(QueryFilter.java:120)
 at 
 org.apache.cassandra.db.filter.QueryFilter.collateOnDiskAtom(QueryFilter.java:80)
 at 
 org.apache.cassandra.db.filter.QueryFilter.collateOnDiskAtom(QueryFilter.java:72)
 at 
 org.apache.cassandra.db.CollationController.collectAllData(CollationController.java:297)
 at 
 org.apache.cassandra.db.CollationController.getTopLevelColumns(CollationController.java:53)
 at 
 org.apache.cassandra.db.ColumnFamilyStore.getTopLevelColumns(ColumnFamilyStore.java:1487)
 at 
 org.apache.cassandra.db.ColumnFamilyStore.getColumnFamily(ColumnFamilyStore.java:1306)
 at org.apache.cassandra.db.Keyspace.getRow(Keyspace.java:332)
 at 
 org.apache.cassandra.db.SliceFromReadCommand.getRow(SliceFromReadCommand.java:65)
 at 
 org.apache.cassandra.service.StorageProxy$LocalReadRunnable.runMayThrow(StorageProxy.java:1401)
 at 
 org.apache.cassandra.service.StorageProxy$DroppableRunnable.run(StorageProxy.java:1936)
 at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
 at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
 at java.lang.Thread.run(Unknown Source)
 Caused by: java.io.EOFException
 at java.io.RandomAccessFile.readFully(Unknown Source)
 at java.io.RandomAccessFile.readFully(Unknown Source)
 at 
 org.apache.cassandra.io.util.RandomAccessReader.readBytes(RandomAccessReader.java:348)
 at 
 org.apache.cassandra.utils.ByteBufferUtil.read(ByteBufferUtil.java:392)
 at 
 org.apache.cassandra.utils.ByteBufferUtil.readWithShortLength(ByteBufferUtil.java:371)
 at 
 org.apache.cassandra.db.OnDiskAtom$Serializer.deserializeFromSSTable(OnDiskAtom.java:74)
 at org.apache.cassandra.db.Column$1.computeNext(Column.java:75)
 ... 27 more
 E.g.
 SELECT * FROM table;
 Its fine.
 SELECT * FROM table WHERE field = 'N';
 field is the partition key.
 Its said Request did not complete within rpc_timeout. in cqlsh



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6633) Investigate Bloom Filter Improvements

2014-03-13 Thread Benedict (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6633?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934132#comment-13934132
 ] 

Benedict commented on CASSANDRA-6633:
-

Well, (1) and (2) should actually be pretty easy, and maybe very beneficial. 
Probably worth doing for 3.0, as it should permit scaling more gracefully to 
larger datasets.

Probably worth splitting out investigating Golomb encoding and other 
optimisations for Later though.

 Investigate Bloom Filter Improvements
 -

 Key: CASSANDRA-6633
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6633
 Project: Cassandra
  Issue Type: Improvement
Reporter: Benedict

 Investigate various possible improvements to our bloom filters:
 1) Dynamic resizing would be useful. There are a few ways this could be 
 achieved: with some modification, downsampling could be supported; 
 partitioning the hash functions so that we may select the number of 
 hashes/bits dynamically, by loading/unloading a given partition; and there 
 are some related data structures, such as Quotient Filters that support 
 resizing and merging.
 2) Faster loading: should be possible to mmap the bloom filter representation 
 on disk
 3) Most ambitious of all, would be to try to reduce the memory requirement of 
 bloom filters. Golomb Coded Sets 
 [1|http://algo2.iti.kit.edu/singler/publications/cacheefficientbloomfilters-wea2007.pdf]
  are a possibility, as are other compressed hash structures 
 [2|http://www.it-c.dk/people/pagh/papers/bloom.pdf].



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6633) Dynamic Resize of Bloom Filters

2014-03-13 Thread Benedict (JIRA)

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

Benedict updated CASSANDRA-6633:


Summary: Dynamic Resize of Bloom Filters  (was: Investigate Bloom Filter 
Improvements)

 Dynamic Resize of Bloom Filters
 ---

 Key: CASSANDRA-6633
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6633
 Project: Cassandra
  Issue Type: Improvement
Reporter: Benedict

 Investigate various possible improvements to our bloom filters:
 1) Dynamic resizing would be useful. There are a few ways this could be 
 achieved: with some modification, downsampling could be supported; 
 partitioning the hash functions so that we may select the number of 
 hashes/bits dynamically, by loading/unloading a given partition; and there 
 are some related data structures, such as Quotient Filters that support 
 resizing and merging.
 2) Faster loading: should be possible to mmap the bloom filter representation 
 on disk
 3) Most ambitious of all, would be to try to reduce the memory requirement of 
 bloom filters. Golomb Coded Sets 
 [1|http://algo2.iti.kit.edu/singler/publications/cacheefficientbloomfilters-wea2007.pdf]
  are a possibility, as are other compressed hash structures 
 [2|http://www.it-c.dk/people/pagh/papers/bloom.pdf].



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Comment Edited] (CASSANDRA-6633) Investigate Bloom Filter Improvements

2014-03-13 Thread Benedict (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6633?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934132#comment-13934132
 ] 

Benedict edited comment on CASSANDRA-6633 at 3/13/14 9:42 PM:
--

Well, (1) and (2) should actually be pretty easy if we keep to the simplest 
approaches, and maybe very beneficial. Probably worth doing for 3.0, as it 
should permit scaling more gracefully to larger datasets.

Probably worth splitting out investigating Golomb encoding and other 
optimisations for Later though.


was (Author: benedict):
Well, (1) and (2) should actually be pretty easy, and maybe very beneficial. 
Probably worth doing for 3.0, as it should permit scaling more gracefully to 
larger datasets.

Probably worth splitting out investigating Golomb encoding and other 
optimisations for Later though.

 Investigate Bloom Filter Improvements
 -

 Key: CASSANDRA-6633
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6633
 Project: Cassandra
  Issue Type: Improvement
Reporter: Benedict

 Investigate various possible improvements to our bloom filters:
 1) Dynamic resizing would be useful. There are a few ways this could be 
 achieved: with some modification, downsampling could be supported; 
 partitioning the hash functions so that we may select the number of 
 hashes/bits dynamically, by loading/unloading a given partition; and there 
 are some related data structures, such as Quotient Filters that support 
 resizing and merging.
 2) Faster loading: should be possible to mmap the bloom filter representation 
 on disk
 3) Most ambitious of all, would be to try to reduce the memory requirement of 
 bloom filters. Golomb Coded Sets 
 [1|http://algo2.iti.kit.edu/singler/publications/cacheefficientbloomfilters-wea2007.pdf]
  are a possibility, as are other compressed hash structures 
 [2|http://www.it-c.dk/people/pagh/papers/bloom.pdf].



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6523) Unable to contact any seeds! with multi-DC cluster and listen != broadcast address

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6523?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934138#comment-13934138
 ] 

Jonathan Ellis commented on CASSANDRA-6523:
---

Is this still a problem with 5768 fixed?

 Unable to contact any seeds! with multi-DC cluster and listen != broadcast 
 address
 

 Key: CASSANDRA-6523
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6523
 Project: Cassandra
  Issue Type: Bug
  Components: Core
 Environment: 1.2.13ish
Reporter: Chris Burroughs

 New cluster:
  * Seeds: list of 6 internal IPs
  * listen address: internal ip
  * broadcast: external ip
 Two DC cluster, using GPFS where the external IPs are NATed.  Clusters fails 
 to start with Unable to contact any seeds!
  * Fail: Try to start a seed node
  * Fail: Try to start two seed nodes at the same time in the same DC
  * Success: Start two seed nodes at the same time in different DCs.
 Presumably related to CASSANDRA-5768



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6516) Force shutdown of all repair sessions sometimes fails

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6516?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934139#comment-13934139
 ] 

Jonathan Ellis commented on CASSANDRA-6516:
---

Does that mean this is no longer a problem?

 Force shutdown of all repair sessions sometimes fails
 -

 Key: CASSANDRA-6516
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6516
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Jimmy Mårdell
Priority: Minor

 The StorageServiceMBean forceTerminateAllRepairSessions method isn't able to 
 shutdown a repair session if it's stuck waiting for snapshots from other 
 nodes.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6499) Shuffle fails if PasswordAuthenticator is enabled

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6499:
--

Assignee: Brandon Williams

 Shuffle fails if PasswordAuthenticator is enabled
 -

 Key: CASSANDRA-6499
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6499
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Reporter: Adam Hattrell
Assignee: Brandon Williams
Priority: Minor

 If you attempt to run shuffle whilst authenticator: 
 org.apache.cassandra.auth.PasswordAuthenticator is set in the cassandra.yaml 
 you get the following error:
 Exception in thread main java.lang.RuntimeException: 
 InvalidRequestException(why:You have not logged in)
 at 
 org.apache.cassandra.tools.Shuffle.executeCqlQuery(Shuffle.java:516)
 at org.apache.cassandra.tools.Shuffle.shuffle(Shuffle.java:359)
 at org.apache.cassandra.tools.Shuffle.main(Shuffle.java:681)
 Caused by: InvalidRequestException(why:You have not logged in)
 at 
 org.apache.cassandra.thrift.Cassandra$execute_cql3_query_result.read(Cassandra.java:37849)
 at 
 org.apache.thrift.TServiceClient.receiveBase(TServiceClient.java:78)
 at 
 org.apache.cassandra.thrift.Cassandra$Client.recv_execute_cql3_query(Cassandra.java:1562)
 at 
 org.apache.cassandra.thrift.Cassandra$Client.execute_cql3_query(Cassandra.java:1547)
 at 
 org.apache.cassandra.tools.CassandraClient.execute_cql_query(Shuffle.java:736)
 at 
 org.apache.cassandra.tools.Shuffle.executeCqlQuery(Shuffle.java:502)
 ... 2 more
 I've logged this as Minor as I wouldn't really recommend using shuffle in 
 production.  



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6499) Shuffle fails if PasswordAuthenticator is enabled

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6499?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934142#comment-13934142
 ] 

Jonathan Ellis commented on CASSANDRA-6499:
---

Seems like it should be a simple fix.

 Shuffle fails if PasswordAuthenticator is enabled
 -

 Key: CASSANDRA-6499
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6499
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Reporter: Adam Hattrell
Assignee: Brandon Williams
Priority: Minor

 If you attempt to run shuffle whilst authenticator: 
 org.apache.cassandra.auth.PasswordAuthenticator is set in the cassandra.yaml 
 you get the following error:
 Exception in thread main java.lang.RuntimeException: 
 InvalidRequestException(why:You have not logged in)
 at 
 org.apache.cassandra.tools.Shuffle.executeCqlQuery(Shuffle.java:516)
 at org.apache.cassandra.tools.Shuffle.shuffle(Shuffle.java:359)
 at org.apache.cassandra.tools.Shuffle.main(Shuffle.java:681)
 Caused by: InvalidRequestException(why:You have not logged in)
 at 
 org.apache.cassandra.thrift.Cassandra$execute_cql3_query_result.read(Cassandra.java:37849)
 at 
 org.apache.thrift.TServiceClient.receiveBase(TServiceClient.java:78)
 at 
 org.apache.cassandra.thrift.Cassandra$Client.recv_execute_cql3_query(Cassandra.java:1562)
 at 
 org.apache.cassandra.thrift.Cassandra$Client.execute_cql3_query(Cassandra.java:1547)
 at 
 org.apache.cassandra.tools.CassandraClient.execute_cql_query(Shuffle.java:736)
 at 
 org.apache.cassandra.tools.Shuffle.executeCqlQuery(Shuffle.java:502)
 ... 2 more
 I've logged this as Minor as I wouldn't really recommend using shuffle in 
 production.  



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6461) CQLSSTableWriter throws NPE on addRow(Map values)

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6461?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934147#comment-13934147
 ] 

Jonathan Ellis commented on CASSANDRA-6461:
---

Is this still a problem, Alex?

 CQLSSTableWriter throws NPE on addRow(Map values)
 -

 Key: CASSANDRA-6461
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6461
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Reporter: Juan Pablo Mora
Assignee: Alex Liu
 Attachments: 0001-Posible-solucion-al-CASSANDRA-6461.patch


 On 2.0.3 version CQLSSTableWriter throws NPE on method addRow ( MapString, 
 Object values ) on line  159 :
 {code:java}
 rawValues.add(((AbstractType)spec.type).decompose(values.get(spec.name.toString(;
 {code}
 I think the solution is to copy the code of method   addRow(ListObject 
 values) because it has a control over null values :
 {code:java}
 133: rawValues.add(values.get(i) == null ? null :  
 (AbstractType)boundNames.get(i).type).decompose(values.get(i)));
 {code}



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6473) Add CQL function to generate random UUID

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6473:
--

Labels: lhf  (was: )

 Add CQL function to generate random UUID
 

 Key: CASSANDRA-6473
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6473
 Project: Cassandra
  Issue Type: New Feature
  Components: Core
Reporter: Mikhail Mazursky
Priority: Minor
  Labels: lhf

 There is timeuuid() function but no function to generate a random (type 4) 
 UUID . For example it can be usefull when client code at the moment of 
 insertion of data do not care for exact value of UUID.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6473) Add CQL function to generate random UUID

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6473?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934145#comment-13934145
 ] 

Jonathan Ellis commented on CASSANDRA-6473:
---

Should be straightforward to expose a method from UUIDGen.

 Add CQL function to generate random UUID
 

 Key: CASSANDRA-6473
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6473
 Project: Cassandra
  Issue Type: New Feature
  Components: Core
Reporter: Mikhail Mazursky
Priority: Minor
  Labels: lhf

 There is timeuuid() function but no function to generate a random (type 4) 
 UUID . For example it can be usefull when client code at the moment of 
 insertion of data do not care for exact value of UUID.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6633) Dynamic Resize of Bloom Filters

2014-03-13 Thread Benedict (JIRA)

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

Benedict updated CASSANDRA-6633:


  Component/s: Core
  Description: 
Dynamic resizing would be useful. The simplest way to achieve this is to have 
separate address spaces for each hash function, so that we may 
increase/decrease accuracy by simply loading/unloading another function (we 
could even do interesting stuff in future like alternating the functions we 
select if we find we're getting more false positives than should be expected);
2) Faster loading/unloading would help this, and we could achieve this by 
mmapping the bloom filter representation on systems that we can mlock.


  was:
Investigate various possible improvements to our bloom filters:

1) Dynamic resizing would be useful. There are a few ways this could be 
achieved: with some modification, downsampling could be supported; partitioning 
the hash functions so that we may select the number of hashes/bits dynamically, 
by loading/unloading a given partition; and there are some related data 
structures, such as Quotient Filters that support resizing and merging.
2) Faster loading: should be possible to mmap the bloom filter representation 
on disk
3) Most ambitious of all, would be to try to reduce the memory requirement of 
bloom filters. Golomb Coded Sets 
[1|http://algo2.iti.kit.edu/singler/publications/cacheefficientbloomfilters-wea2007.pdf]
 are a possibility, as are other compressed hash structures 
[2|http://www.it-c.dk/people/pagh/papers/bloom.pdf].




 Priority: Minor  (was: Major)
Fix Version/s: 3.0

 Dynamic Resize of Bloom Filters
 ---

 Key: CASSANDRA-6633
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6633
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Benedict
Priority: Minor
 Fix For: 3.0


 Dynamic resizing would be useful. The simplest way to achieve this is to have 
 separate address spaces for each hash function, so that we may 
 increase/decrease accuracy by simply loading/unloading another function (we 
 could even do interesting stuff in future like alternating the functions we 
 select if we find we're getting more false positives than should be expected);
 2) Faster loading/unloading would help this, and we could achieve this by 
 mmapping the bloom filter representation on systems that we can mlock.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6516) Force shutdown of all repair sessions sometimes fails

2014-03-13 Thread Yuki Morishita (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6516?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934149#comment-13934149
 ] 

Yuki Morishita commented on CASSANDRA-6516:
---

Yes.

 Force shutdown of all repair sessions sometimes fails
 -

 Key: CASSANDRA-6516
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6516
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Jimmy Mårdell
Priority: Minor

 The StorageServiceMBean forceTerminateAllRepairSessions method isn't able to 
 shutdown a repair session if it's stuck waiting for snapshots from other 
 nodes.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Resolved] (CASSANDRA-6399) debian init script removes PID despite the return status

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis resolved CASSANDRA-6399.
---

Resolution: Not A Problem

 debian init script removes PID despite the return status
 

 Key: CASSANDRA-6399
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6399
 Project: Cassandra
  Issue Type: Bug
Reporter: Peter Halliday

 If there's an error in running service cassandra stop it can return a 
 non-successful code, but the do_stop() removes the PID file anyway.  This 
 shows then via service cassandra status, that Cassandra is stopped, even 
 though it's still running in the process list.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6820) NPE in MeteredFlusher.run

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6820:
--

Fix Version/s: 2.0.7

 NPE in MeteredFlusher.run
 -

 Key: CASSANDRA-6820
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6820
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Nicolas Favre-Felix
Priority: Minor
 Fix For: 2.0.7


 Hello,
 I've been seeing this exception with Cassandra 2.0.5:
 {code}
 ERROR 15:41:46,754 Exception in thread Thread[OptionalTasks:1,5,main]
 java.lang.NullPointerException
   at org.apache.cassandra.db.MeteredFlusher.run(MeteredFlusher.java:40)
   at 
 org.apache.cassandra.concurrent.DebuggableScheduledThreadPoolExecutor$UncomplainingRunnable.run(DebuggableScheduledThreadPoolExecutor.java:75)
   at 
 java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
   at java.util.concurrent.FutureTask.runAndReset(FutureTask.java:304)
   at 
 java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$301(ScheduledThreadPoolExecutor.java:178)
   at 
 java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:293)
   at 
 java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
   at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
   at java.lang.Thread.run(Thread.java:744)
 {code}
 Could it be that {{Memtable.activelyMeasuring}} becomes null right after the 
 test?



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6411) Issue with reading from sstable

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6411?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934150#comment-13934150
 ] 

Jonathan Ellis commented on CASSANDRA-6411:
---

Are you still seeing this on 1.2.15 / 2.0.6?

 Issue with reading from sstable
 ---

 Key: CASSANDRA-6411
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6411
 Project: Cassandra
  Issue Type: Bug
  Components: API
Reporter: Mike Konobeevskiy

 With Cassandra 1.2.5 this happens almost every week. 
 java.lang.RuntimeException: 
 org.apache.cassandra.io.sstable.CorruptSSTableException: 
 java.io.EOFException: EOF after 5105 bytes out of 19815
   at 
 org.apache.cassandra.service.StorageProxy$DroppableRunnable.run(StorageProxy.java:1582)
   at 
 java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
   at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
   at java.lang.Thread.run(Thread.java:724)
 Caused by: org.apache.cassandra.io.sstable.CorruptSSTableException: 
 java.io.EOFException: EOF after 5105 bytes out of 19815
   at 
 org.apache.cassandra.db.columniterator.SimpleSliceReader.init(SimpleSliceReader.java:91)
   at 
 org.apache.cassandra.db.columniterator.SSTableSliceIterator.createReader(SSTableSliceIterator.java:68)
   at 
 org.apache.cassandra.db.columniterator.SSTableSliceIterator.init(SSTableSliceIterator.java:44)
   at 
 org.apache.cassandra.db.filter.SliceQueryFilter.getSSTableColumnIterator(SliceQueryFilter.java:101)
   at 
 org.apache.cassandra.db.filter.QueryFilter.getSSTableColumnIterator(QueryFilter.java:68)
   at 
 org.apache.cassandra.db.CollationController.collectAllData(CollationController.java:274)
   at 
 org.apache.cassandra.db.CollationController.getTopLevelColumns(CollationController.java:65)
   at 
 org.apache.cassandra.db.ColumnFamilyStore.getTopLevelColumns(ColumnFamilyStore.java:1357)
   at 
 org.apache.cassandra.db.ColumnFamilyStore.getColumnFamily(ColumnFamilyStore.java:1214)
   at 
 org.apache.cassandra.db.ColumnFamilyStore.getColumnFamily(ColumnFamilyStore.java:1126)
   at org.apache.cassandra.db.Table.getRow(Table.java:347)
   at 
 org.apache.cassandra.db.SliceFromReadCommand.getRow(SliceFromReadCommand.java:70)
   at 
 org.apache.cassandra.service.StorageProxy$LocalReadRunnable.runMayThrow(StorageProxy.java:1052)
   at 
 org.apache.cassandra.service.StorageProxy$DroppableRunnable.run(StorageProxy.java:1578)
   ... 3 more
 Caused by: java.io.EOFException: EOF after 5105 bytes out of 19815
   at 
 org.apache.cassandra.io.util.FileUtils.skipBytesFully(FileUtils.java:350)
   at 
 org.apache.cassandra.utils.ByteBufferUtil.skipShortLength(ByteBufferUtil.java:382)
   at 
 org.apache.cassandra.db.columniterator.SimpleSliceReader.init(SimpleSliceReader.java:72)
   ... 16 more
 This is occurring roughly weekly with quite minimal usage.
 Recreation of CF does not help.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Resolved] (CASSANDRA-6403) Division by zero Exception in HintedHandoff and CompactionExecutor

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis resolved CASSANDRA-6403.
---

   Resolution: Fixed
Fix Version/s: 2.0.4

 Division by zero Exception in HintedHandoff and CompactionExecutor
 --

 Key: CASSANDRA-6403
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6403
 Project: Cassandra
  Issue Type: Bug
  Components: Core
 Environment: Cassandra 2.0.3 RC, Linux (Ubuntu Precise), OpenJDK 7
Reporter: Gabriel Wicke
 Fix For: 2.0.4


 In write load testing I'm getting division by zero exceptions after running 
 for a while:
 ERROR [HintedHandoff:2] 2013-11-23 20:44:41,411 CassandraDaemon.java (line 
 187) Exception in thread Thread[HintedHandoff:2,1,main]
 java.lang.RuntimeException: java.util.concurrent.ExecutionException: 
 java.lang.ArithmeticException: / by zero
 at 
 org.apache.cassandra.db.HintedHandOffManager.doDeliverHintsToEndpoint(HintedHandOffManager.java:464)
 at 
 org.apache.cassandra.db.HintedHandOffManager.deliverHintsToEndpoint(HintedHandOffManager.java:309)
 at 
 org.apache.cassandra.db.HintedHandOffManager.access$300(HintedHandOffManager.java:92)
 at 
 org.apache.cassandra.db.HintedHandOffManager$4.run(HintedHandOffManager.java:530)
 at 
 java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
 at java.lang.Thread.run(Thread.java:724)
 Caused by: java.util.concurrent.ExecutionException: 
 java.lang.ArithmeticException: / by zero
 at java.util.concurrent.FutureTask$Sync.innerGet(FutureTask.java:252)
 at java.util.concurrent.FutureTask.get(FutureTask.java:111)
 at 
 org.apache.cassandra.db.HintedHandOffManager.doDeliverHintsToEndpoint(HintedHandOffManager.java:460)
 ... 6 more
 ERROR [CompactionExecutor:8] 2013-11-23 21:34:01,493 CassandraDaemon.java 
 (line 187) Exception in thread Thread[CompactionExecutor:8,1,RMI Runtime]
 java.lang.ArithmeticException: / by zero
 at 
 org.apache.cassandra.db.compaction.ParallelCompactionIterable.init(ParallelCompactionIterable.java:59)
 at 
 org.apache.cassandra.db.compaction.CompactionTask.runWith(CompactionTask.java:126)
 at 
 org.apache.cassandra.io.util.DiskAwareRunnable.runMayThrow(DiskAwareRunnable.java:48)
 at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28)
 at 
 org.apache.cassandra.db.compaction.CompactionTask.executeInternal(CompactionTask.java:60)
 at 
 org.apache.cassandra.db.compaction.AbstractCompactionTask.execute(AbstractCompactionTask.java:59)
 at 
 org.apache.cassandra.db.compaction.CompactionManager$6.runMayThrow(CompactionManager.java:296)
 at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28)
 at 
 java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
 at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334)
 at java.util.concurrent.FutureTask.run(FutureTask.java:166)
 at 
 java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
 at java.lang.Thread.run(Thread.java:724)
 The nodes that encounter this error seem to hold onto a lot of memory which 
 is not freed even after the write load is stopped. With the write load 
 continuing they eventually run out of heap. nodetool compact dies with the 
 same exception.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6633) Dynamic Resize of Bloom Filters

2014-03-13 Thread Benedict (JIRA)

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

Benedict updated CASSANDRA-6633:


Description: 
Dynamic resizing would be useful. The simplest way to achieve this is to have 
separate address spaces for each hash function, so that we may 
increase/decrease accuracy by simply loading/unloading another function (we 
could even do interesting stuff in future like alternating the functions we 
select if we find we're getting more false positives than should be expected);

Faster loading/unloading would help this, and we could achieve this by mmapping 
the bloom filter representation on systems that we can mlock.


  was:
Dynamic resizing would be useful. The simplest way to achieve this is to have 
separate address spaces for each hash function, so that we may 
increase/decrease accuracy by simply loading/unloading another function (we 
could even do interesting stuff in future like alternating the functions we 
select if we find we're getting more false positives than should be expected);
2) Faster loading/unloading would help this, and we could achieve this by 
mmapping the bloom filter representation on systems that we can mlock.



 Dynamic Resize of Bloom Filters
 ---

 Key: CASSANDRA-6633
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6633
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Benedict
Priority: Minor
 Fix For: 3.0


 Dynamic resizing would be useful. The simplest way to achieve this is to have 
 separate address spaces for each hash function, so that we may 
 increase/decrease accuracy by simply loading/unloading another function (we 
 could even do interesting stuff in future like alternating the functions we 
 select if we find we're getting more false positives than should be expected);
 Faster loading/unloading would help this, and we could achieve this by 
 mmapping the bloom filter representation on systems that we can mlock.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Resolved] (CASSANDRA-6516) Force shutdown of all repair sessions sometimes fails

2014-03-13 Thread Yuki Morishita (JIRA)

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

Yuki Morishita resolved CASSANDRA-6516.
---

Resolution: Not A Problem

 Force shutdown of all repair sessions sometimes fails
 -

 Key: CASSANDRA-6516
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6516
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Jimmy Mårdell
Priority: Minor

 The StorageServiceMBean forceTerminateAllRepairSessions method isn't able to 
 shutdown a repair session if it's stuck waiting for snapshots from other 
 nodes.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6367) Enable purge of local hints

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6367:
--

Component/s: (was: Core)
 Tools
 Labels: lhf  (was: )
   Priority: Minor  (was: Major)

 Enable purge of local hints
 ---

 Key: CASSANDRA-6367
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6367
 Project: Cassandra
  Issue Type: New Feature
  Components: Tools
Reporter: Cyril Scetbon
Priority: Minor
  Labels: lhf

 We should have a new nodetool command (purgelocalhints as a suggestion) to 
 locally truncate the system.hints cf and not on all nodes as it currently 
 works if we use the TRUNCATE DDL command. We could have access to this new 
 functionality through JMX too
 see thread 
 http://mail-archives.apache.org/mod_mbox/cassandra-dev/201311.mbox/%3c8e5f2112-8d98-4f6b-aa49-08ba3ff00...@free.fr%3e



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6361) Gossiper not work correctly while upgrade c*1.1.9 to c*1.2.6

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6361:
--

Assignee: Brandon Williams

 Gossiper not work correctly while upgrade c*1.1.9 to c*1.2.6
 

 Key: CASSANDRA-6361
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6361
 Project: Cassandra
  Issue Type: Bug
  Components: Core
 Environment: Local env, 4 nodes, 1 cluster
Reporter: Boole Guo
Assignee: Brandon Williams

 While I uprade c* from 1.1.9 to 1.2.6.
 One node cannot update gossip info.
 The output is:
 [mis@necaso01 bin]$ ./nodetool ring -h 10.16.40.35
 Note: Ownership information does not include topology; for complete 
 information, specify a keyspace
 Datacenter: DC1
 ==
 Address  RackStatus State   LoadOwns
 Token  
 
 85070591730234615865843651857942052864
 10.16.40.35  RAC1Up Normal  115.83 KB   75.00%  
 42535295865117307932921825928971026432
 10.16.40.53  RAC1Up Normal  187.3 KB25.00%  
 85070591730234615865843651857942052864
 [mis@necaso01 bin]$ ./nodetool ring -h 10.16.40.30
 Note: Ownership information does not include topology; for complete 
 information, specify a keyspace
 Datacenter: DC1
 ==
 Address  RackStatus State   LoadOwns
 Token  
 
 127605887595351923798765477786913079296
 10.16.40.30  RAC1Up Normal  181.84 KB   25.00%  0 
  
 10.16.40.35  RAC1Up Normal  115.83 KB   25.00%  
 42535295865117307932921825928971026432
 10.16.40.53  RAC1Up Normal  187.3 KB25.00%  
 85070591730234615865843651857942052864
 10.16.40.56  RAC1Up Normal  191.24 KB   25.00%  
 127605887595351923798765477786913079296
 the nodetool output is:
 [mis@necaso01 bin]$ ./nodetool gossipinfo -h 10.16.40.35
 /10.16.40.30
   SEVERITY:0.0
   LOAD:186207.0
   SCHEMA:b7fa4fd0-081d-3466-a57a-0907365b556d
 /10.16.40.53
   STATUS:NORMAL,85070591730234615865843651857942052864
   RELEASE_VERSION:1.2.6.1
   RACK:RAC1
   RPC_ADDRESS:10.16.40.53
   NET_VERSION:6
   SEVERITY:0.0
   DC:DC1
   LOAD:191797.0
   SCHEMA:b7fa4fd0-081d-3466-a57a-0907365b556d
   HOST_ID:669984c2-59f0-43db-af84-0981cf9187c5
 /10.16.40.35
   STATUS:NORMAL,42535295865117307932921825928971026432
   RELEASE_VERSION:1.2.6.1
   RPC_ADDRESS:10.16.40.35
   RACK:RAC1
   NET_VERSION:6
   SEVERITY:0.0
   DC:DC1
   LOAD:118610.0
   SCHEMA:b7fa4fd0-081d-3466-a57a-0907365b556d
   HOST_ID:f5e600e5-38b1-48eb-ab14-61302cc43f70
 /10.16.40.56
   SEVERITY:2.220446049250313E-16
   LOAD:195826.0
   SCHEMA:b7fa4fd0-081d-3466-a57a-0907365b556d



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6350) Timestamp-with-timezone type

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6350:
--

Labels: lhf  (was: )

 Timestamp-with-timezone type
 

 Key: CASSANDRA-6350
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6350
 Project: Cassandra
  Issue Type: Wish
  Components: Core
Reporter: Ramkumar S
Priority: Minor
  Labels: lhf

 Create a table with a timestamp column.
 Insert a value from US time Zone.
 Try querying the value from a different time zone like India.
 The timestamp column  value shown in the select query result is converted to 
 Indian Local time instead of showing the actual value.
 This becomes a problem when we want to narrow down the query using where 
 condition.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6361) Gossiper not work correctly while upgrade c*1.1.9 to c*1.2.6

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6361?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934160#comment-13934160
 ] 

Jonathan Ellis commented on CASSANDRA-6361:
---

Is this a duplicate?

 Gossiper not work correctly while upgrade c*1.1.9 to c*1.2.6
 

 Key: CASSANDRA-6361
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6361
 Project: Cassandra
  Issue Type: Bug
  Components: Core
 Environment: Local env, 4 nodes, 1 cluster
Reporter: Boole Guo
Assignee: Brandon Williams

 While I uprade c* from 1.1.9 to 1.2.6.
 One node cannot update gossip info.
 The output is:
 [mis@necaso01 bin]$ ./nodetool ring -h 10.16.40.35
 Note: Ownership information does not include topology; for complete 
 information, specify a keyspace
 Datacenter: DC1
 ==
 Address  RackStatus State   LoadOwns
 Token  
 
 85070591730234615865843651857942052864
 10.16.40.35  RAC1Up Normal  115.83 KB   75.00%  
 42535295865117307932921825928971026432
 10.16.40.53  RAC1Up Normal  187.3 KB25.00%  
 85070591730234615865843651857942052864
 [mis@necaso01 bin]$ ./nodetool ring -h 10.16.40.30
 Note: Ownership information does not include topology; for complete 
 information, specify a keyspace
 Datacenter: DC1
 ==
 Address  RackStatus State   LoadOwns
 Token  
 
 127605887595351923798765477786913079296
 10.16.40.30  RAC1Up Normal  181.84 KB   25.00%  0 
  
 10.16.40.35  RAC1Up Normal  115.83 KB   25.00%  
 42535295865117307932921825928971026432
 10.16.40.53  RAC1Up Normal  187.3 KB25.00%  
 85070591730234615865843651857942052864
 10.16.40.56  RAC1Up Normal  191.24 KB   25.00%  
 127605887595351923798765477786913079296
 the nodetool output is:
 [mis@necaso01 bin]$ ./nodetool gossipinfo -h 10.16.40.35
 /10.16.40.30
   SEVERITY:0.0
   LOAD:186207.0
   SCHEMA:b7fa4fd0-081d-3466-a57a-0907365b556d
 /10.16.40.53
   STATUS:NORMAL,85070591730234615865843651857942052864
   RELEASE_VERSION:1.2.6.1
   RACK:RAC1
   RPC_ADDRESS:10.16.40.53
   NET_VERSION:6
   SEVERITY:0.0
   DC:DC1
   LOAD:191797.0
   SCHEMA:b7fa4fd0-081d-3466-a57a-0907365b556d
   HOST_ID:669984c2-59f0-43db-af84-0981cf9187c5
 /10.16.40.35
   STATUS:NORMAL,42535295865117307932921825928971026432
   RELEASE_VERSION:1.2.6.1
   RPC_ADDRESS:10.16.40.35
   RACK:RAC1
   NET_VERSION:6
   SEVERITY:0.0
   DC:DC1
   LOAD:118610.0
   SCHEMA:b7fa4fd0-081d-3466-a57a-0907365b556d
   HOST_ID:f5e600e5-38b1-48eb-ab14-61302cc43f70
 /10.16.40.56
   SEVERITY:2.220446049250313E-16
   LOAD:195826.0
   SCHEMA:b7fa4fd0-081d-3466-a57a-0907365b556d



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6354) No cleanup of excess storage connections

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6354?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934164#comment-13934164
 ] 

Jonathan Ellis commented on CASSANDRA-6354:
---

Why would MessagingService create that many?  It's only supposed to need two.  
Are repair streams not getting cleaned up?

 No cleanup of excess storage connections
 

 Key: CASSANDRA-6354
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6354
 Project: Cassandra
  Issue Type: Bug
Reporter: Rick Branson
Priority: Minor

 While trying to cut off communication between two nodes, I noticed a 
 production node had 300 connections active established to another node on 
 the storage port. It looks like there's no check to keep these limited, so 
 they'll just sit around forever.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Resolved] (CASSANDRA-6257) Safety check on node joining cluster (based on last seen vs GC grace period) to avoid zombie data

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis resolved CASSANDRA-6257.
---

Resolution: Won't Fix

 Safety check on node joining cluster (based on last seen vs GC grace period) 
 to avoid zombie data
 -

 Key: CASSANDRA-6257
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6257
 Project: Cassandra
  Issue Type: Improvement
Reporter: Johnny Miller
Priority: Minor

 When a node is rejoining a cluster, it would be nice to have some form of 
 safety check that the cluster recognises the last time the node was part of 
 the cluster is greater that the GC grace period and therefore should not be 
 able to rejoin the cluster unless the administrator specifically requests it.
 The goal of this is to help avoid the potential issues with deleted data 
 coming back from the rejoining nodes dataset.



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6328) Allow deleting records with a secondary index lookup

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6328:
--

Issue Type: New Feature  (was: Improvement)

 Allow deleting records with a secondary index lookup
 

 Key: CASSANDRA-6328
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6328
 Project: Cassandra
  Issue Type: New Feature
  Components: Core
Reporter: David Huang
Priority: Minor
 Fix For: 3.0


 Currently, clients must query for row keys from a specific secondary index 
 and delete the results. This incurs network traffic whereas a single server 
 operation would be enough.
  Example 
 In C* we would have to query for all playlist_id for user JohnSmith and 
 issue deletes for each key. Deleting by secondary index would allow the 
 entire operation to occur within C* without the client needing to issue 
 multiple statements.
 Delete By Secondary Index
 CREATE TABLE playlist (
 playlist_id text,
 user_id text,
 song_name settext,
 PRIMARY_KEY (playlist_id)
 );
 CREATE INDEX on playlist (user_id);
 DELETE FROM playlist WHERE user_id = JohnSmith;
 Delete By Client
 // Schema
 CREATE TABLE playlist (
 playlist_id text,
 user_id text,
 song_name settext,
 PRIMARY_KEY (playlist_id)
 );
 CREATE INDEX on playlist (user_id);
 // Client
 ResultSet resultSet = session.execute(select playlist_id from playlist where 
 userid = JohnSmith);
 PreparedStatement delete = session.prepare(DELETE FROM playlist WHERE 
 playlist_id =  ?);
 for(Row row : resultSet){
 session.execute(delete.bind(row.getString(playlist_id)));
 }
   



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6331) Add LZ4Compressor in CQL document

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6331:
--

Assignee: Mikhail Stepura

 Add LZ4Compressor in CQL document
 -

 Key: CASSANDRA-6331
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6331
 Project: Cassandra
  Issue Type: Improvement
  Components: Documentation  website
Reporter: Ray Wu
Assignee: Mikhail Stepura
Priority: Trivial
  Labels: cql3

 LZ4Compressor should also be documented in sstable_compression option.
 http://cassandra.apache.org/doc/cql3/CQL.html



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Updated] (CASSANDRA-6328) Allow deleting records with a secondary index lookup

2014-03-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-6328:
--

Fix Version/s: 3.0

 Allow deleting records with a secondary index lookup
 

 Key: CASSANDRA-6328
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6328
 Project: Cassandra
  Issue Type: New Feature
  Components: Core
Reporter: David Huang
Priority: Minor
 Fix For: 3.0


 Currently, clients must query for row keys from a specific secondary index 
 and delete the results. This incurs network traffic whereas a single server 
 operation would be enough.
  Example 
 In C* we would have to query for all playlist_id for user JohnSmith and 
 issue deletes for each key. Deleting by secondary index would allow the 
 entire operation to occur within C* without the client needing to issue 
 multiple statements.
 Delete By Secondary Index
 CREATE TABLE playlist (
 playlist_id text,
 user_id text,
 song_name settext,
 PRIMARY_KEY (playlist_id)
 );
 CREATE INDEX on playlist (user_id);
 DELETE FROM playlist WHERE user_id = JohnSmith;
 Delete By Client
 // Schema
 CREATE TABLE playlist (
 playlist_id text,
 user_id text,
 song_name settext,
 PRIMARY_KEY (playlist_id)
 );
 CREATE INDEX on playlist (user_id);
 // Client
 ResultSet resultSet = session.execute(select playlist_id from playlist where 
 userid = JohnSmith);
 PreparedStatement delete = session.prepare(DELETE FROM playlist WHERE 
 playlist_id =  ?);
 for(Row row : resultSet){
 session.execute(delete.bind(row.getString(playlist_id)));
 }
   



--
This message was sent by Atlassian JIRA
(v6.2#6252)


[jira] [Commented] (CASSANDRA-6331) Add LZ4Compressor in CQL document

2014-03-13 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-6331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13934166#comment-13934166
 ] 

Jonathan Ellis commented on CASSANDRA-6331:
---

Is this still a problem?

 Add LZ4Compressor in CQL document
 -

 Key: CASSANDRA-6331
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6331
 Project: Cassandra
  Issue Type: Improvement
  Components: Documentation  website
Reporter: Ray Wu
Assignee: Mikhail Stepura
Priority: Trivial
  Labels: cql3

 LZ4Compressor should also be documented in sstable_compression option.
 http://cassandra.apache.org/doc/cql3/CQL.html



--
This message was sent by Atlassian JIRA
(v6.2#6252)


git commit: Fix help message for stress counter_write patch by Benedict Elliott Smith; reviewed by Pavel Yaskevich for CASSANDRA-6824

2014-03-13 Thread xedin
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 f49df8c9b - 92381fd26


Fix help message for stress counter_write
patch by Benedict Elliott Smith; reviewed by Pavel Yaskevich for CASSANDRA-6824


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

Branch: refs/heads/cassandra-2.1
Commit: 92381fd26970f53a3f45454a036db20592a72f34
Parents: f49df8c
Author: Pavel Yaskevich xe...@apache.org
Authored: Thu Mar 13 14:53:01 2014 -0700
Committer: Pavel Yaskevich xe...@apache.org
Committed: Thu Mar 13 14:56:52 2014 -0700

--
 CHANGES.txt |  1 +
 .../apache/cassandra/stress/StressAction.java   | 10 +++---
 .../cassandra/stress/settings/Command.java  | 32 
 .../stress/settings/SettingsCommand.java|  8 +++--
 .../cassandra/stress/settings/SettingsKey.java  |  2 +-
 .../cassandra/stress/settings/SettingsMisc.java |  5 +--
 .../cassandra/stress/settings/SettingsRate.java |  2 +-
 .../stress/settings/StressSettings.java |  2 +-
 8 files changed, 38 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/92381fd2/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 6a44d80..4d9bc07 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,7 @@
  * Fix potentially repairing with wrong nodes (CASSANDRA-6808)
  * Change caching option syntax (CASSANDRA-6745)
  * Fix stress to do proper counter reads (CASSANDRA-6835)
+ * Fix help message for stress counter_write (CASSANDRA-6824)
 Merged from 2.0:
  * Fix leaking validator FH in StreamWriter (CASSANDRA-6832)
  * fix nodetool getsstables for blob PK (CASSANDRA-6803)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/92381fd2/tools/stress/src/org/apache/cassandra/stress/StressAction.java
--
diff --git a/tools/stress/src/org/apache/cassandra/stress/StressAction.java 
b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
index e7cdd0b..07ba1d8 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
@@ -464,7 +464,7 @@ public class StressAction implements Runnable
 }
 
 
-case COUNTERREAD:
+case COUNTER_READ:
 switch(state.settings.mode.style)
 {
 case THRIFT:
@@ -488,7 +488,7 @@ public class StressAction implements Runnable
 throw new UnsupportedOperationException();
 }
 
-case COUNTERWRITE:
+case COUNTER_WRITE:
 switch(state.settings.mode.style)
 {
 case THRIFT:
@@ -500,7 +500,7 @@ public class StressAction implements Runnable
 throw new UnsupportedOperationException();
 }
 
-case RANGESLICE:
+case RANGE_SLICE:
 switch(state.settings.mode.style)
 {
 case THRIFT:
@@ -512,7 +512,7 @@ public class StressAction implements Runnable
 throw new UnsupportedOperationException();
 }
 
-case IRANGESLICE:
+case INDEXED_RANGE_SLICE:
 switch(state.settings.mode.style)
 {
 case THRIFT:
@@ -524,7 +524,7 @@ public class StressAction implements Runnable
 throw new UnsupportedOperationException();
 }
 
-case READMULTI:
+case READ_MULTI:
 switch(state.settings.mode.style)
 {
 case THRIFT:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/92381fd2/tools/stress/src/org/apache/cassandra/stress/settings/Command.java
--
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/Command.java 
b/tools/stress/src/org/apache/cassandra/stress/settings/Command.java
index d0350ad..ac10014 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/Command.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/Command.java
@@ -21,8 +21,9 @@ package org.apache.cassandra.stress.settings;
  */
 
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
+
+import com.google.common.collect.ImmutableList;
 
 public enum Command
 {
@@ -40,25 +41,25 @@ public enum Command
 Interleaving of any basic commands, with configurable ratio and 

<    1   2   3   4   >