[jira] [Commented] (CASSANDRA-5661) Discard pooled readers for cold data

2013-07-13 Thread Ben Manes (JIRA)

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

Ben Manes commented on CASSANDRA-5661:
--

I think I just fixed this issue in my last push. Sorry I didn't check my email 
earlier, as I found it when writing more test cases. The problem is that I 
forgot to default the lifecycle to a discarding instance if not used, after I 
made it an optional setting.

 Discard pooled readers for cold data
 

 Key: CASSANDRA-5661
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5661
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.2.1
Reporter: Jonathan Ellis
Assignee: Pavel Yaskevich
 Fix For: 2.0

 Attachments: CASSANDRA-5661-multiway-per-sstable.patch, 
 CASSANDRA-5661.patch, CASSANDRA-5661-v2-global-multiway-per-sstable.patch, 
 DominatorTree.png, Histogram.png


 Reader pooling was introduced in CASSANDRA-4942 but pooled 
 RandomAccessReaders are never cleaned up until the SSTableReader is closed.  
 So memory use is the worst case simultaneous RAR we had open for this file, 
 forever.
 We should introduce a global limit on how much memory to use for RAR, and 
 evict old ones.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5661) Discard pooled readers for cold data

2013-07-13 Thread Pavel Yaskevich (JIRA)

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

Pavel Yaskevich commented on CASSANDRA-5661:


I have pulled/rebuild your code and now there is another error:

{noformat}
 INFO 23:24:33,367 Opening 
/var/lib/cassandra/data/system/local/system-local-ja-21 (520 bytes)
ERROR 23:24:33,412 Exception encountered during startup
java.lang.ClassCastException: 
com.github.benmanes.multiway.ResourceKey$LinkedResourceKey cannot be cast to 
java.lang.String
at 
org.apache.cassandra.io.util.PoolingSegmentedFile$1.weigh(PoolingSegmentedFile.java:35)
at 
com.google.common.cache.LocalCache$Segment.setValue(LocalCache.java:2219)
at 
com.google.common.cache.LocalCache$Segment.storeLoadedValue(LocalCache.java:3196)
at 
com.google.common.cache.LocalCache$Segment.getAndRecordStats(LocalCache.java:2410)
at 
com.google.common.cache.LocalCache$Segment.loadSync(LocalCache.java:2375)
at 
com.google.common.cache.LocalCache$Segment.lockedGetOrLoad(LocalCache.java:2337)
at com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2252)
at com.google.common.cache.LocalCache.get(LocalCache.java:3990)
at 
com.google.common.cache.LocalCache$LocalManualCache.get(LocalCache.java:4793)
at 
com.github.benmanes.multiway.TransferPool.newResourceHandle(TransferPool.java:215)
at 
com.github.benmanes.multiway.TransferPool.tryToGetResourceHandle(TransferPool.java:195)
at 
com.github.benmanes.multiway.TransferPool.getResourceHandle(TransferPool.java:176)
at 
com.github.benmanes.multiway.TransferPool.borrow(TransferPool.java:156)
at 
com.github.benmanes.multiway.TransferPool.borrow(TransferPool.java:147)
at 
org.apache.cassandra.io.util.PoolingSegmentedFile.getSegment(PoolingSegmentedFile.java:65)
at 
org.apache.cassandra.io.sstable.SSTableReader.getFileDataInput(SSTableReader.java:1040)
at 
org.apache.cassandra.db.columniterator.SSTableNamesIterator.createFileDataInput(SSTableNamesIterator.java:96)
at 
org.apache.cassandra.db.columniterator.SSTableNamesIterator.read(SSTableNamesIterator.java:109)
at 
org.apache.cassandra.db.columniterator.SSTableNamesIterator.init(SSTableNamesIterator.java:62)
at 
org.apache.cassandra.db.filter.NamesQueryFilter.getSSTableColumnIterator(NamesQueryFilter.java:87)
at 
org.apache.cassandra.db.filter.QueryFilter.getSSTableColumnIterator(QueryFilter.java:62)
at 
org.apache.cassandra.db.CollationController.collectTimeOrderedData(CollationController.java:124)
at 
org.apache.cassandra.db.CollationController.getTopLevelColumns(CollationController.java:53)
at 
org.apache.cassandra.db.ColumnFamilyStore.getTopLevelColumns(ColumnFamilyStore.java:1458)
at 
org.apache.cassandra.db.ColumnFamilyStore.getColumnFamily(ColumnFamilyStore.java:1284)
at org.apache.cassandra.db.Keyspace.getRow(Keyspace.java:332)
at 
org.apache.cassandra.db.SliceByNamesReadCommand.getRow(SliceByNamesReadCommand.java:55)
at 
org.apache.cassandra.cql3.statements.SelectStatement.readLocally(SelectStatement.java:227)
at 
org.apache.cassandra.cql3.statements.SelectStatement.executeInternal(SelectStatement.java:245)
at 
org.apache.cassandra.cql3.statements.SelectStatement.executeInternal(SelectStatement.java:56)
at 
org.apache.cassandra.cql3.QueryProcessor.processInternal(QueryProcessor.java:154)
at 
org.apache.cassandra.db.SystemKeyspace.checkHealth(SystemKeyspace.java:456)
at 
org.apache.cassandra.service.CassandraDaemon.setup(CassandraDaemon.java:237)
at 
org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:453)
at 
org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:496)
{noformat}

 Discard pooled readers for cold data
 

 Key: CASSANDRA-5661
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5661
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.2.1
Reporter: Jonathan Ellis
Assignee: Pavel Yaskevich
 Fix For: 2.0

 Attachments: CASSANDRA-5661-multiway-per-sstable.patch, 
 CASSANDRA-5661.patch, CASSANDRA-5661-v2-global-multiway-per-sstable.patch, 
 DominatorTree.png, Histogram.png


 Reader pooling was introduced in CASSANDRA-4942 but pooled 
 RandomAccessReaders are never cleaned up until the SSTableReader is closed.  
 So memory use is the worst case simultaneous RAR we had open for this file, 
 forever.
 We should introduce a global limit on how much memory to use for RAR, and 
 evict old ones.

--
This message is automatically generated by JIRA.
If you think it was sent 

git commit: move CounterSerializer to directory org/apache/cassandra/serializers

2013-07-13 Thread dbrosius
Updated Branches:
  refs/heads/trunk 872e1218d - 07e8942e5


move CounterSerializer to directory org/apache/cassandra/serializers


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

Branch: refs/heads/trunk
Commit: 07e8942e531708424a6f61015dbcdc947dd3e82a
Parents: 872e121
Author: Dave Brosius dbros...@apache.org
Authored: Sat Jul 13 02:28:10 2013 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Sat Jul 13 02:28:10 2013 -0400

--
 .../serializers/CounterSerializer.java  | 22 
 .../cassandra/type/CounterSerializer.java   | 22 
 2 files changed, 22 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/07e8942e/src/java/org/apache/cassandra/serializers/CounterSerializer.java
--
diff --git a/src/java/org/apache/cassandra/serializers/CounterSerializer.java 
b/src/java/org/apache/cassandra/serializers/CounterSerializer.java
new file mode 100644
index 000..b08ec1e
--- /dev/null
+++ b/src/java/org/apache/cassandra/serializers/CounterSerializer.java
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+package org.apache.cassandra.serializers;
+
+public class CounterSerializer extends LongSerializer
+{
+}

http://git-wip-us.apache.org/repos/asf/cassandra/blob/07e8942e/src/java/org/apache/cassandra/type/CounterSerializer.java
--
diff --git a/src/java/org/apache/cassandra/type/CounterSerializer.java 
b/src/java/org/apache/cassandra/type/CounterSerializer.java
deleted file mode 100644
index b08ec1e..000
--- a/src/java/org/apache/cassandra/type/CounterSerializer.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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.
- */
-package org.apache.cassandra.serializers;
-
-public class CounterSerializer extends LongSerializer
-{
-}



[jira] [Commented] (CASSANDRA-5661) Discard pooled readers for cold data

2013-07-13 Thread Ben Manes (JIRA)

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

Ben Manes commented on CASSANDRA-5661:
--

okay, fixed. thanks for catching this. The tests no longer use raw keys, which 
should catch this from occurring again.

 Discard pooled readers for cold data
 

 Key: CASSANDRA-5661
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5661
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.2.1
Reporter: Jonathan Ellis
Assignee: Pavel Yaskevich
 Fix For: 2.0

 Attachments: CASSANDRA-5661-multiway-per-sstable.patch, 
 CASSANDRA-5661.patch, CASSANDRA-5661-v2-global-multiway-per-sstable.patch, 
 DominatorTree.png, Histogram.png


 Reader pooling was introduced in CASSANDRA-4942 but pooled 
 RandomAccessReaders are never cleaned up until the SSTableReader is closed.  
 So memory use is the worst case simultaneous RAR we had open for this file, 
 forever.
 We should introduce a global limit on how much memory to use for RAR, and 
 evict old ones.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5755) shuffle clear fails

2013-07-13 Thread Dave Brosius (JIRA)

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

Dave Brosius commented on CASSANDRA-5755:
-

patch switches to new blob format

 shuffle clear fails
 ---

 Key: CASSANDRA-5755
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5755
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 1.2.6
Reporter: Radim Kolar
Assignee: Dave Brosius
 Fix For: 1.2.7

 Attachments: 5755.txt


 C:\cassandra2\binshuffle.bat clear
 Exception in thread main java.lang.RuntimeException: 
 InvalidRequestException(why:Invalid STRING constant (ee7f3e119820c96d) for 
 token_bytes of type blob)
 at 
 org.apache.cassandra.tools.Shuffle.executeCqlQuery(Shuffle.java:516)
 at org.apache.cassandra.tools.Shuffle.clear(Shuffle.java:439)
 at org.apache.cassandra.tools.Shuffle.main(Shuffle.java:689)
 Caused by: InvalidRequestException(why:Invalid STRING constant 
 (ee7f3e119820c96d
 ) for token_bytes of type blob)
 at 
 org.apache.cassandra.thrift.Cassandra$execute_cql3_query_result$execu
 te_cql3_query_resultStandardScheme.read(Cassandra.java:45153)
 at 
 org.apache.cassandra.thrift.Cassandra$execute_cql3_query_result$execu
 te_cql3_query_resultStandardScheme.read(Cassandra.java:45130)
 at 
 org.apache.cassandra.thrift.Cassandra$execute_cql3_query_result.read(

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-5755) shuffle clear fails

2013-07-13 Thread Dave Brosius (JIRA)

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

Dave Brosius updated CASSANDRA-5755:


Attachment: 5755.txt

 shuffle clear fails
 ---

 Key: CASSANDRA-5755
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5755
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 2.0 beta 1
Reporter: Radim Kolar
 Attachments: 5755.txt


 C:\cassandra2\binshuffle.bat clear
 Exception in thread main java.lang.RuntimeException: 
 InvalidRequestException(why:Invalid STRING constant (ee7f3e119820c96d) for 
 token_bytes of type blob)
 at 
 org.apache.cassandra.tools.Shuffle.executeCqlQuery(Shuffle.java:516)
 at org.apache.cassandra.tools.Shuffle.clear(Shuffle.java:439)
 at org.apache.cassandra.tools.Shuffle.main(Shuffle.java:689)
 Caused by: InvalidRequestException(why:Invalid STRING constant 
 (ee7f3e119820c96d
 ) for token_bytes of type blob)
 at 
 org.apache.cassandra.thrift.Cassandra$execute_cql3_query_result$execu
 te_cql3_query_resultStandardScheme.read(Cassandra.java:45153)
 at 
 org.apache.cassandra.thrift.Cassandra$execute_cql3_query_result$execu
 te_cql3_query_resultStandardScheme.read(Cassandra.java:45130)
 at 
 org.apache.cassandra.thrift.Cassandra$execute_cql3_query_result.read(

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-5755) shuffle clear fails

2013-07-13 Thread Dave Brosius (JIRA)

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

Dave Brosius updated CASSANDRA-5755:


Priority: Minor  (was: Major)

 shuffle clear fails
 ---

 Key: CASSANDRA-5755
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5755
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 1.2.6
Reporter: Radim Kolar
Assignee: Dave Brosius
Priority: Minor
 Fix For: 1.2.7

 Attachments: 5755.txt


 C:\cassandra2\binshuffle.bat clear
 Exception in thread main java.lang.RuntimeException: 
 InvalidRequestException(why:Invalid STRING constant (ee7f3e119820c96d) for 
 token_bytes of type blob)
 at 
 org.apache.cassandra.tools.Shuffle.executeCqlQuery(Shuffle.java:516)
 at org.apache.cassandra.tools.Shuffle.clear(Shuffle.java:439)
 at org.apache.cassandra.tools.Shuffle.main(Shuffle.java:689)
 Caused by: InvalidRequestException(why:Invalid STRING constant 
 (ee7f3e119820c96d
 ) for token_bytes of type blob)
 at 
 org.apache.cassandra.thrift.Cassandra$execute_cql3_query_result$execu
 te_cql3_query_resultStandardScheme.read(Cassandra.java:45153)
 at 
 org.apache.cassandra.thrift.Cassandra$execute_cql3_query_result$execu
 te_cql3_query_resultStandardScheme.read(Cassandra.java:45130)
 at 
 org.apache.cassandra.thrift.Cassandra$execute_cql3_query_result.read(

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-5756) shuffle disable subcommand not recognised

2013-07-13 Thread Dave Brosius (JIRA)

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

Dave Brosius updated CASSANDRA-5756:


Attachment: 5756.txt

fix simple typo in 2.0

 shuffle disable subcommand not recognised
 -

 Key: CASSANDRA-5756
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5756
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 2.0 beta 1
Reporter: Radim Kolar
 Attachments: 5756.txt


 command disable listed in help but not recognized
 C:\cassandra2\binshuffle.bat disable
 Unknown subcommand: disable
 Usage: shuffle [options] sub-command
 Sub-commands:
  create   Initialize a new shuffle operation
  ls   List pending relocations
  clearClear pending relocations
  en[able] Enable shuffling
  dis[able]Disable shuffling

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5661) Discard pooled readers for cold data

2013-07-13 Thread Pavel Yaskevich (JIRA)

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

Pavel Yaskevich commented on CASSANDRA-5661:


Thanks, it worked that time, I did a quick test on local machine with global 
cache backed by MultiwayPool.

MultiwayPool average run: median 3.1, 95th 4.7, 99.9th 21.9
FileCacheService (+ LinkedTranferQueue) average run: median 2.4, 95th 3.0, 
99.9th 17.1

It's the same setup that I used in my previous test with no writes and no 
compaction.

I will try to experiment with ArrayBlockingQueue as we know upper bound on 
concurrency and update my FileCacheService patch with either of them (LTQ vs. 
ABQ) soon.

 Discard pooled readers for cold data
 

 Key: CASSANDRA-5661
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5661
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.2.1
Reporter: Jonathan Ellis
Assignee: Pavel Yaskevich
 Fix For: 2.0

 Attachments: CASSANDRA-5661-multiway-per-sstable.patch, 
 CASSANDRA-5661.patch, CASSANDRA-5661-v2-global-multiway-per-sstable.patch, 
 DominatorTree.png, Histogram.png


 Reader pooling was introduced in CASSANDRA-4942 but pooled 
 RandomAccessReaders are never cleaned up until the SSTableReader is closed.  
 So memory use is the worst case simultaneous RAR we had open for this file, 
 forever.
 We should introduce a global limit on how much memory to use for RAR, and 
 evict old ones.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5661) Discard pooled readers for cold data

2013-07-13 Thread Ben Manes (JIRA)

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

Ben Manes commented on CASSANDRA-5661:
--

LTQ is best when you allow there to be some spin between producers and 
consumers, as its optimized for message passing scenarios. In your usage you 
don't allow any delay, so the likelihood of a successful transfer is low. When 
transfers are common, the overhead is less due to fewer contented CAS 
operations.

If desired, I can make the pool parameterized to take a supplier of queues to 
produce so you can parameterize that as well.

The pool will always be slower than the FileCacheService patch, since it does 
more. The decision is whether the performance degradation is acceptable and if 
the rational for the pool is to provide a finer grained eviction policy is 
still desired.

 Discard pooled readers for cold data
 

 Key: CASSANDRA-5661
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5661
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.2.1
Reporter: Jonathan Ellis
Assignee: Pavel Yaskevich
 Fix For: 2.0

 Attachments: CASSANDRA-5661-multiway-per-sstable.patch, 
 CASSANDRA-5661.patch, CASSANDRA-5661-v2-global-multiway-per-sstable.patch, 
 DominatorTree.png, Histogram.png


 Reader pooling was introduced in CASSANDRA-4942 but pooled 
 RandomAccessReaders are never cleaned up until the SSTableReader is closed.  
 So memory use is the worst case simultaneous RAR we had open for this file, 
 forever.
 We should introduce a global limit on how much memory to use for RAR, and 
 evict old ones.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5661) Discard pooled readers for cold data

2013-07-13 Thread Pavel Yaskevich (JIRA)

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

Pavel Yaskevich commented on CASSANDRA-5661:


I understand what is ideal use-case for LTQ is, I wanted to try it out since it 
was mentioned couple of times to have better results than CLQ under load.

I expected FileCacheService to be faster, I was just trying to check how much 
latency it actually adds even on such synthetic scenario as stress with no 
writes nor compaction. I strongly think (and I explained why multiple times) 
that we can't allow any degradation more than 0.5 ms in percentile on such 
critical path and why expiring items in bulk is okey for us since, in steady 
state, eviction would be driven by compactions cleaning all of open file 
descriptors per compacted sstable, where timed expiry would be very infrequent 
as read pattern doesn't change frequently in production systems.

 Discard pooled readers for cold data
 

 Key: CASSANDRA-5661
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5661
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.2.1
Reporter: Jonathan Ellis
Assignee: Pavel Yaskevich
 Fix For: 2.0

 Attachments: CASSANDRA-5661-multiway-per-sstable.patch, 
 CASSANDRA-5661.patch, CASSANDRA-5661-v2-global-multiway-per-sstable.patch, 
 DominatorTree.png, Histogram.png


 Reader pooling was introduced in CASSANDRA-4942 but pooled 
 RandomAccessReaders are never cleaned up until the SSTableReader is closed.  
 So memory use is the worst case simultaneous RAR we had open for this file, 
 forever.
 We should introduce a global limit on how much memory to use for RAR, and 
 evict old ones.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5753) cassandra-shuffle is not available for windows

2013-07-13 Thread Radim Kolar (JIRA)

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

Radim Kolar commented on CASSANDRA-5753:


easy to fix. copy cassandra-cli.bat and change name of main class

 cassandra-shuffle is not available for windows
 --

 Key: CASSANDRA-5753
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5753
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 2.0 beta 1
Reporter: Radim Kolar

 windows version (.BAT file) of cassandra-shuffle utility is missing

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Created] (CASSANDRA-5757) assertionError in repair

2013-07-13 Thread Radim Kolar (JIRA)
Radim Kolar created CASSANDRA-5757:
--

 Summary: assertionError in repair
 Key: CASSANDRA-5757
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5757
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 2.0 beta 1
Reporter: Radim Kolar


i increased replication factor and run repair, some token ranges were repaired 
okay, but one failed with:

 INFO 13:03:52,234 [repair #dd7937a0-ebab-11e2-ba07-c38e7fba9d51] session 
completed successfully
ERROR 13:03:52,343 Exception in thread Thread[ValidationExecutor:2,1,main]
java.lang.AssertionError: (max(9099058114996150811),max(-5486100704702537010)]
at org.apache.cassandra.db.DataRange.init(DataRange.java:50)
at org.apache.cassandra.db.DataRange.forKeyRange(DataRange.java:74)
at org.apache.cassandra.io.sstable.SSTableReader.getScanner(SSTableReade
r.java:1033)
at org.apache.cassandra.db.compaction.AbstractCompactionStrategy.getScan
ners(AbstractCompactionStrategy.java:214)
at org.apache.cassandra.db.compaction.CompactionManager$ValidationCompac
tionIterable.init(CompactionManager.java:751)
at org.apache.cassandra.db.compaction.CompactionManager.doValidationComp
action(CompactionManager.java:657)

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Created] (CASSANDRA-5758) Any exception hangs repair

2013-07-13 Thread Radim Kolar (JIRA)
Radim Kolar created CASSANDRA-5758:
--

 Summary: Any exception hangs repair
 Key: CASSANDRA-5758
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5758
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 2.0 beta 1, 1.2.5
Reporter: Radim Kolar


If there is any exception during repair, it hangs and never complete. This is 
far away from optimal error handling.

CASSANDRA-5646 and CASSANDRA-5757 and probably much other issues can be used to 
reproduce this problem for testing purposes.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5754) remove unused cli option schema-mwt

2013-07-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-5754:
---

Don't you also want to remove the associated field?

 remove unused cli option schema-mwt
 ---

 Key: CASSANDRA-5754
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5754
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Affects Versions: 2.0 beta 1
Reporter: Dave Brosius
Assignee: Dave Brosius
Priority: Trivial
 Fix For: 2.0.1

 Attachments: 5754.txt


 code processes schema-mwt command line option but does nothing with it... 
 removed.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5756) shuffle disable subcommand not recognised

2013-07-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-5756:
---

+1

 shuffle disable subcommand not recognised
 -

 Key: CASSANDRA-5756
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5756
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 2.0 beta 1
Reporter: Radim Kolar
Assignee: Dave Brosius
 Fix For: 2.0 beta 2

 Attachments: 5756.txt


 command disable listed in help but not recognized
 C:\cassandra2\binshuffle.bat disable
 Unknown subcommand: disable
 Usage: shuffle [options] sub-command
 Sub-commands:
  create   Initialize a new shuffle operation
  ls   List pending relocations
  clearClear pending relocations
  en[able] Enable shuffling
  dis[able]Disable shuffling

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5755) shuffle clear fails

2013-07-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-5755:
---

+1

(Note, changing this in 1.2.7 is fine, but it's not broken until 2.0 where we 
don't support the string syntax anymore.)

 shuffle clear fails
 ---

 Key: CASSANDRA-5755
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5755
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 1.2.6
Reporter: Radim Kolar
Assignee: Dave Brosius
Priority: Minor
 Fix For: 1.2.7

 Attachments: 5755.txt


 C:\cassandra2\binshuffle.bat clear
 Exception in thread main java.lang.RuntimeException: 
 InvalidRequestException(why:Invalid STRING constant (ee7f3e119820c96d) for 
 token_bytes of type blob)
 at 
 org.apache.cassandra.tools.Shuffle.executeCqlQuery(Shuffle.java:516)
 at org.apache.cassandra.tools.Shuffle.clear(Shuffle.java:439)
 at org.apache.cassandra.tools.Shuffle.main(Shuffle.java:689)
 Caused by: InvalidRequestException(why:Invalid STRING constant 
 (ee7f3e119820c96d
 ) for token_bytes of type blob)
 at 
 org.apache.cassandra.thrift.Cassandra$execute_cql3_query_result$execu
 te_cql3_query_resultStandardScheme.read(Cassandra.java:45153)
 at 
 org.apache.cassandra.thrift.Cassandra$execute_cql3_query_result$execu
 te_cql3_query_resultStandardScheme.read(Cassandra.java:45130)
 at 
 org.apache.cassandra.thrift.Cassandra$execute_cql3_query_result.read(

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


git commit: fix shuffle disable due to simple typo patch by dbrosius reviewed by jbellis for CASSANDRA-5756

2013-07-13 Thread dbrosius
Updated Branches:
  refs/heads/trunk 07e8942e5 - c5bca30a0


fix shuffle disable due to simple typo
patch by dbrosius reviewed by jbellis for CASSANDRA-5756


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

Branch: refs/heads/trunk
Commit: c5bca30a0f8d21c3c3b59fde0b8e1bd0581c8905
Parents: 07e8942
Author: Dave Brosius dbros...@apache.org
Authored: Sat Jul 13 13:55:32 2013 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Sat Jul 13 13:55:32 2013 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5bca30a/src/java/org/apache/cassandra/tools/Shuffle.java
--
diff --git a/src/java/org/apache/cassandra/tools/Shuffle.java 
b/src/java/org/apache/cassandra/tools/Shuffle.java
index 502c238..ac36e3b 100644
--- a/src/java/org/apache/cassandra/tools/Shuffle.java
+++ b/src/java/org/apache/cassandra/tools/Shuffle.java
@@ -683,7 +683,7 @@ public class Shuffle extends AbstractJmxClient
 shuffler.ls();
 else if (subCommand.startsWith(en))
 shuffler.enable();
-else if (subCommand.startsWith(in))
+else if (subCommand.startsWith(dis))
 shuffler.disable();
 else if (subCommand.equals(clear))
 shuffler.clear();



[jira] [Updated] (CASSANDRA-5754) remove unused cli option schema-mwt

2013-07-13 Thread Dave Brosius (JIRA)

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

Dave Brosius updated CASSANDRA-5754:


Attachment: 5754-2.txt

thanks! updated to 5754-2.txt 

 remove unused cli option schema-mwt
 ---

 Key: CASSANDRA-5754
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5754
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Affects Versions: 2.0 beta 1
Reporter: Dave Brosius
Assignee: Dave Brosius
Priority: Trivial
 Fix For: 2.0.1

 Attachments: 5754-2.txt, 5754.txt


 code processes schema-mwt command line option but does nothing with it... 
 removed.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


git commit: fix shuffle clear to use new blob literal format patch by dbrosius reviewed by jbellis for CASSANDRA-5755

2013-07-13 Thread dbrosius
Updated Branches:
  refs/heads/trunk c5bca30a0 - 0ed859a5d


fix shuffle clear to use new blob literal format
patch by dbrosius reviewed by jbellis for CASSANDRA-5755


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

Branch: refs/heads/trunk
Commit: 0ed859a5d0ece694f240b64e3212af37e0def1ac
Parents: c5bca30
Author: Dave Brosius dbros...@apache.org
Authored: Sat Jul 13 14:14:10 2013 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Sat Jul 13 14:14:10 2013 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ed859a5/src/java/org/apache/cassandra/tools/Shuffle.java
--
diff --git a/src/java/org/apache/cassandra/tools/Shuffle.java 
b/src/java/org/apache/cassandra/tools/Shuffle.java
index ac36e3b..b189ccb 100644
--- a/src/java/org/apache/cassandra/tools/Shuffle.java
+++ b/src/java/org/apache/cassandra/tools/Shuffle.java
@@ -434,7 +434,7 @@ public class Shuffle extends AbstractJmxClient
 assert row.getColumns().size() == 2;
 
 ByteBuffer tokenBytes = 
ByteBuffer.wrap(row.getColumns().get(0).getValue());
-String query = String.format(DELETE FROM system.range_xfers 
WHERE token_bytes = '%s',
+String query = String.format(DELETE FROM system.range_xfers 
WHERE token_bytes = 0x%s,
 ByteBufferUtil.bytesToHex(tokenBytes));
 executeCqlQuery(host, thriftPort, thriftFramed, query);
 }



[jira] [Updated] (CASSANDRA-5755) shuffle clear fails

2013-07-13 Thread Dave Brosius (JIRA)

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

Dave Brosius updated CASSANDRA-5755:


Affects Version/s: (was: 1.2.6)
   2.0 beta 1
Fix Version/s: (was: 1.2.7)

 shuffle clear fails
 ---

 Key: CASSANDRA-5755
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5755
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 2.0 beta 1
Reporter: Radim Kolar
Assignee: Dave Brosius
Priority: Minor
 Fix For: 2.0.1

 Attachments: 5755.txt


 C:\cassandra2\binshuffle.bat clear
 Exception in thread main java.lang.RuntimeException: 
 InvalidRequestException(why:Invalid STRING constant (ee7f3e119820c96d) for 
 token_bytes of type blob)
 at 
 org.apache.cassandra.tools.Shuffle.executeCqlQuery(Shuffle.java:516)
 at org.apache.cassandra.tools.Shuffle.clear(Shuffle.java:439)
 at org.apache.cassandra.tools.Shuffle.main(Shuffle.java:689)
 Caused by: InvalidRequestException(why:Invalid STRING constant 
 (ee7f3e119820c96d
 ) for token_bytes of type blob)
 at 
 org.apache.cassandra.thrift.Cassandra$execute_cql3_query_result$execu
 te_cql3_query_resultStandardScheme.read(Cassandra.java:45153)
 at 
 org.apache.cassandra.thrift.Cassandra$execute_cql3_query_result$execu
 te_cql3_query_resultStandardScheme.read(Cassandra.java:45130)
 at 
 org.apache.cassandra.thrift.Cassandra$execute_cql3_query_result.read(

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5754) remove unused cli option schema-mwt

2013-07-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-5754:
---

+1

 remove unused cli option schema-mwt
 ---

 Key: CASSANDRA-5754
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5754
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Affects Versions: 2.0 beta 1
Reporter: Dave Brosius
Assignee: Dave Brosius
Priority: Trivial
 Fix For: 2.0.1

 Attachments: 5754-2.txt, 5754.txt


 code processes schema-mwt command line option but does nothing with it... 
 removed.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5722) Cleanup should skip sstables that don't contain data outside a nodes ranges

2013-07-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-5722:
---

Thanks!  Pushed my cleanup to https://github.com/jbellis/cassandra/tree/5722.

 Cleanup should skip sstables that don't contain data outside a nodes ranges
 ---

 Key: CASSANDRA-5722
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5722
 Project: Cassandra
  Issue Type: Improvement
Reporter: Nick Bailey
Assignee: Tyler Hobbs
 Fix For: 2.0.1

 Attachments: 0001-Skip-cleanup-when-unneeded.patch


 Right now cleanup is optimized to simply delete sstables that *only* contain 
 data that doesn't belong on the node, for all other sstables though, it will 
 read them, check each row, and write out new sstables.
 Cleanup could be optimized to look at an sstable and determine that all data 
 within the sstable does belong on a node, and therefore skip re-writing that 
 sstable. This would make cleanup essentially a noop in the case where all 
 data on a node belongs on that node.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5722) Cleanup should skip sstables that don't contain data outside a nodes ranges

2013-07-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-5722:
---

Note to self, I do think we're 80% of the way to CASSANDRA-2524 here, so I 
should give that to you next. :)

 Cleanup should skip sstables that don't contain data outside a nodes ranges
 ---

 Key: CASSANDRA-5722
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5722
 Project: Cassandra
  Issue Type: Improvement
Reporter: Nick Bailey
Assignee: Tyler Hobbs
 Fix For: 2.0.1

 Attachments: 0001-Skip-cleanup-when-unneeded.patch


 Right now cleanup is optimized to simply delete sstables that *only* contain 
 data that doesn't belong on the node, for all other sstables though, it will 
 read them, check each row, and write out new sstables.
 Cleanup could be optimized to look at an sstable and determine that all data 
 within the sstable does belong on a node, and therefore skip re-writing that 
 sstable. This would make cleanup essentially a noop in the case where all 
 data on a node belongs on that node.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Comment Edited] (CASSANDRA-5722) Cleanup should skip sstables that don't contain data outside a nodes ranges

2013-07-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis edited comment on CASSANDRA-5722 at 7/13/13 9:08 PM:


Note to self, I do think we're 80% of the way to CASSANDRA-2524 here, so I 
should give that to you next. :)

Edit: Maybe 50%, looks like SSTScanner only takes a single Range as of yet.

  was (Author: jbellis):
Note to self, I do think we're 80% of the way to CASSANDRA-2524 here, so I 
should give that to you next. :)
  
 Cleanup should skip sstables that don't contain data outside a nodes ranges
 ---

 Key: CASSANDRA-5722
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5722
 Project: Cassandra
  Issue Type: Improvement
Reporter: Nick Bailey
Assignee: Tyler Hobbs
 Fix For: 2.0.1

 Attachments: 0001-Skip-cleanup-when-unneeded.patch


 Right now cleanup is optimized to simply delete sstables that *only* contain 
 data that doesn't belong on the node, for all other sstables though, it will 
 read them, check each row, and write out new sstables.
 Cleanup could be optimized to look at an sstable and determine that all data 
 within the sstable does belong on a node, and therefore skip re-writing that 
 sstable. This would make cleanup essentially a noop in the case where all 
 data on a node belongs on that node.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Resolved] (CASSANDRA-5753) cassandra-shuffle is not available for windows

2013-07-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis resolved CASSANDRA-5753.
---

   Resolution: Fixed
Fix Version/s: 2.0 beta 2
   1.2.7
 Assignee: Jonathan Ellis

Done in fa327aa699d4c6a72ea0a194c129d40e48d43024

 cassandra-shuffle is not available for windows
 --

 Key: CASSANDRA-5753
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5753
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 2.0 beta 1
Reporter: Radim Kolar
Assignee: Jonathan Ellis
 Fix For: 1.2.7, 2.0 beta 2


 windows version (.BAT file) of cassandra-shuffle utility is missing

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[1/3] git commit: add cassandra-shuffle.bat

2013-07-13 Thread jbellis
Updated Branches:
  refs/heads/cassandra-1.2 71afb93d9 - fa327aa69
  refs/heads/trunk 0ed859a5d - b2eec795c


add cassandra-shuffle.bat


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

Branch: refs/heads/cassandra-1.2
Commit: fa327aa699d4c6a72ea0a194c129d40e48d43024
Parents: 71afb93
Author: Jonathan Ellis jbel...@apache.org
Authored: Sat Jul 13 16:14:29 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sat Jul 13 16:15:01 2013 -0500

--
 bin/cassandra-shuffle.bat | 51 ++
 1 file changed, 51 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa327aa6/bin/cassandra-shuffle.bat
--
diff --git a/bin/cassandra-shuffle.bat b/bin/cassandra-shuffle.bat
new file mode 100644
index 000..d920d09
--- /dev/null
+++ b/bin/cassandra-shuffle.bat
@@ -0,0 +1,51 @@
+@REM
+@REM  Licensed to the Apache Software Foundation (ASF) under one or more
+@REM  contributor license agreements.  See the NOTICE file distributed with
+@REM  this work for additional information regarding copyright ownership.
+@REM  The ASF licenses this file to You under the Apache License, Version 2.0
+@REM  (the License); you may not use this file except in compliance with
+@REM  the License.  You may obtain a copy of the License at
+@REM
+@REM  http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM  Unless required by applicable law or agreed to in writing, software
+@REM  distributed under the License is distributed on an AS IS BASIS,
+@REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM  See the License for the specific language governing permissions and
+@REM  limitations under the License.
+
+
+@echo off
+if %OS% == Windows_NT setlocal
+
+if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
+if NOT DEFINED JAVA_HOME goto :err
+
+REM Ensure that any user defined CLASSPATH variables are not used on startup
+set CLASSPATH=
+
+REM For each jar in the CASSANDRA_HOME lib directory call append to build the 
CLASSPATH variable.
+for %%i in (%CASSANDRA_HOME%\lib\*.jar) do call :append %%i
+goto okClasspath
+
+:append
+set CLASSPATH=%CLASSPATH%;%1
+goto :eof
+
+:okClasspath
+REM Include the build\classes\main directory so it works in development
+set 
CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_HOME%\build\classes\thrift
+goto runCli
+
+:runCli
+echo Starting Cassandra Client
+%JAVA_HOME%\bin\java -cp %CASSANDRA_CLASSPATH% 
org.apache.cassandra.tools.Shuffle %*
+goto finally
+
+:err
+echo The JAVA_HOME environment variable must be set to run this program!
+pause
+
+:finally
+
+ENDLOCAL



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

2013-07-13 Thread jbellis
Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: b2eec795c9a8646359f8ac98e201a85b034bfc8d
Parents: 0ed859a fa327aa
Author: Jonathan Ellis jbel...@apache.org
Authored: Sat Jul 13 16:15:12 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sat Jul 13 16:15:12 2013 -0500

--
 bin/cassandra-shuffle.bat | 51 ++
 1 file changed, 51 insertions(+)
--




[2/3] git commit: add cassandra-shuffle.bat

2013-07-13 Thread jbellis
add cassandra-shuffle.bat


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

Branch: refs/heads/trunk
Commit: fa327aa699d4c6a72ea0a194c129d40e48d43024
Parents: 71afb93
Author: Jonathan Ellis jbel...@apache.org
Authored: Sat Jul 13 16:14:29 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sat Jul 13 16:15:01 2013 -0500

--
 bin/cassandra-shuffle.bat | 51 ++
 1 file changed, 51 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa327aa6/bin/cassandra-shuffle.bat
--
diff --git a/bin/cassandra-shuffle.bat b/bin/cassandra-shuffle.bat
new file mode 100644
index 000..d920d09
--- /dev/null
+++ b/bin/cassandra-shuffle.bat
@@ -0,0 +1,51 @@
+@REM
+@REM  Licensed to the Apache Software Foundation (ASF) under one or more
+@REM  contributor license agreements.  See the NOTICE file distributed with
+@REM  this work for additional information regarding copyright ownership.
+@REM  The ASF licenses this file to You under the Apache License, Version 2.0
+@REM  (the License); you may not use this file except in compliance with
+@REM  the License.  You may obtain a copy of the License at
+@REM
+@REM  http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM  Unless required by applicable law or agreed to in writing, software
+@REM  distributed under the License is distributed on an AS IS BASIS,
+@REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM  See the License for the specific language governing permissions and
+@REM  limitations under the License.
+
+
+@echo off
+if %OS% == Windows_NT setlocal
+
+if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
+if NOT DEFINED JAVA_HOME goto :err
+
+REM Ensure that any user defined CLASSPATH variables are not used on startup
+set CLASSPATH=
+
+REM For each jar in the CASSANDRA_HOME lib directory call append to build the 
CLASSPATH variable.
+for %%i in (%CASSANDRA_HOME%\lib\*.jar) do call :append %%i
+goto okClasspath
+
+:append
+set CLASSPATH=%CLASSPATH%;%1
+goto :eof
+
+:okClasspath
+REM Include the build\classes\main directory so it works in development
+set 
CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_HOME%\build\classes\thrift
+goto runCli
+
+:runCli
+echo Starting Cassandra Client
+%JAVA_HOME%\bin\java -cp %CASSANDRA_CLASSPATH% 
org.apache.cassandra.tools.Shuffle %*
+goto finally
+
+:err
+echo The JAVA_HOME environment variable must be set to run this program!
+pause
+
+:finally
+
+ENDLOCAL



[jira] [Updated] (CASSANDRA-5753) cassandra-shuffle is not available for windows

2013-07-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-5753:
--

 Priority: Trivial  (was: Major)
Affects Version/s: (was: 2.0 beta 1)
   1.2.0

 cassandra-shuffle is not available for windows
 --

 Key: CASSANDRA-5753
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5753
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 1.2.0
Reporter: Radim Kolar
Assignee: Jonathan Ellis
Priority: Trivial
 Fix For: 1.2.7, 2.0 beta 2


 windows version (.BAT file) of cassandra-shuffle utility is missing

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5758) Any exception hangs repair

2013-07-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-5758:
---

Repair was updated for 2.0b1 in CASSANDRA-5426.  Please provide more details 
about what you see there since it is no longer similar to the 1.2 design.

 Any exception hangs repair
 --

 Key: CASSANDRA-5758
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5758
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.2.5, 2.0 beta 1
Reporter: Radim Kolar

 If there is any exception during repair, it hangs and never complete. This is 
 far away from optimal error handling.
 CASSANDRA-5646 and CASSANDRA-5757 and probably much other issues can be used 
 to reproduce this problem for testing purposes.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5758) Any exception hangs repair

2013-07-13 Thread Radim Kolar (JIRA)

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

Radim Kolar commented on CASSANDRA-5758:


Actually any time I see exception during repair then repair hangs and you can 
not run other repair until you restart node.

if you want example for 2.0 then CASSANDRA-5757 hangs repair.

 Any exception hangs repair
 --

 Key: CASSANDRA-5758
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5758
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.2.5, 2.0 beta 1
Reporter: Radim Kolar

 If there is any exception during repair, it hangs and never complete. This is 
 far away from optimal error handling.
 CASSANDRA-5646 and CASSANDRA-5757 and probably much other issues can be used 
 to reproduce this problem for testing purposes.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


git commit: remove unimplemented cli option schema-mwt patch by dbrosius reviewed by jbellis for CASSANDRA-5754

2013-07-13 Thread dbrosius
Updated Branches:
  refs/heads/trunk b2eec795c - 295984dbd


remove unimplemented cli option schema-mwt
patch by dbrosius reviewed by jbellis for CASSANDRA-5754


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

Branch: refs/heads/trunk
Commit: 295984dbd08598793cf2d072705010302fed205c
Parents: b2eec79
Author: Dave Brosius dbros...@apache.org
Authored: Sat Jul 13 19:50:23 2013 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Sat Jul 13 19:50:23 2013 -0400

--
 CHANGES.txt| 2 +-
 src/java/org/apache/cassandra/cli/CliOptions.java  | 9 +
 src/java/org/apache/cassandra/cli/CliSessionState.java | 1 -
 3 files changed, 2 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/295984db/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index fd3496d..4656160 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
 2.0.0-beta2
  * Allow nodetool with no args, and with help to run without a server 
(CASSANDRA-5734)
  * Cleanup AbstractType/TypeSerializer classes (CASSANDRA-5744)
-
+ * Remove unimplemented cli option schema-mwt (CASSANDRA-5754)
 
 2.0.0-beta1
  * Removed on-heap row cache (CASSANDRA-5348)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/295984db/src/java/org/apache/cassandra/cli/CliOptions.java
--
diff --git a/src/java/org/apache/cassandra/cli/CliOptions.java 
b/src/java/org/apache/cassandra/cli/CliOptions.java
index f64cceb..464d092 100644
--- a/src/java/org/apache/cassandra/cli/CliOptions.java
+++ b/src/java/org/apache/cassandra/cli/CliOptions.java
@@ -47,7 +47,6 @@ public class CliOptions
 private static final String JMX_USERNAME_OPTION = jmxusername;
 private static final String JMX_PASSWORD_OPTION = jmxpassword;
 private static final String VERBOSE_OPTION  = verbose;
-private static final String SCHEMA_MIGRATION_WAIT_TIME = schema-mwt;
 
 private static final String SSL_TRUSTSTORE = truststore;
 private static final String SSL_TRUSTSTORE_PW = truststore-password;
@@ -75,7 +74,6 @@ public class CliOptions
 options.addOption(null, JMX_PORT_OPTION, JMX-PORT, JMX service 
port);
 options.addOption(null, JMX_USERNAME_OPTION, JMX-USERNAME, JMX 
service username);
 options.addOption(null, JMX_PASSWORD_OPTION, JMX-PASSWORD, JMX 
service password);
-options.addOption(null, SCHEMA_MIGRATION_WAIT_TIME,  TIME, Schema 
migration wait time (secs.), default is 10 secs);
 options.addOption(tf, TRANSPORT_FACTORY, TRANSPORT-FACTORY, 
Fully-qualified TTransportFactory class name for creating a connection to 
cassandra);
 
 // ssl connection-related options
@@ -188,11 +186,6 @@ public class CliOptions
 css.verbose = true;
 }
 
-if (cmd.hasOption(SCHEMA_MIGRATION_WAIT_TIME))
-{
-css.schema_mwt = 
Integer.parseInt(cmd.getOptionValue(SCHEMA_MIGRATION_WAIT_TIME)) * 1000;
-}
-
 if(cmd.hasOption(SSL_TRUSTSTORE))
 {
 css.encOptions.truststore = cmd.getOptionValue(SSL_TRUSTSTORE);
@@ -276,7 +269,7 @@ public class CliOptions
 {
 try
 {
-Class factory = Class.forName(transportFactory);
+Class? factory = Class.forName(transportFactory);
 
 if(!TTransportFactory.class.isAssignableFrom(factory))
 throw new IllegalArgumentException(String.format(transport 
factory '%s'  +

http://git-wip-us.apache.org/repos/asf/cassandra/blob/295984db/src/java/org/apache/cassandra/cli/CliSessionState.java
--
diff --git a/src/java/org/apache/cassandra/cli/CliSessionState.java 
b/src/java/org/apache/cassandra/cli/CliSessionState.java
index 2178f8a..9e833c6 100644
--- a/src/java/org/apache/cassandra/cli/CliSessionState.java
+++ b/src/java/org/apache/cassandra/cli/CliSessionState.java
@@ -44,7 +44,6 @@ public class CliSessionState
 public String  jmxUsername;   // JMX service username
 public String  jmxPassword;   // JMX service password
 public boolean verbose = false; // verbose output
-public int schema_mwt = 10 * 1000;// Schema migration wait time 
(secs.)
 public TTransportFactory transportFactory = new FramedTransportFactory();
 public EncryptionOptions encOptions = new ClientEncryptionOptions();
 



[jira] [Resolved] (CASSANDRA-5754) remove unused cli option schema-mwt

2013-07-13 Thread Dave Brosius (JIRA)

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

Dave Brosius resolved CASSANDRA-5754.
-

Resolution: Fixed
  Reviewer: jbellis

committed to trunk as 295984dbd08598793cf2d072705010302fed205c

 remove unused cli option schema-mwt
 ---

 Key: CASSANDRA-5754
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5754
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Affects Versions: 2.0 beta 1
Reporter: Dave Brosius
Assignee: Dave Brosius
Priority: Trivial
 Fix For: 2.0.1

 Attachments: 5754-2.txt, 5754.txt


 code processes schema-mwt command line option but does nothing with it... 
 removed.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira