[2/3] git commit: Fix super column filter conversion

2014-05-05 Thread slebresne
Fix super column filter conversion

patch by slebresne; reviewed by thobbs for CASSANDRA-7138


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

Branch: refs/heads/cassandra-2.1
Commit: 7e8efd1bbc8e25c9503883bee895df168e5a99b8
Parents: 706afc3
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon May 5 09:21:46 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon May 5 09:21:46 2014 +0200

--
 CHANGES.txt   |  1 +
 src/java/org/apache/cassandra/db/SuperColumns.java|  5 -
 .../org/apache/cassandra/thrift/CassandraServer.java  | 14 ++
 3 files changed, 15 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e8efd1b/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5332c65..ddcb09c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
 2.1.0-rc1
  * Parallel streaming for sstableloader (CASSANDRA-3668)
+ * Fix bugs in supercolumns handling (CASSANDRA-7138)
 Merged from 2.0:
  * Make batchlog replica selection rack-aware (CASSANDRA-6551)
  * Suggest CTRL-C or semicolon after three blank lines in cqlsh 
(CASSANDRA-7142)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e8efd1b/src/java/org/apache/cassandra/db/SuperColumns.java
--
diff --git a/src/java/org/apache/cassandra/db/SuperColumns.java 
b/src/java/org/apache/cassandra/db/SuperColumns.java
index bab46eb..2006cbd 100644
--- a/src/java/org/apache/cassandra/db/SuperColumns.java
+++ b/src/java/org/apache/cassandra/db/SuperColumns.java
@@ -184,7 +184,10 @@ public class SuperColumns
 int i = 0;
 for (CellName name : filter.columns)
 {
-slices[i++] = name.slice();
+// Note that, because the filter in argument is the one from 
thrift, 'name' are SimpleDenseCellName.
+// So calling name.slice() would be incorrect, as simple cell 
names don't handle the EOC properly.
+// This is why we call toByteBuffer() and rebuild a  Composite 
of the right type before call slice().
+slices[i++] = type.make(name.toByteBuffer()).slice();
 }
 return new SliceQueryFilter(slices, false, slices.length, 1);
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e8efd1b/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java 
b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 069cec7..5a296f3 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -381,12 +381,18 @@ public class CassandraServer implements Cassandra.Iface
 
 private SliceQueryFilter toInternalFilter(CFMetaData metadata, 
ColumnParent parent, SliceRange range)
 {
+if (metadata.isSuper())
+{
+CellNameType columnType = new 
SimpleDenseCellNameType(metadata.comparator.subtype(parent.isSetSuper_column() 
? 1 : 0));
+Composite start = columnType.fromByteBuffer(range.start);
+Composite finish = columnType.fromByteBuffer(range.finish);
+SliceQueryFilter filter = new SliceQueryFilter(start, finish, 
range.reversed, range.count);
+return SuperColumns.fromSCSliceFilter(metadata.comparator, 
parent.bufferForSuper_column(), filter);
+}
+
 Composite start = metadata.comparator.fromByteBuffer(range.start);
 Composite finish = metadata.comparator.fromByteBuffer(range.finish);
-SliceQueryFilter filter = new SliceQueryFilter(start, finish, 
range.reversed, range.count);
-if (metadata.isSuper())
-filter = SuperColumns.fromSCSliceFilter(metadata.comparator, 
parent.bufferForSuper_column(), filter);
-return filter;
+return new SliceQueryFilter(start, finish, range.reversed, 
range.count);
 }
 
 private IDiskAtomFilter toInternalFilter(CFMetaData metadata, ColumnParent 
parent, SlicePredicate predicate)



[1/4] git commit: Fixup for CASSANDRA-6831 on 2.1

2014-05-05 Thread slebresne
Repository: cassandra
Updated Branches:
  refs/heads/trunk f3945bce7 - ddd2ff7d6


Fixup for CASSANDRA-6831 on 2.1


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

Branch: refs/heads/trunk
Commit: 706afc300d9b298cb9456671a514cc9580b94ecc
Parents: a5266bc
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon May 5 09:20:18 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon May 5 09:20:18 2014 +0200

--
 interface/cassandra.thrift  |   3 +-
 .../org/apache/cassandra/config/CFMetaData.java | 108 +--
 .../cassandra/config/ColumnDefinition.java  |  34 +++---
 .../cassandra/config/ColumnDefinitionTest.java  |   2 +-
 4 files changed, 72 insertions(+), 75 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/706afc30/interface/cassandra.thrift
--
diff --git a/interface/cassandra.thrift b/interface/cassandra.thrift
index 51d6786..4beb2eb 100644
--- a/interface/cassandra.thrift
+++ b/interface/cassandra.thrift
@@ -467,7 +467,6 @@ struct CfDef {
 33: optional double bloom_filter_fp_chance,
 34: optional string caching=keys_only,
 37: optional double dclocal_read_repair_chance = 0.0,
-38: optional bool populate_io_cache_on_flush,
 39: optional i32 memtable_flush_period_in_ms,
 40: optional i32 default_time_to_live,
 42: optional string speculative_retry=NONE,
@@ -501,6 +500,8 @@ struct CfDef {
 /** @deprecated */
 31: optional i32 row_cache_keys_to_save,
 /** @deprecated */
+38: optional bool populate_io_cache_on_flush,
+/** @deprecated */
 41: optional i32 index_interval,
 }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/706afc30/src/java/org/apache/cassandra/config/CFMetaData.java
--
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java 
b/src/java/org/apache/cassandra/config/CFMetaData.java
index 2e531e8..2df42ae 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -58,7 +58,6 @@ import 
org.apache.cassandra.cql3.statements.CreateTableStatement;
 import org.apache.cassandra.db.AbstractCell;
 import org.apache.cassandra.db.AtomDeserializer;
 import org.apache.cassandra.db.CFRowAdder;
-import org.apache.cassandra.db.Cell;
 import org.apache.cassandra.db.ColumnFamily;
 import org.apache.cassandra.db.ColumnFamilyStore;
 import org.apache.cassandra.db.ColumnFamilyType;
@@ -69,7 +68,6 @@ import org.apache.cassandra.db.Mutation;
 import org.apache.cassandra.db.OnDiskAtom;
 import org.apache.cassandra.db.RangeTombstone;
 import org.apache.cassandra.db.Row;
-import org.apache.cassandra.db.SuperColumns;
 import org.apache.cassandra.db.SystemKeyspace;
 import org.apache.cassandra.db.compaction.AbstractCompactionStrategy;
 import org.apache.cassandra.db.compaction.LeveledCompactionStrategy;
@@ -97,6 +95,7 @@ import org.apache.cassandra.io.compress.CompressionParameters;
 import org.apache.cassandra.io.compress.LZ4Compressor;
 import org.apache.cassandra.io.sstable.Descriptor;
 import org.apache.cassandra.serializers.MarshalException;
+import org.apache.cassandra.thrift.CfDef;
 import org.apache.cassandra.thrift.CqlResult;
 import org.apache.cassandra.thrift.CqlRow;
 import org.apache.cassandra.tracing.Tracing;
@@ -999,45 +998,18 @@ public final class CFMetaData
 }
 }
 
-public static CFMetaData fromThrift(org.apache.cassandra.thrift.CfDef 
cf_def) throws InvalidRequestException, ConfigurationException
+public static CFMetaData fromThrift(CfDef cf_def) throws 
InvalidRequestException, ConfigurationException
 {
-CFMetaData cfm = internalFromThrift(cf_def);
-
-if (cf_def.isSetKey_alias()  !(cfm.keyValidator instanceof 
CompositeType))
-
cfm.addOrReplaceColumnDefinition(ColumnDefinition.partitionKeyDef(cfm, 
cf_def.key_alias, cfm.keyValidator, null));
-
-return cfm.rebuild();
+return internalFromThrift(cf_def, 
Collections.ColumnDefinitionemptyList());
 }
 
-public static CFMetaData 
fromThriftForUpdate(org.apache.cassandra.thrift.CfDef cf_def, CFMetaData 
toUpdate) throws InvalidRequestException, ConfigurationException
+public static CFMetaData fromThriftForUpdate(CfDef cf_def, CFMetaData 
toUpdate) throws InvalidRequestException, ConfigurationException
 {
-CFMetaData cfm = internalFromThrift(cf_def);
-
-// Thrift update can't have CQL metadata, and so we'll copy the ones 
of the updated metadata (to make
- 

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

2014-05-05 Thread slebresne
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/ddd2ff7d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddd2ff7d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddd2ff7d

Branch: refs/heads/trunk
Commit: ddd2ff7d63c9a9977eb2dd25936cecbb2ecd1cfb
Parents: f3945bc 3aa41fb
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon May 5 09:28:12 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon May 5 09:28:12 2014 +0200

--
 CHANGES.txt |   2 +
 interface/cassandra.thrift  |   3 +-
 .../org/apache/cassandra/config/CFMetaData.java | 108 +--
 .../cassandra/config/ColumnDefinition.java  |  34 +++---
 .../org/apache/cassandra/db/SuperColumns.java   |   5 +-
 .../composites/CompoundDenseCellNameType.java   |   8 +-
 .../cassandra/thrift/CassandraServer.java   |  14 ++-
 .../cassandra/config/ColumnDefinitionTest.java  |   2 +-
 8 files changed, 92 insertions(+), 84 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddd2ff7d/CHANGES.txt
--
diff --cc CHANGES.txt
index bc6db0d,2f55eee..f587a55
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,7 +1,15 @@@
 +3.0
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 +
  2.1.0-rc1
   * Parallel streaming for sstableloader (CASSANDRA-3668)
+  * Fix bugs in supercolumns handling (CASSANDRA-7138)
+  * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
  Merged from 2.0:
   * Make batchlog replica selection rack-aware (CASSANDRA-6551)
   * Suggest CTRL-C or semicolon after three blank lines in cqlsh 
(CASSANDRA-7142)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddd2ff7d/interface/cassandra.thrift
--

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddd2ff7d/src/java/org/apache/cassandra/thrift/CassandraServer.java
--



[2/4] git commit: Fix super column filter conversion

2014-05-05 Thread slebresne
Fix super column filter conversion

patch by slebresne; reviewed by thobbs for CASSANDRA-7138


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

Branch: refs/heads/trunk
Commit: 7e8efd1bbc8e25c9503883bee895df168e5a99b8
Parents: 706afc3
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon May 5 09:21:46 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon May 5 09:21:46 2014 +0200

--
 CHANGES.txt   |  1 +
 src/java/org/apache/cassandra/db/SuperColumns.java|  5 -
 .../org/apache/cassandra/thrift/CassandraServer.java  | 14 ++
 3 files changed, 15 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e8efd1b/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5332c65..ddcb09c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
 2.1.0-rc1
  * Parallel streaming for sstableloader (CASSANDRA-3668)
+ * Fix bugs in supercolumns handling (CASSANDRA-7138)
 Merged from 2.0:
  * Make batchlog replica selection rack-aware (CASSANDRA-6551)
  * Suggest CTRL-C or semicolon after three blank lines in cqlsh 
(CASSANDRA-7142)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e8efd1b/src/java/org/apache/cassandra/db/SuperColumns.java
--
diff --git a/src/java/org/apache/cassandra/db/SuperColumns.java 
b/src/java/org/apache/cassandra/db/SuperColumns.java
index bab46eb..2006cbd 100644
--- a/src/java/org/apache/cassandra/db/SuperColumns.java
+++ b/src/java/org/apache/cassandra/db/SuperColumns.java
@@ -184,7 +184,10 @@ public class SuperColumns
 int i = 0;
 for (CellName name : filter.columns)
 {
-slices[i++] = name.slice();
+// Note that, because the filter in argument is the one from 
thrift, 'name' are SimpleDenseCellName.
+// So calling name.slice() would be incorrect, as simple cell 
names don't handle the EOC properly.
+// This is why we call toByteBuffer() and rebuild a  Composite 
of the right type before call slice().
+slices[i++] = type.make(name.toByteBuffer()).slice();
 }
 return new SliceQueryFilter(slices, false, slices.length, 1);
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e8efd1b/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java 
b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 069cec7..5a296f3 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -381,12 +381,18 @@ public class CassandraServer implements Cassandra.Iface
 
 private SliceQueryFilter toInternalFilter(CFMetaData metadata, 
ColumnParent parent, SliceRange range)
 {
+if (metadata.isSuper())
+{
+CellNameType columnType = new 
SimpleDenseCellNameType(metadata.comparator.subtype(parent.isSetSuper_column() 
? 1 : 0));
+Composite start = columnType.fromByteBuffer(range.start);
+Composite finish = columnType.fromByteBuffer(range.finish);
+SliceQueryFilter filter = new SliceQueryFilter(start, finish, 
range.reversed, range.count);
+return SuperColumns.fromSCSliceFilter(metadata.comparator, 
parent.bufferForSuper_column(), filter);
+}
+
 Composite start = metadata.comparator.fromByteBuffer(range.start);
 Composite finish = metadata.comparator.fromByteBuffer(range.finish);
-SliceQueryFilter filter = new SliceQueryFilter(start, finish, 
range.reversed, range.count);
-if (metadata.isSuper())
-filter = SuperColumns.fromSCSliceFilter(metadata.comparator, 
parent.bufferForSuper_column(), filter);
-return filter;
+return new SliceQueryFilter(start, finish, range.reversed, 
range.count);
 }
 
 private IDiskAtomFilter toInternalFilter(CFMetaData metadata, ColumnParent 
parent, SlicePredicate predicate)



[jira] [Commented] (CASSANDRA-7148) Auto pagination finds 999 791 out of 1 000 000 rows

2014-05-05 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-7148:
-

Have you tried using QUORUM consistency for writes and reads instead of CAS? 
You might also want to give a shot at C* 2.0.7 too since there has been a few 
paging related fix in that release.

 Auto pagination finds 999 791 out of 1 000 000 rows
 ---

 Key: CASSANDRA-7148
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7148
 Project: Cassandra
  Issue Type: Bug
Reporter: bodrin

 In a cluster of 3 nodes cassandra 2.0.6 with replication factor=3 and with 
 the following schema:
 CREATE TABLE IF NOT EXISTS test (
   org varchar,
   department varchar,
   id varchar,
   area varchar,
   value text, // json
   PRIMARY KEY ((org), department, id)
 );
 CREATE INDEX IF NOT EXISTS ON test(area);
 I have inserted 1 000 000 rows this way:
 String insert = INSERT INTO test (org, department, id, area, value) VALUES 
 (?, ?, ?, ?, ?);
   for (int organization = 0; organization  500; organization++) {
  for (int department = 0; department  2; department++) {
 for (int area = 0; area  2; area++) {
for (int id = 0; id  500; id++) {
   String orgValue = org + organization;
   String departmentValue = department + 
 department;
   String areaValue = area + area;
   String idValue = 
 UUID.randomUUID().toString();
   // insert a single row here
 ...
 Then just read them all:
   int count = 0;
   ResultSet rs = session.execute(select * from test limit 100);
   IteratorRow i = rs.iterator();
   while (i.hasNext()) {
  Row row = i.next();
  count++;
   }
 
 and the count is 999791 (this tooks 33 seconds)
 while at the same time 
 cqlsh:t2 select count(*) from test limit 100;
  count
 -
  100
  I have also verified that all the queries of kind
  select * from test where area=areaXXX
  return 500 entries as expected and 2000*500 is 1 000 000



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


[jira] [Commented] (CASSANDRA-6696) Drive replacement in JBOD can cause data to reappear.

2014-05-05 Thread Marcus Eriksson (JIRA)

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

Marcus Eriksson commented on CASSANDRA-6696:


summing up the discussion;

* one stripe is one vnode
* we flush to big files in L0, file per disk or perhaps group a bunch of vnodes 
together to increase the amount of parallel compactions we can do L0 - L1

for STCS:
* we introduce L0 for STCS
* when we end up with a given number of overlapping L0 files (4), we compact 
those together and create per-vnode L1 files.
* major compaction: include all files in compaction, write #vnodes files

for LCS:
* We introduce a leveled manifest per vnode
* L0 is global
* when doing L0 - L1 compactions, we end up with one file per involved 
vnode-stripe in L1, here we can gain a lot by not flushing too big L0 files.
* we still do STCS within L0 if we get too much data here, making sure we only 
compact overlapping files

anything i missed/misunderstood?

 Drive replacement in JBOD can cause data to reappear. 
 --

 Key: CASSANDRA-6696
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6696
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: sankalp kohli
Assignee: Marcus Eriksson
 Fix For: 3.0


 In JBOD, when someone gets a bad drive, the bad drive is replaced with a new 
 empty one and repair is run. 
 This can cause deleted data to come back in some cases. Also this is true for 
 corrupt stables in which we delete the corrupt stable and run repair. 
 Here is an example:
 Say we have 3 nodes A,B and C and RF=3 and GC grace=10days. 
 row=sankalp col=sankalp is written 20 days back and successfully went to all 
 three nodes. 
 Then a delete/tombstone was written successfully for the same row column 15 
 days back. 
 Since this tombstone is more than gc grace, it got compacted in Nodes A and B 
 since it got compacted with the actual data. So there is no trace of this row 
 column in node A and B.
 Now in node C, say the original data is in drive1 and tombstone is in drive2. 
 Compaction has not yet reclaimed the data and tombstone.  
 Drive2 becomes corrupt and was replaced with new empty drive. 
 Due to the replacement, the tombstone in now gone and row=sankalp col=sankalp 
 has come back to life. 
 Now after replacing the drive we run repair. This data will be propagated to 
 all nodes. 
 Note: This is still a problem even if we run repair every gc grace. 
  



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


[jira] [Updated] (CASSANDRA-7152) DevCenter results copy

2014-05-05 Thread JIRA

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

Kévin LOVATO updated CASSANDRA-7152:


Issue Type: Improvement  (was: Bug)

 DevCenter results copy
 --

 Key: CASSANDRA-7152
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7152
 Project: Cassandra
  Issue Type: Improvement
Reporter: Kévin LOVATO

 It's great that we now can copy the results to a CSV or Insert statement, but 
 handling CTRL+C / CTRL+Insert would be nice.



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


[jira] [Created] (CASSANDRA-7154) Add application icon for DevCenter in taskbar

2014-05-05 Thread Antoine Blanchet (JIRA)
Antoine Blanchet created CASSANDRA-7154:
---

 Summary: Add application icon for DevCenter in taskbar
 Key: CASSANDRA-7154
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7154
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
 Environment: Windows 7 64bit
Reporter: Antoine Blanchet
Priority: Minor


Please add an application icon for DevCenter on Windows, it's a bit uggly in 
the taskbar.

Note : The taskbar icon is OK during the splashscreen, and then turn default 
when the actual application starts.



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


[jira] [Resolved] (CASSANDRA-7152) DevCenter results copy

2014-05-05 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne resolved CASSANDRA-7152.
-

Resolution: Invalid

See CASSANDRA-7150

 DevCenter results copy
 --

 Key: CASSANDRA-7152
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7152
 Project: Cassandra
  Issue Type: Improvement
Reporter: Kévin LOVATO

 It's great that we now can copy the results to a CSV or Insert statement, but 
 handling CTRL+C / CTRL+Insert would be nice.



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


Git Push Summary

2014-05-05 Thread slebresne
Repository: cassandra
Updated Tags:  refs/tags/2.1.0-beta2-tentative [deleted] 48727b4cc


Git Push Summary

2014-05-05 Thread slebresne
Repository: cassandra
Updated Tags:  refs/tags/cassandra-2.1.0-beta2 [created] 3bb78e53d


[jira] [Updated] (CASSANDRA-7053) USING TIMESTAMP for batches does not work

2014-05-05 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-7053:


Fix Version/s: (was: 2.1 beta2)

 USING TIMESTAMP for batches does not work
 -

 Key: CASSANDRA-7053
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7053
 Project: Cassandra
  Issue Type: Bug
Reporter: Robert Supencheck
Assignee: Mikhail Stepura
  Labels: cqlsh
 Fix For: 2.0.8

 Attachments: cassandra-2.0-7053.patch


 When using the USING TIMESTAMP timestamp syntax for a batch statement, 
 the supplied timestamp is ignored.



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


[jira] [Commented] (CASSANDRA-6696) Drive replacement in JBOD can cause data to reappear.

2014-05-05 Thread Marcus Eriksson (JIRA)

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

Marcus Eriksson commented on CASSANDRA-6696:


bq.  we can gain a lot by not flushing too big L0 files.
if we flush to one big file, we would have to involve all L1 sstables when 
compacting L0 - L1, if we flush smaller files, we can do more compactions in 
parallel and we don't have to wait for all ongoing L1 - L2 compactions to 
finish before starting L0 - L1

 Drive replacement in JBOD can cause data to reappear. 
 --

 Key: CASSANDRA-6696
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6696
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: sankalp kohli
Assignee: Marcus Eriksson
 Fix For: 3.0


 In JBOD, when someone gets a bad drive, the bad drive is replaced with a new 
 empty one and repair is run. 
 This can cause deleted data to come back in some cases. Also this is true for 
 corrupt stables in which we delete the corrupt stable and run repair. 
 Here is an example:
 Say we have 3 nodes A,B and C and RF=3 and GC grace=10days. 
 row=sankalp col=sankalp is written 20 days back and successfully went to all 
 three nodes. 
 Then a delete/tombstone was written successfully for the same row column 15 
 days back. 
 Since this tombstone is more than gc grace, it got compacted in Nodes A and B 
 since it got compacted with the actual data. So there is no trace of this row 
 column in node A and B.
 Now in node C, say the original data is in drive1 and tombstone is in drive2. 
 Compaction has not yet reclaimed the data and tombstone.  
 Drive2 becomes corrupt and was replaced with new empty drive. 
 Due to the replacement, the tombstone in now gone and row=sankalp col=sankalp 
 has come back to life. 
 Now after replacing the drive we run repair. This data will be propagated to 
 all nodes. 
 Note: This is still a problem even if we run repair every gc grace. 
  



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


[jira] [Commented] (CASSANDRA-6973) timestamp data type does ISO 8601 formats with 'Z' as time zone.

2014-05-05 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-6973:
-

It does seems like 'X' is the right thing to do, but won't removing the 
patterns with a 'Z' make use refuse date strings (non-ISO 8601 ones) that we 
use to accept. Also, why do we need a parttern with 1 'X' and one with 3 'X' 
but not, say, with 2 'X' (if that's specified by SimpleDateFormat, this has 
escaped me)?

But as a side note, I really wish we weren't doing all this manually. And/or 
that we had unit tests for it. 

 timestamp data type does ISO 8601 formats with 'Z' as time zone.
 

 Key: CASSANDRA-6973
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6973
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Juho Mäkinen
Assignee: Chander S Pechetty
Priority: Trivial
 Attachments: trunk-6973.txt


 The timestamp data type does not support format where time zone is specified 
 with 'Z' (as in zulu aka. UTC+0 aka + time zone). Example:
 create table foo(ts timestamp primary key);
 insert into foo(ts) values('2014-04-01T20:17:35+'); -- this works
 cqlsh:test insert into foo(ts) values('2014-04-01T20:17:35Z');
 Bad Request: unable to coerce '2014-04-01T20:17:35Z' to a  formatted date 
 (long)
 The example date was copied directly from ISO 8601 Wikipedia page. The 
 standard says that If the time is in UTC, add a Z directly after the time 
 without a space. Z is the zone designator for the zero UTC offset.
 Tested with cqlsh with 2.0.6 version.



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


[jira] [Commented] (CASSANDRA-6696) Drive replacement in JBOD can cause data to reappear.

2014-05-05 Thread Tupshin Harper (JIRA)

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

Tupshin Harper commented on CASSANDRA-6696:
---

I may be misunderstanding, but this seems to be optimizing for compaction 
throughput/parallelization, but at the expense of doing more total compaction 
activity (number of compactions per mutation over the life of that mutation, a 
form of write-amplification) by starting with smaller tables. 

If that's not the case, then please ignore, but it is important to note that 
for the largest scale, highest velocity, longest retained use cases, it's the 
number of recompactions/write amplification that really hurts.

 Drive replacement in JBOD can cause data to reappear. 
 --

 Key: CASSANDRA-6696
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6696
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: sankalp kohli
Assignee: Marcus Eriksson
 Fix For: 3.0


 In JBOD, when someone gets a bad drive, the bad drive is replaced with a new 
 empty one and repair is run. 
 This can cause deleted data to come back in some cases. Also this is true for 
 corrupt stables in which we delete the corrupt stable and run repair. 
 Here is an example:
 Say we have 3 nodes A,B and C and RF=3 and GC grace=10days. 
 row=sankalp col=sankalp is written 20 days back and successfully went to all 
 three nodes. 
 Then a delete/tombstone was written successfully for the same row column 15 
 days back. 
 Since this tombstone is more than gc grace, it got compacted in Nodes A and B 
 since it got compacted with the actual data. So there is no trace of this row 
 column in node A and B.
 Now in node C, say the original data is in drive1 and tombstone is in drive2. 
 Compaction has not yet reclaimed the data and tombstone.  
 Drive2 becomes corrupt and was replaced with new empty drive. 
 Due to the replacement, the tombstone in now gone and row=sankalp col=sankalp 
 has come back to life. 
 Now after replacing the drive we run repair. This data will be propagated to 
 all nodes. 
 Note: This is still a problem even if we run repair every gc grace. 
  



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


[jira] [Commented] (CASSANDRA-6696) Drive replacement in JBOD can cause data to reappear.

2014-05-05 Thread Marcus Eriksson (JIRA)

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

Marcus Eriksson commented on CASSANDRA-6696:


not really, note that we take the memtable, split it in X parts and write those 
parts to disk;

for example, say we have 100 vnodes, meaning we have 100 L1 non-intersecting 
sstables, if we then flush one file that intersects with all those sstables, we 
would have to include all those files when we compact L0 - L1. If we instead 
flush to 10 non-intersecting sstables in L0, we can do those L0 - L1 
compactions independently, but the mutations are recompacted as many times

does that make sense?

 Drive replacement in JBOD can cause data to reappear. 
 --

 Key: CASSANDRA-6696
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6696
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: sankalp kohli
Assignee: Marcus Eriksson
 Fix For: 3.0


 In JBOD, when someone gets a bad drive, the bad drive is replaced with a new 
 empty one and repair is run. 
 This can cause deleted data to come back in some cases. Also this is true for 
 corrupt stables in which we delete the corrupt stable and run repair. 
 Here is an example:
 Say we have 3 nodes A,B and C and RF=3 and GC grace=10days. 
 row=sankalp col=sankalp is written 20 days back and successfully went to all 
 three nodes. 
 Then a delete/tombstone was written successfully for the same row column 15 
 days back. 
 Since this tombstone is more than gc grace, it got compacted in Nodes A and B 
 since it got compacted with the actual data. So there is no trace of this row 
 column in node A and B.
 Now in node C, say the original data is in drive1 and tombstone is in drive2. 
 Compaction has not yet reclaimed the data and tombstone.  
 Drive2 becomes corrupt and was replaced with new empty drive. 
 Due to the replacement, the tombstone in now gone and row=sankalp col=sankalp 
 has come back to life. 
 Now after replacing the drive we run repair. This data will be propagated to 
 all nodes. 
 Note: This is still a problem even if we run repair every gc grace. 
  



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


[jira] [Commented] (CASSANDRA-6696) Drive replacement in JBOD can cause data to reappear.

2014-05-05 Thread Tupshin Harper (JIRA)

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

Tupshin Harper commented on CASSANDRA-6696:
---

It does, thanks.

 Drive replacement in JBOD can cause data to reappear. 
 --

 Key: CASSANDRA-6696
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6696
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: sankalp kohli
Assignee: Marcus Eriksson
 Fix For: 3.0


 In JBOD, when someone gets a bad drive, the bad drive is replaced with a new 
 empty one and repair is run. 
 This can cause deleted data to come back in some cases. Also this is true for 
 corrupt stables in which we delete the corrupt stable and run repair. 
 Here is an example:
 Say we have 3 nodes A,B and C and RF=3 and GC grace=10days. 
 row=sankalp col=sankalp is written 20 days back and successfully went to all 
 three nodes. 
 Then a delete/tombstone was written successfully for the same row column 15 
 days back. 
 Since this tombstone is more than gc grace, it got compacted in Nodes A and B 
 since it got compacted with the actual data. So there is no trace of this row 
 column in node A and B.
 Now in node C, say the original data is in drive1 and tombstone is in drive2. 
 Compaction has not yet reclaimed the data and tombstone.  
 Drive2 becomes corrupt and was replaced with new empty drive. 
 Due to the replacement, the tombstone in now gone and row=sankalp col=sankalp 
 has come back to life. 
 Now after replacing the drive we run repair. This data will be propagated to 
 all nodes. 
 Note: This is still a problem even if we run repair every gc grace. 
  



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


[jira] [Updated] (CASSANDRA-7156) Add a new seed provider for Apache Cloudstack platforms

2014-05-05 Thread Pierre-Yves Ritschard (JIRA)

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

Pierre-Yves Ritschard updated CASSANDRA-7156:
-

Issue Type: Improvement  (was: Bug)

 Add a new seed provider for Apache Cloudstack platforms
 ---

 Key: CASSANDRA-7156
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7156
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
 Environment: needs access to a cloudstack API endpoint
Reporter: Pierre-Yves Ritschard
Priority: Minor
 Fix For: 2.0.8, 2.1.1

 Attachments: 0001-initial-work-on-a-cloudstack-seed-provider.patch


 The attached patch adds a new seed provider which queries a cloudstack API 
 endpoint for instances having a specific tag.
 The tag key and value can be controlled in the configuration file and 
 
 will default to 'cassandra_seed' and 'default'.   
 
 The Cloudstack endpoint is configured by three parameters in the  
 
 configuration file: 'cloudstack_api_endpoint', 'cloudstack_api_key' and   
 
 'cloudstack_api_secret'   
 
 By default, CloudstackSeedProvider fetchs the ipaddress of the first  
 
 interface, if another index should be used, the nic_index parameter will hold 
 it.
 A typical configuration file would thus have:
 {code:yaml}
 seed_provider:
 - class_name: org.apache.cassandra.locator.CloudstackSeedProvider
   parameters:
   - cloudstack_api_endpoint: https://some.cloudstack.host;
 cloudstack_api_key: X
 cloudstack_api_secret: X
 tag_value: my_cluster_name
 {code}
 This introduces no new dependency.



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


[jira] [Created] (CASSANDRA-7156) Add a new seed provider for Apache Cloudstack platforms

2014-05-05 Thread Pierre-Yves Ritschard (JIRA)
Pierre-Yves Ritschard created CASSANDRA-7156:


 Summary: Add a new seed provider for Apache Cloudstack platforms
 Key: CASSANDRA-7156
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7156
 Project: Cassandra
  Issue Type: Bug
  Components: Core
 Environment: needs access to a cloudstack API endpoint
Reporter: Pierre-Yves Ritschard
Priority: Minor
 Fix For: 2.0.8, 2.1.1
 Attachments: 0001-initial-work-on-a-cloudstack-seed-provider.patch

The attached patch adds a new seed provider which queries a cloudstack API 
endpoint for instances having a specific tag.

The tag key and value can be controlled in the configuration file and   
  
will default to 'cassandra_seed' and 'default'. 
  

The Cloudstack endpoint is configured by three parameters in the
  
configuration file: 'cloudstack_api_endpoint', 'cloudstack_api_key' and 
  
'cloudstack_api_secret' 
  

By default, CloudstackSeedProvider fetchs the ipaddress of the first
  
interface, if another index should be used, the nic_index parameter will hold 
it.

A typical configuration file would thus have:

{code:yaml}
seed_provider:
- class_name: org.apache.cassandra.locator.CloudstackSeedProvider
  parameters:
  - cloudstack_api_endpoint: https://some.cloudstack.host;
cloudstack_api_key: X
cloudstack_api_secret: X
tag_value: my_cluster_name
{code}

This introduces no new dependency.



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


[jira] [Created] (CASSANDRA-7157) BulkRecordWriter enters infinite loop of swallowed exceptions when streaming fails.

2014-05-05 Thread James Campbell (JIRA)
James Campbell created CASSANDRA-7157:
-

 Summary: BulkRecordWriter enters infinite loop of swallowed 
exceptions when streaming fails.
 Key: CASSANDRA-7157
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7157
 Project: Cassandra
  Issue Type: Bug
  Components: Hadoop
Reporter: James Campbell
Priority: Trivial
 Attachments: patch.diff





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


[jira] [Updated] (CASSANDRA-7157) BulkRecordWriter enters infinite loop of swallowed exceptions when streaming fails.

2014-05-05 Thread James Campbell (JIRA)

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

James Campbell updated CASSANDRA-7157:
--

Description: If streaming fails, BulkRecordWriter's close() method 
continues to call future.get() despite exceptions.

 BulkRecordWriter enters infinite loop of swallowed exceptions when streaming 
 fails.
 ---

 Key: CASSANDRA-7157
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7157
 Project: Cassandra
  Issue Type: Bug
  Components: Hadoop
Reporter: James Campbell
Priority: Trivial
 Attachments: patch.diff


 If streaming fails, BulkRecordWriter's close() method continues to call 
 future.get() despite exceptions.



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


[jira] [Commented] (CASSANDRA-7156) Add a new seed provider for Apache Cloudstack platforms

2014-05-05 Thread Jeremiah Jordan (JIRA)

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

Jeremiah Jordan commented on CASSANDRA-7156:


I don't know that we should be hosting this in tree.  We don't currently host 
any alternate seed providers in tree.  It should be easy enough to put this up 
on github or something for people who want it.

 Add a new seed provider for Apache Cloudstack platforms
 ---

 Key: CASSANDRA-7156
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7156
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
 Environment: needs access to a cloudstack API endpoint
Reporter: Pierre-Yves Ritschard
Priority: Minor
 Fix For: 2.0.8, 2.1.1

 Attachments: 0001-initial-work-on-a-cloudstack-seed-provider.patch


 The attached patch adds a new seed provider which queries a cloudstack API 
 endpoint for instances having a specific tag.
 The tag key and value can be controlled in the configuration file and 
 
 will default to 'cassandra_seed' and 'default'.   
 
 The Cloudstack endpoint is configured by three parameters in the  
 
 configuration file: 'cloudstack_api_endpoint', 'cloudstack_api_key' and   
 
 'cloudstack_api_secret'   
 
 By default, CloudstackSeedProvider fetchs the ipaddress of the first  
 
 interface, if another index should be used, the nic_index parameter will hold 
 it.
 A typical configuration file would thus have:
 {code:yaml}
 seed_provider:
 - class_name: org.apache.cassandra.locator.CloudstackSeedProvider
   parameters:
   - cloudstack_api_endpoint: https://some.cloudstack.host;
 cloudstack_api_key: X
 cloudstack_api_secret: X
 tag_value: my_cluster_name
 {code}
 This introduces no new dependency.



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


[jira] [Commented] (CASSANDRA-7156) Add a new seed provider for Apache Cloudstack platforms

2014-05-05 Thread Pierre-Yves Ritschard (JIRA)

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

Pierre-Yves Ritschard commented on CASSANDRA-7156:
--

Hi Jeremiah,

I definitely will publish this as a separate JAR if it doesn't make it in the 
tree. Since there is already a CloudstackSnitch provider and this doesn't add a 
lot of bloat I think it would make sense to put this in tree.

I don't think it makes a huge amount of sense outside of the tree since you 
lose the 'zeroconf' nice property that you get from having it locally.

 Add a new seed provider for Apache Cloudstack platforms
 ---

 Key: CASSANDRA-7156
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7156
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
 Environment: needs access to a cloudstack API endpoint
Reporter: Pierre-Yves Ritschard
Priority: Minor
 Fix For: 2.0.8, 2.1.1

 Attachments: 0001-initial-work-on-a-cloudstack-seed-provider.patch


 The attached patch adds a new seed provider which queries a cloudstack API 
 endpoint for instances having a specific tag.
 The tag key and value can be controlled in the configuration file and 
 
 will default to 'cassandra_seed' and 'default'.   
 
 The Cloudstack endpoint is configured by three parameters in the  
 
 configuration file: 'cloudstack_api_endpoint', 'cloudstack_api_key' and   
 
 'cloudstack_api_secret'   
 
 By default, CloudstackSeedProvider fetchs the ipaddress of the first  
 
 interface, if another index should be used, the nic_index parameter will hold 
 it.
 A typical configuration file would thus have:
 {code:yaml}
 seed_provider:
 - class_name: org.apache.cassandra.locator.CloudstackSeedProvider
   parameters:
   - cloudstack_api_endpoint: https://some.cloudstack.host;
 cloudstack_api_key: X
 cloudstack_api_secret: X
 tag_value: my_cluster_name
 {code}
 This introduces no new dependency.



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


[jira] [Commented] (CASSANDRA-7156) Add a new seed provider for Apache Cloudstack platforms

2014-05-05 Thread Jeremiah Jordan (JIRA)

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

Jeremiah Jordan commented on CASSANDRA-7156:


We are not going to default to this seed provider, so you are never going to 
have zeroconf without starting from a custom package, where you could easily 
include the jar. ¯\_(ツ)_/¯

 Add a new seed provider for Apache Cloudstack platforms
 ---

 Key: CASSANDRA-7156
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7156
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
 Environment: needs access to a cloudstack API endpoint
Reporter: Pierre-Yves Ritschard
Priority: Minor
 Fix For: 2.0.8, 2.1.1

 Attachments: 0001-initial-work-on-a-cloudstack-seed-provider.patch


 The attached patch adds a new seed provider which queries a cloudstack API 
 endpoint for instances having a specific tag.
 The tag key and value can be controlled in the configuration file and 
 
 will default to 'cassandra_seed' and 'default'.   
 
 The Cloudstack endpoint is configured by three parameters in the  
 
 configuration file: 'cloudstack_api_endpoint', 'cloudstack_api_key' and   
 
 'cloudstack_api_secret'   
 
 By default, CloudstackSeedProvider fetchs the ipaddress of the first  
 
 interface, if another index should be used, the nic_index parameter will hold 
 it.
 A typical configuration file would thus have:
 {code:yaml}
 seed_provider:
 - class_name: org.apache.cassandra.locator.CloudstackSeedProvider
   parameters:
   - cloudstack_api_endpoint: https://some.cloudstack.host;
 cloudstack_api_key: X
 cloudstack_api_secret: X
 tag_value: my_cluster_name
 {code}
 This introduces no new dependency and together with CASSANDRA-7147 gives an 
 easy way of getting started on cloudstack platforms



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


[jira] [Commented] (CASSANDRA-7156) Add a new seed provider for Apache Cloudstack platforms

2014-05-05 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-7156:
---

I get that we don't want to host permutations of every possible custom seed 
provider, but ISTM that one per major cloud is reasonable if we can agree on 
what constitutes best practices.  Then if you want to wander off the beaten 
path you're on your own.

 Add a new seed provider for Apache Cloudstack platforms
 ---

 Key: CASSANDRA-7156
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7156
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
 Environment: needs access to a cloudstack API endpoint
Reporter: Pierre-Yves Ritschard
Priority: Minor
 Fix For: 2.0.8, 2.1.1

 Attachments: 0001-initial-work-on-a-cloudstack-seed-provider.patch


 The attached patch adds a new seed provider which queries a cloudstack API 
 endpoint for instances having a specific tag.
 The tag key and value can be controlled in the configuration file and 
 
 will default to 'cassandra_seed' and 'default'.   
 
 The Cloudstack endpoint is configured by three parameters in the  
 
 configuration file: 'cloudstack_api_endpoint', 'cloudstack_api_key' and   
 
 'cloudstack_api_secret'   
 
 By default, CloudstackSeedProvider fetchs the ipaddress of the first  
 
 interface, if another index should be used, the nic_index parameter will hold 
 it.
 A typical configuration file would thus have:
 {code:yaml}
 seed_provider:
 - class_name: org.apache.cassandra.locator.CloudstackSeedProvider
   parameters:
   - cloudstack_api_endpoint: https://some.cloudstack.host;
 cloudstack_api_key: X
 cloudstack_api_secret: X
 tag_value: my_cluster_name
 {code}
 This introduces no new dependency and together with CASSANDRA-7147 gives an 
 easy way of getting started on cloudstack platforms



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


[jira] [Commented] (CASSANDRA-7156) Add a new seed provider for Apache Cloudstack platforms

2014-05-05 Thread Jeremiah Jordan (JIRA)

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

Jeremiah Jordan commented on CASSANDRA-7156:


bq. I get that we don't want to host permutations of every possible custom seed 
provider, but ISTM that one per major cloud is reasonable if we can agree on 
what constitutes best practices. Then if you want to wander off the beaten path 
you're on your own.

works for me

 Add a new seed provider for Apache Cloudstack platforms
 ---

 Key: CASSANDRA-7156
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7156
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
 Environment: needs access to a cloudstack API endpoint
Reporter: Pierre-Yves Ritschard
Priority: Minor
 Fix For: 2.0.8, 2.1.1

 Attachments: 0001-initial-work-on-a-cloudstack-seed-provider.patch


 The attached patch adds a new seed provider which queries a cloudstack API 
 endpoint for instances having a specific tag.
 The tag key and value can be controlled in the configuration file and 
 
 will default to 'cassandra_seed' and 'default'.   
 
 The Cloudstack endpoint is configured by three parameters in the  
 
 configuration file: 'cloudstack_api_endpoint', 'cloudstack_api_key' and   
 
 'cloudstack_api_secret'   
 
 By default, CloudstackSeedProvider fetchs the ipaddress of the first  
 
 interface, if another index should be used, the nic_index parameter will hold 
 it.
 A typical configuration file would thus have:
 {code:yaml}
 seed_provider:
 - class_name: org.apache.cassandra.locator.CloudstackSeedProvider
   parameters:
   - cloudstack_api_endpoint: https://some.cloudstack.host;
 cloudstack_api_key: X
 cloudstack_api_secret: X
 tag_value: my_cluster_name
 {code}
 This introduces no new dependency and together with CASSANDRA-7147 gives an 
 easy way of getting started on cloudstack platforms



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


[jira] [Issue Comment Deleted] (CASSANDRA-7156) Add a new seed provider for Apache Cloudstack platforms

2014-05-05 Thread Jeremiah Jordan (JIRA)

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

Jeremiah Jordan updated CASSANDRA-7156:
---

Comment: was deleted

(was: We are not going to default to this seed provider, so you are never going 
to have zeroconf without starting from a custom package, where you could 
easily include the jar. ¯\_(ツ)_/¯)

 Add a new seed provider for Apache Cloudstack platforms
 ---

 Key: CASSANDRA-7156
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7156
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
 Environment: needs access to a cloudstack API endpoint
Reporter: Pierre-Yves Ritschard
Priority: Minor
 Fix For: 2.0.8, 2.1.1

 Attachments: 0001-initial-work-on-a-cloudstack-seed-provider.patch


 The attached patch adds a new seed provider which queries a cloudstack API 
 endpoint for instances having a specific tag.
 The tag key and value can be controlled in the configuration file and 
 
 will default to 'cassandra_seed' and 'default'.   
 
 The Cloudstack endpoint is configured by three parameters in the  
 
 configuration file: 'cloudstack_api_endpoint', 'cloudstack_api_key' and   
 
 'cloudstack_api_secret'   
 
 By default, CloudstackSeedProvider fetchs the ipaddress of the first  
 
 interface, if another index should be used, the nic_index parameter will hold 
 it.
 A typical configuration file would thus have:
 {code:yaml}
 seed_provider:
 - class_name: org.apache.cassandra.locator.CloudstackSeedProvider
   parameters:
   - cloudstack_api_endpoint: https://some.cloudstack.host;
 cloudstack_api_key: X
 cloudstack_api_secret: X
 tag_value: my_cluster_name
 {code}
 This introduces no new dependency and together with CASSANDRA-7147 gives an 
 easy way of getting started on cloudstack platforms



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


[jira] [Commented] (CASSANDRA-7156) Add a new seed provider for Apache Cloudstack platforms

2014-05-05 Thread Jeremiah Jordan (JIRA)

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

Jeremiah Jordan commented on CASSANDRA-7156:


[~pyritschard] did you test this with enabling password authentication?  I have 
seen some other custom seed providers fail to correctly interact with the code 
that checks am I a seed? if so make the default super user account.

 Add a new seed provider for Apache Cloudstack platforms
 ---

 Key: CASSANDRA-7156
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7156
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
 Environment: needs access to a cloudstack API endpoint
Reporter: Pierre-Yves Ritschard
Priority: Minor
 Fix For: 2.0.8, 2.1.1

 Attachments: 0001-initial-work-on-a-cloudstack-seed-provider.patch


 The attached patch adds a new seed provider which queries a cloudstack API 
 endpoint for instances having a specific tag.
 The tag key and value can be controlled in the configuration file and 
 
 will default to 'cassandra_seed' and 'default'.   
 
 The Cloudstack endpoint is configured by three parameters in the  
 
 configuration file: 'cloudstack_api_endpoint', 'cloudstack_api_key' and   
 
 'cloudstack_api_secret'   
 
 By default, CloudstackSeedProvider fetchs the ipaddress of the first  
 
 interface, if another index should be used, the nic_index parameter will hold 
 it.
 A typical configuration file would thus have:
 {code:yaml}
 seed_provider:
 - class_name: org.apache.cassandra.locator.CloudstackSeedProvider
   parameters:
   - cloudstack_api_endpoint: https://some.cloudstack.host;
 cloudstack_api_key: X
 cloudstack_api_secret: X
 tag_value: my_cluster_name
 {code}
 This introduces no new dependency and together with CASSANDRA-7147 gives an 
 easy way of getting started on cloudstack platforms



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


[jira] [Updated] (CASSANDRA-7156) Add a new seed provider for Apache Cloudstack platforms

2014-05-05 Thread Pierre-Yves Ritschard (JIRA)

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

Pierre-Yves Ritschard updated CASSANDRA-7156:
-

Description: 
The attached patch adds a new seed provider which queries a cloudstack API 
endpoint for instances having a specific tag.

The tag key and value can be controlled in the configuration file and   
  
will default to 'cassandra_seed' and 'default'. 
  

The Cloudstack endpoint is configured by three parameters in the
  
configuration file: 'cloudstack_api_endpoint', 'cloudstack_api_key' and 
  
'cloudstack_api_secret' 
  

By default, CloudstackSeedProvider fetchs the ipaddress of the first
  
interface, if another index should be used, the nic_index parameter will hold 
it.

A typical configuration file would thus have:

{code:yaml}
seed_provider:
- class_name: org.apache.cassandra.locator.CloudstackSeedProvider
  parameters:
  - cloudstack_api_endpoint: https://some.cloudstack.host;
cloudstack_api_key: X
cloudstack_api_secret: X
tag_value: my_cluster_name
{code}

This introduces no new dependency and together with CASSANDRA-7147 gives an 
easy way of getting started on cloudstack platforms

  was:
The attached patch adds a new seed provider which queries a cloudstack API 
endpoint for instances having a specific tag.

The tag key and value can be controlled in the configuration file and   
  
will default to 'cassandra_seed' and 'default'. 
  

The Cloudstack endpoint is configured by three parameters in the
  
configuration file: 'cloudstack_api_endpoint', 'cloudstack_api_key' and 
  
'cloudstack_api_secret' 
  

By default, CloudstackSeedProvider fetchs the ipaddress of the first
  
interface, if another index should be used, the nic_index parameter will hold 
it.

A typical configuration file would thus have:

{code:yaml}
seed_provider:
- class_name: org.apache.cassandra.locator.CloudstackSeedProvider
  parameters:
  - cloudstack_api_endpoint: https://some.cloudstack.host;
cloudstack_api_key: X
cloudstack_api_secret: X
tag_value: my_cluster_name
{code}

This introduces no new dependency and together with CLOUDSTACK-7147 gives an 
easy way of getting started on cloudstack platforms


 Add a new seed provider for Apache Cloudstack platforms
 ---

 Key: CASSANDRA-7156
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7156
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
 Environment: needs access to a cloudstack API endpoint
Reporter: Pierre-Yves Ritschard
Priority: Minor
 Fix For: 2.0.8, 2.1.1

 Attachments: 0001-initial-work-on-a-cloudstack-seed-provider.patch


 The attached patch adds a new seed provider which queries a cloudstack API 
 endpoint for instances having a specific tag.
 The tag key and value can be controlled in the configuration file and 
 
 will default to 'cassandra_seed' and 'default'.   
 
 The Cloudstack endpoint is configured by three parameters in the  
 
 configuration file: 'cloudstack_api_endpoint', 'cloudstack_api_key' and   
 
 'cloudstack_api_secret'   
 
 By default, CloudstackSeedProvider fetchs the ipaddress of the first  

[jira] [Commented] (CASSANDRA-7156) Add a new seed provider for Apache Cloudstack platforms

2014-05-05 Thread Pierre-Yves Ritschard (JIRA)

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

Pierre-Yves Ritschard commented on CASSANDRA-7156:
--

[~jjordan] I just did and seem to have the expected behavior:

{code:none}
INFO  15:40:09 PasswordAuthenticator created default user 'cassandra'
INFO  15:40:09 Created default superuser 'cassandra'
{code}

 Add a new seed provider for Apache Cloudstack platforms
 ---

 Key: CASSANDRA-7156
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7156
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
 Environment: needs access to a cloudstack API endpoint
Reporter: Pierre-Yves Ritschard
Priority: Minor
 Fix For: 2.0.8, 2.1.1

 Attachments: 0001-initial-work-on-a-cloudstack-seed-provider.patch


 The attached patch adds a new seed provider which queries a cloudstack API 
 endpoint for instances having a specific tag.
 The tag key and value can be controlled in the configuration file and 
 
 will default to 'cassandra_seed' and 'default'.   
 
 The Cloudstack endpoint is configured by three parameters in the  
 
 configuration file: 'cloudstack_api_endpoint', 'cloudstack_api_key' and   
 
 'cloudstack_api_secret'   
 
 By default, CloudstackSeedProvider fetchs the ipaddress of the first  
 
 interface, if another index should be used, the nic_index parameter will hold 
 it.
 A typical configuration file would thus have:
 {code:yaml}
 seed_provider:
 - class_name: org.apache.cassandra.locator.CloudstackSeedProvider
   parameters:
   - cloudstack_api_endpoint: https://some.cloudstack.host;
 cloudstack_api_key: X
 cloudstack_api_secret: X
 tag_value: my_cluster_name
 {code}
 This introduces no new dependency and together with CASSANDRA-7147 gives an 
 easy way of getting started on cloudstack platforms



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


[jira] [Commented] (CASSANDRA-7156) Add a new seed provider for Apache Cloudstack platforms

2014-05-05 Thread Brandon Williams (JIRA)

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

Brandon Williams commented on CASSANDRA-7156:
-

bq. I get that we don't want to host permutations of every possible custom seed 
provider, but ISTM that one per major cloud is reasonable if we can agree on 
what constitutes best practices

I dunno, I kind of look at seed providers the same way I look at 
authenticators.  We could ship an ldap authenticator or something, but we don't 
(and shouldn't.)  We'd be setting a precedent here that will open us up to more 
seed providers in the future.

 Add a new seed provider for Apache Cloudstack platforms
 ---

 Key: CASSANDRA-7156
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7156
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
 Environment: needs access to a cloudstack API endpoint
Reporter: Pierre-Yves Ritschard
Priority: Minor
 Fix For: 2.0.8, 2.1.1

 Attachments: 0001-initial-work-on-a-cloudstack-seed-provider.patch


 The attached patch adds a new seed provider which queries a cloudstack API 
 endpoint for instances having a specific tag.
 The tag key and value can be controlled in the configuration file and 
 
 will default to 'cassandra_seed' and 'default'.   
 
 The Cloudstack endpoint is configured by three parameters in the  
 
 configuration file: 'cloudstack_api_endpoint', 'cloudstack_api_key' and   
 
 'cloudstack_api_secret'   
 
 By default, CloudstackSeedProvider fetchs the ipaddress of the first  
 
 interface, if another index should be used, the nic_index parameter will hold 
 it.
 A typical configuration file would thus have:
 {code:yaml}
 seed_provider:
 - class_name: org.apache.cassandra.locator.CloudstackSeedProvider
   parameters:
   - cloudstack_api_endpoint: https://some.cloudstack.host;
 cloudstack_api_key: X
 cloudstack_api_secret: X
 tag_value: my_cluster_name
 {code}
 This introduces no new dependency and together with CASSANDRA-7147 gives an 
 easy way of getting started on cloudstack platforms



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


[jira] [Updated] (CASSANDRA-7143) shuffle broken on 2.0

2014-05-05 Thread Brandon Williams (JIRA)

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

Brandon Williams updated CASSANDRA-7143:


Attachment: (was: 7143.txt)

 shuffle broken on 2.0
 -

 Key: CASSANDRA-7143
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7143
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Brandon Williams
Assignee: Brandon Williams
 Fix For: 2.0.8


 In 1.2, shuffle works correctly, creating the list of relocations and then 
 following it, pausing correctly as needed:
 {noformat}
  WARN 20:45:58,153 Pausing until token count stabilizes (target=3, actual=4)
 {noformat}
 However on 2.0, it relocates all the ranges in one shot and never deletes 
 entries from the list of tokens to relocate.



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


[jira] [Updated] (CASSANDRA-7143) shuffle broken on 2.0

2014-05-05 Thread Brandon Williams (JIRA)

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

Brandon Williams updated CASSANDRA-7143:


Attachment: 7143.txt

Shutting down the scheduler from inside the task is difficult, so instead I 
adjusted the log message to tell the user to disable range xfers when there's 
nothing left to do.

 shuffle broken on 2.0
 -

 Key: CASSANDRA-7143
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7143
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Brandon Williams
Assignee: Brandon Williams
 Fix For: 2.0.8

 Attachments: 7143.txt


 In 1.2, shuffle works correctly, creating the list of relocations and then 
 following it, pausing correctly as needed:
 {noformat}
  WARN 20:45:58,153 Pausing until token count stabilizes (target=3, actual=4)
 {noformat}
 However on 2.0, it relocates all the ranges in one shot and never deletes 
 entries from the list of tokens to relocate.



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


[05/12] git commit: remove changes line for 7149 as it was not pulled forward

2014-05-05 Thread brandonwilliams
remove changes line for 7149 as it was not pulled forward


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

Branch: refs/heads/trunk
Commit: 0ce6b179af6eaea35697af26bf647de3aec283cd
Parents: a2c3476
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sun May 4 10:50:58 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sun May 4 10:50:58 2014 -0400

--
 CHANGES.txt | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ce6b179/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 3c87625..f4e14d8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -33,7 +33,6 @@ Merged from 1.2:
  * Don't shut MessagingService down when replacing a node (CASSANDRA-6476)
  * fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751)
  * Preserves CQL metadata when updating table from thrift (CASSANDRA-6831)
- * fix time conversion to milliseconds in SimpleCondition.await 
(CASSANDRA-7149)
 
 
 2.0.7



[01/12] git commit: fix time conversion to milliseconds in SimpleCondition.await

2014-05-05 Thread brandonwilliams
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 0ce6b179a - 8bbe901f2
  refs/heads/cassandra-2.1 3aa41fbce - b62241182
  refs/heads/trunk ddd2ff7d6 - 949c5daea


fix time conversion to milliseconds in SimpleCondition.await

patch by jzhang reviewed by dbrosius for cassandra-7149


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

Branch: refs/heads/cassandra-2.1
Commit: 9eb346a6432e952a1892f77c0cf6fda9b40ba1c4
Parents: c454807
Author: Jianwei Zhang eezhangjian...@gmail.com
Authored: Sun May 4 10:25:38 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sun May 4 10:25:38 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9eb346a6/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 484f4bd..1c6171e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,6 +18,7 @@
  * Always clean up references in SerializingCache (CASSANDRA-6994)
  * fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751)
  * Preserves CQL metadata when updating table from thrift (CASSANDRA-6831)
+ * fix time conversion to milliseconds in SimpleCondition.await 
(CASSANDRA-7149)
 
 
 1.2.16

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9eb346a6/src/java/org/apache/cassandra/utils/SimpleCondition.java
--
diff --git a/src/java/org/apache/cassandra/utils/SimpleCondition.java 
b/src/java/org/apache/cassandra/utils/SimpleCondition.java
index 4f00998..8899a19 100644
--- a/src/java/org/apache/cassandra/utils/SimpleCondition.java
+++ b/src/java/org/apache/cassandra/utils/SimpleCondition.java
@@ -44,7 +44,7 @@ public class SimpleCondition implements Condition
 // micro/nanoseconds not supported
 assert unit == TimeUnit.DAYS || unit == TimeUnit.HOURS || unit == 
TimeUnit.MINUTES || unit == TimeUnit.SECONDS || unit == TimeUnit.MILLISECONDS;
 
-long end = System.currentTimeMillis() + unit.convert(time, 
TimeUnit.MILLISECONDS);
+long end = System.currentTimeMillis() + 
TimeUnit.MILLISECONDS.convert(time, unit);
 while (!set  end  System.currentTimeMillis())
 {
 TimeUnit.MILLISECONDS.timedWait(this, end - 
System.currentTimeMillis());



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

2014-05-05 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/service/StorageService.java


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

Branch: refs/heads/cassandra-2.1
Commit: b62241182fd8c4c9f22e95e3b45b92bb39b368c1
Parents: 3aa41fb 8bbe901
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon May 5 11:49:23 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon May 5 11:49:23 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6224118/CHANGES.txt
--
diff --cc CHANGES.txt
index 2f55eee,25a5cc1..86b261d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,18 +1,10 @@@
 -2.0.8
 +2.1.0-rc1
 + * Parallel streaming for sstableloader (CASSANDRA-3668)
 + * Fix bugs in supercolumns handling (CASSANDRA-7138)
 + * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
 +Merged from 2.0:
+  * Correctly delete scheduled range xfers (CASSANDRA-7143)
   * Make batchlog replica selection rack-aware (CASSANDRA-6551)
 - * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
 - * Set JMX RMI port to 7199 (CASSANDRA-7087)
 - * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
 - * Log a warning for large batches (CASSANDRA-6487)
 - * Queries on compact tables can return more rows that requested 
(CASSANDRA-7052)
 - * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 - * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
 - * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
 - * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
 - * Plug holes in resource release when wiring up StreamSession 
(CASSANDRA-7073)
 - * Re-add parameter columns to tracing session (CASSANDRA-6942)
 - * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
   * Suggest CTRL-C or semicolon after three blank lines in cqlsh 
(CASSANDRA-7142)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6224118/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 5684eea,595a7e7..f1be0c2
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -3193,7 -3105,7 +3193,7 @@@ public class StorageService extends Not
  
  private class RangeRelocator
  {
- private final StreamPlan streamPlan = new StreamPlan(Bootstrap);
 -private StreamPlan streamPlan = new StreamPlan(Relocation);
++private final StreamPlan streamPlan = new StreamPlan(Relocation);
  
  private RangeRelocator(CollectionToken tokens, ListString 
keyspaceNames)
  {



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

2014-05-05 Thread brandonwilliams
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/a2c3476b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2c3476b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2c3476b

Branch: refs/heads/cassandra-2.1
Commit: a2c3476ba3cc6677220464ba03a07ceafa1f0a2c
Parents: e9bdb6a 9eb346a
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sun May 4 10:47:12 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sun May 4 10:47:12 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2c3476b/CHANGES.txt
--
diff --cc CHANGES.txt
index f4e14d8,1c6171e..3c87625
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -29,65 -14,14 +29,66 @@@ Merged from 1.2
   * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
   * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
   * Ensure that batchlog and hint timeouts do not produce hints 
(CASSANDRA-7058)
 - * Don't shut MessagingService down when replacing a node (CASSANDRA-6476)
   * Always clean up references in SerializingCache (CASSANDRA-6994)
 + * Don't shut MessagingService down when replacing a node (CASSANDRA-6476)
   * fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751)
   * Preserves CQL metadata when updating table from thrift (CASSANDRA-6831)
+  * fix time conversion to milliseconds in SimpleCondition.await 
(CASSANDRA-7149)
  
  
 -1.2.16
 +2.0.7
 + * Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
 + * Avoid early loading of non-system keyspaces before compaction-leftovers 
 +   cleanup at startup (CASSANDRA-6913)
 + * Restrict Windows to parallel repairs (CASSANDRA-6907)
 + * (Hadoop) Allow manually specifying start/end tokens in CFIF 
(CASSANDRA-6436)
 + * Fix NPE in MeteredFlusher (CASSANDRA-6820)
 + * Fix race processing range scan responses (CASSANDRA-6820)
 + * Allow deleting snapshots from dropped keyspaces (CASSANDRA-6821)
 + * Add uuid() function (CASSANDRA-6473)
 + * Omit tombstones from schema digests (CASSANDRA-6862)
 + * Include correct consistencyLevel in LWT timeout (CASSANDRA-6884)
 + * Lower chances for losing new SSTables during nodetool refresh and
 +   ColumnFamilyStore.loadNewSSTables (CASSANDRA-6514)
 + * Add support for DELETE ... IF EXISTS to CQL3 (CASSANDRA-5708)
 + * Update hadoop_cql3_word_count example (CASSANDRA-6793)
 + * Fix handling of RejectedExecution in sync Thrift server (CASSANDRA-6788)
 + * Log more information when exceeding tombstone_warn_threshold 
(CASSANDRA-6865)
 + * Fix truncate to not abort due to unreachable fat clients (CASSANDRA-6864)
 + * Fix schema concurrency exceptions (CASSANDRA-6841)
 + * 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)
 + * 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)
 + * Read message id as string from earlier versions (CASSANDRA-6840)
 + * Properly use the Paxos consistency for (non-protocol) batch 
(CASSANDRA-6837)
 + * Add paranoid disk failure option (CASSANDRA-6646)
 + * Improve PerRowSecondaryIndex performance (CASSANDRA-6876)
 + * Extend triggers to support CAS updates (CASSANDRA-6882)
 + * Static columns with IF NOT EXISTS don't always work as expected 
(CASSANDRA-6873)
 + * Fix paging with SELECT DISTINCT (CASSANDRA-6857)
 + * Fix UnsupportedOperationException on CAS timeout (CASSANDRA-6923)
 + * Improve MeteredFlusher handling of MF-unaffected column families
 +   (CASSANDRA-6867)
 + * Add CqlRecordReader using native pagination (CASSANDRA-6311)
 + * Add QueryHandler interface (CASSANDRA-6659)
 + * Track liveRatio per-memtable, not per-CF (CASSANDRA-6945)
 + * Make sure upgradesstables keeps sstable level (CASSANDRA-6958)
 + * Fix LIMIT with static columns (CASSANDRA-6956)
 + * Fix clash with CQL column name in thrift validation (CASSANDRA-6892)
 + * Fix error with super columns in mixed 1.2-2.0 clusters (CASSANDRA-6966)
 + * Fix bad skip of sstables on slice query with composite start/finish 
(CASSANDRA-6825)
 + * Fix unintended update with conditional statement (CASSANDRA-6893)
 + * Fix map element access in IF (CASSANDRA-6914)
 + * Avoid costly range calculations for range queries on system keyspaces
 +   (CASSANDRA-6906)
 + * Fix SSTable not released if stream 

[08/12] git commit: Correctly delete scheduled range xfers

2014-05-05 Thread brandonwilliams
Correctly delete scheduled range xfers

Patch by brandonwilliams, reviewed by aleksey for CASSANDRA-7143


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

Branch: refs/heads/cassandra-2.0
Commit: 8bbe901f2a7c2799fd2fd466e360e4d5c39224d9
Parents: 0ce6b17
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon May 5 11:45:09 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon May 5 11:47:27 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bbe901f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index f4e14d8..25a5cc1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.8
+ * Correctly delete scheduled range xfers (CASSANDRA-7143)
  * Make batchlog replica selection rack-aware (CASSANDRA-6551)
  * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
  * Set JMX RMI port to 7199 (CASSANDRA-7087)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bbe901f/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java
--
diff --git 
a/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java
 
b/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java
index a231737..5591ea4 100644
--- 
a/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java
+++ 
b/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java
@@ -59,7 +59,7 @@ public class ScheduledRangeTransferExecutorService
 {
 if (scheduler == null)
 {
-LOG.warn(Unabled to shutdown; Scheduler never enabled);
+LOG.warn(Unable to shutdown; Scheduler never enabled);
 return;
 }
 
@@ -78,7 +78,7 @@ class RangeTransfer implements Runnable
 
 if (res.size()  1)
 {
-LOG.debug(No queued ranges to transfer);
+LOG.info(No queued ranges to transfer, shuffle complete.  Run 
'cassandra-shuffle disable' to stop this message.);
 return;
 }
 
@@ -103,7 +103,7 @@ class RangeTransfer implements Runnable
 finally
 {
 LOG.debug(Removing queued entry for transfer of {}, token);
-processInternal(String.format(DELETE FROM system.%s WHERE 
token_bytes = '%s',
+processInternal(String.format(DELETE FROM system.%s WHERE 
token_bytes = 0x%s,
   SystemKeyspace.RANGE_XFERS_CF,
   
ByteBufferUtil.bytesToHex(tokenBytes)));
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bbe901f/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 4fbaffe2..595a7e7 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3105,7 +3105,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private class RangeRelocator
 {
-private StreamPlan streamPlan = new StreamPlan(Bootstrap);
+private StreamPlan streamPlan = new StreamPlan(Relocation);
 
 private RangeRelocator(CollectionToken tokens, ListString 
keyspaceNames)
 {



[07/12] git commit: Correctly delete scheduled range xfers

2014-05-05 Thread brandonwilliams
Correctly delete scheduled range xfers

Patch by brandonwilliams, reviewed by aleksey for CASSANDRA-7143


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

Branch: refs/heads/cassandra-2.1
Commit: 8bbe901f2a7c2799fd2fd466e360e4d5c39224d9
Parents: 0ce6b17
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon May 5 11:45:09 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon May 5 11:47:27 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bbe901f/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index f4e14d8..25a5cc1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.8
+ * Correctly delete scheduled range xfers (CASSANDRA-7143)
  * Make batchlog replica selection rack-aware (CASSANDRA-6551)
  * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
  * Set JMX RMI port to 7199 (CASSANDRA-7087)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bbe901f/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java
--
diff --git 
a/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java
 
b/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java
index a231737..5591ea4 100644
--- 
a/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java
+++ 
b/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java
@@ -59,7 +59,7 @@ public class ScheduledRangeTransferExecutorService
 {
 if (scheduler == null)
 {
-LOG.warn(Unabled to shutdown; Scheduler never enabled);
+LOG.warn(Unable to shutdown; Scheduler never enabled);
 return;
 }
 
@@ -78,7 +78,7 @@ class RangeTransfer implements Runnable
 
 if (res.size()  1)
 {
-LOG.debug(No queued ranges to transfer);
+LOG.info(No queued ranges to transfer, shuffle complete.  Run 
'cassandra-shuffle disable' to stop this message.);
 return;
 }
 
@@ -103,7 +103,7 @@ class RangeTransfer implements Runnable
 finally
 {
 LOG.debug(Removing queued entry for transfer of {}, token);
-processInternal(String.format(DELETE FROM system.%s WHERE 
token_bytes = '%s',
+processInternal(String.format(DELETE FROM system.%s WHERE 
token_bytes = 0x%s,
   SystemKeyspace.RANGE_XFERS_CF,
   
ByteBufferUtil.bytesToHex(tokenBytes)));
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bbe901f/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 4fbaffe2..595a7e7 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3105,7 +3105,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private class RangeRelocator
 {
-private StreamPlan streamPlan = new StreamPlan(Bootstrap);
+private StreamPlan streamPlan = new StreamPlan(Relocation);
 
 private RangeRelocator(CollectionToken tokens, ListString 
keyspaceNames)
 {



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

2014-05-05 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/service/StorageService.java


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

Branch: refs/heads/trunk
Commit: b62241182fd8c4c9f22e95e3b45b92bb39b368c1
Parents: 3aa41fb 8bbe901
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon May 5 11:49:23 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon May 5 11:49:23 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6224118/CHANGES.txt
--
diff --cc CHANGES.txt
index 2f55eee,25a5cc1..86b261d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,18 +1,10 @@@
 -2.0.8
 +2.1.0-rc1
 + * Parallel streaming for sstableloader (CASSANDRA-3668)
 + * Fix bugs in supercolumns handling (CASSANDRA-7138)
 + * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
 +Merged from 2.0:
+  * Correctly delete scheduled range xfers (CASSANDRA-7143)
   * Make batchlog replica selection rack-aware (CASSANDRA-6551)
 - * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
 - * Set JMX RMI port to 7199 (CASSANDRA-7087)
 - * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
 - * Log a warning for large batches (CASSANDRA-6487)
 - * Queries on compact tables can return more rows that requested 
(CASSANDRA-7052)
 - * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 - * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
 - * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
 - * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
 - * Plug holes in resource release when wiring up StreamSession 
(CASSANDRA-7073)
 - * Re-add parameter columns to tracing session (CASSANDRA-6942)
 - * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
   * Suggest CTRL-C or semicolon after three blank lines in cqlsh 
(CASSANDRA-7142)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6224118/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 5684eea,595a7e7..f1be0c2
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -3193,7 -3105,7 +3193,7 @@@ public class StorageService extends Not
  
  private class RangeRelocator
  {
- private final StreamPlan streamPlan = new StreamPlan(Bootstrap);
 -private StreamPlan streamPlan = new StreamPlan(Relocation);
++private final StreamPlan streamPlan = new StreamPlan(Relocation);
  
  private RangeRelocator(CollectionToken tokens, ListString 
keyspaceNames)
  {



[06/12] git commit: remove changes line for 7149 as it was not pulled forward

2014-05-05 Thread brandonwilliams
remove changes line for 7149 as it was not pulled forward


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

Branch: refs/heads/cassandra-2.1
Commit: 0ce6b179af6eaea35697af26bf647de3aec283cd
Parents: a2c3476
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sun May 4 10:50:58 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sun May 4 10:50:58 2014 -0400

--
 CHANGES.txt | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ce6b179/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 3c87625..f4e14d8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -33,7 +33,6 @@ Merged from 1.2:
  * Don't shut MessagingService down when replacing a node (CASSANDRA-6476)
  * fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751)
  * Preserves CQL metadata when updating table from thrift (CASSANDRA-6831)
- * fix time conversion to milliseconds in SimpleCondition.await 
(CASSANDRA-7149)
 
 
 2.0.7



[02/12] git commit: fix time conversion to milliseconds in SimpleCondition.await

2014-05-05 Thread brandonwilliams
fix time conversion to milliseconds in SimpleCondition.await

patch by jzhang reviewed by dbrosius for cassandra-7149


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

Branch: refs/heads/trunk
Commit: 9eb346a6432e952a1892f77c0cf6fda9b40ba1c4
Parents: c454807
Author: Jianwei Zhang eezhangjian...@gmail.com
Authored: Sun May 4 10:25:38 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sun May 4 10:25:38 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9eb346a6/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 484f4bd..1c6171e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,6 +18,7 @@
  * Always clean up references in SerializingCache (CASSANDRA-6994)
  * fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751)
  * Preserves CQL metadata when updating table from thrift (CASSANDRA-6831)
+ * fix time conversion to milliseconds in SimpleCondition.await 
(CASSANDRA-7149)
 
 
 1.2.16

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9eb346a6/src/java/org/apache/cassandra/utils/SimpleCondition.java
--
diff --git a/src/java/org/apache/cassandra/utils/SimpleCondition.java 
b/src/java/org/apache/cassandra/utils/SimpleCondition.java
index 4f00998..8899a19 100644
--- a/src/java/org/apache/cassandra/utils/SimpleCondition.java
+++ b/src/java/org/apache/cassandra/utils/SimpleCondition.java
@@ -44,7 +44,7 @@ public class SimpleCondition implements Condition
 // micro/nanoseconds not supported
 assert unit == TimeUnit.DAYS || unit == TimeUnit.HOURS || unit == 
TimeUnit.MINUTES || unit == TimeUnit.SECONDS || unit == TimeUnit.MILLISECONDS;
 
-long end = System.currentTimeMillis() + unit.convert(time, 
TimeUnit.MILLISECONDS);
+long end = System.currentTimeMillis() + 
TimeUnit.MILLISECONDS.convert(time, unit);
 while (!set  end  System.currentTimeMillis())
 {
 TimeUnit.MILLISECONDS.timedWait(this, end - 
System.currentTimeMillis());



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

2014-05-05 Thread brandonwilliams
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/949c5dae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/949c5dae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/949c5dae

Branch: refs/heads/trunk
Commit: 949c5daea34d25487f42951df95d9a3ef5410fc7
Parents: ddd2ff7 b622411
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon May 5 11:49:34 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon May 5 11:49:34 2014 -0500

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


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

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



[jira] [Created] (CASSANDRA-7158) dtest upgrade_through_versions attempts to create /var/lib/cassandra

2014-05-05 Thread Michael Shuler (JIRA)
Michael Shuler created CASSANDRA-7158:
-

 Summary: dtest upgrade_through_versions attempts to create 
/var/lib/cassandra
 Key: CASSANDRA-7158
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7158
 Project: Cassandra
  Issue Type: Test
  Components: Tests
Reporter: Michael Shuler
Assignee: Russ Hatch
Priority: Minor


The dtest should not be attempting to create /var/lib/cassandra

Example test result:
http://cassci.datastax.com/job/cassandra_upgrade_dtest/5/testReport/upgrade_through_versions_test/TestUpgrade_from_cassandra_2_0_HEAD_to_cassandra_2_1_latest_tag/bootstrap_test_2/

Several tests fail in the same manner (ccm related?):
http://cassci.datastax.com/job/cassandra_upgrade_dtest/5/console



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


[jira] [Updated] (CASSANDRA-7156) Add a new seed provider for Apache Cloudstack platforms

2014-05-05 Thread Ryan McGuire (JIRA)

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

Ryan McGuire updated CASSANDRA-7156:


Tester: Michael Shuler

 Add a new seed provider for Apache Cloudstack platforms
 ---

 Key: CASSANDRA-7156
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7156
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
 Environment: needs access to a cloudstack API endpoint
Reporter: Pierre-Yves Ritschard
Priority: Minor
 Fix For: 2.0.8, 2.1.1

 Attachments: 0001-initial-work-on-a-cloudstack-seed-provider.patch


 The attached patch adds a new seed provider which queries a cloudstack API 
 endpoint for instances having a specific tag.
 The tag key and value can be controlled in the configuration file and 
 
 will default to 'cassandra_seed' and 'default'.   
 
 The Cloudstack endpoint is configured by three parameters in the  
 
 configuration file: 'cloudstack_api_endpoint', 'cloudstack_api_key' and   
 
 'cloudstack_api_secret'   
 
 By default, CloudstackSeedProvider fetchs the ipaddress of the first  
 
 interface, if another index should be used, the nic_index parameter will hold 
 it.
 A typical configuration file would thus have:
 {code:yaml}
 seed_provider:
 - class_name: org.apache.cassandra.locator.CloudstackSeedProvider
   parameters:
   - cloudstack_api_endpoint: https://some.cloudstack.host;
 cloudstack_api_key: X
 cloudstack_api_secret: X
 tag_value: my_cluster_name
 {code}
 This introduces no new dependency and together with CASSANDRA-7147 gives an 
 easy way of getting started on cloudstack platforms



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


[jira] [Commented] (CASSANDRA-6861) Optimise our Netty 4 integration

2014-05-05 Thread T Jake Luciani (JIRA)

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

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

Pushed more changes to https://github.com/tjake/cassandra/tree/6861-v2

[~enigmacurry] could you run one of the fancy stress tests on this vs 2.1 head?

 Optimise our Netty 4 integration
 

 Key: CASSANDRA-6861
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6861
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Benedict
Assignee: T Jake Luciani
Priority: Minor
  Labels: performance
 Fix For: 2.1 rc1


 Now we've upgraded to Netty 4, we're generating a lot of garbage that could 
 be avoided, so we should probably stop that. Should be reasonably easy to 
 hook into Netty's pooled buffers, returning them to the pool once a given 
 message is completed.



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


[jira] [Updated] (CASSANDRA-6861) Optimise our Netty 4 integration

2014-05-05 Thread Ryan McGuire (JIRA)

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

Ryan McGuire updated CASSANDRA-6861:


Tester: Ryan McGuire

 Optimise our Netty 4 integration
 

 Key: CASSANDRA-6861
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6861
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Benedict
Assignee: T Jake Luciani
Priority: Minor
  Labels: performance
 Fix For: 2.1 rc1


 Now we've upgraded to Netty 4, we're generating a lot of garbage that could 
 be avoided, so we should probably stop that. Should be reasonably easy to 
 hook into Netty's pooled buffers, returning them to the pool once a given 
 message is completed.



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


[jira] [Commented] (CASSANDRA-6861) Optimise our Netty 4 integration

2014-05-05 Thread Ryan McGuire (JIRA)

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

Ryan McGuire commented on CASSANDRA-6861:
-

can do.

 Optimise our Netty 4 integration
 

 Key: CASSANDRA-6861
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6861
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Benedict
Assignee: T Jake Luciani
Priority: Minor
  Labels: performance
 Fix For: 2.1 rc1


 Now we've upgraded to Netty 4, we're generating a lot of garbage that could 
 be avoided, so we should probably stop that. Should be reasonably easy to 
 hook into Netty's pooled buffers, returning them to the pool once a given 
 message is completed.



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


[jira] [Updated] (CASSANDRA-7143) shuffle broken on 2.0

2014-05-05 Thread Ryan McGuire (JIRA)

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

Ryan McGuire updated CASSANDRA-7143:


Tester: Russ Hatch  (was: Michael Shuler)

 shuffle broken on 2.0
 -

 Key: CASSANDRA-7143
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7143
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Brandon Williams
Assignee: Brandon Williams
 Fix For: 2.0.8

 Attachments: 7143.txt


 In 1.2, shuffle works correctly, creating the list of relocations and then 
 following it, pausing correctly as needed:
 {noformat}
  WARN 20:45:58,153 Pausing until token count stabilizes (target=3, actual=4)
 {noformat}
 However on 2.0, it relocates all the ranges in one shot and never deletes 
 entries from the list of tokens to relocate.



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


[jira] [Commented] (CASSANDRA-7144) CassandraDaemon RowMutation exception

2014-05-05 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-7144:
---

You didn't give a version so I'm not 100% sure but I think you're seeing this 
assert:

{code}
int size = rm.modifications.size();
out.writeInt(size);
assert size  0;
{code}

which means that your client is sending a zero-length mutation to the server.

do we not validate that in the native protocol [~thobbs]?

 CassandraDaemon RowMutation exception
 -

 Key: CASSANDRA-7144
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7144
 Project: Cassandra
  Issue Type: Bug
  Components: Core
 Environment: Ubuntu 12.04 w/ Oracle JVM, 5 nodes cluster. Nodes 2GB / 
 2 Cores in DigitalOcean.
Reporter: Maxime Lamothe-Brassard

 First time reporting a bug here, apologies if I'm not posting it in the right 
 space.
 At what seems like random interval, on random nodes in random situations I 
 will get the following exception. After this the hinted handoff start timing 
 out and the node stops participating in the cluster.
 I started seeing these after switching to the Cassandra Python-Driver from 
 the Python-CQL driver.
 ERROR [WRITE-/10.128.180.108] 2014-05-03 13:45:12,843 CassandraDaemon.java 
 (line 198) Exception in thread Thread[WRITE-/10.128.180.108,5,main]
 java.lang.AssertionError
   at 
 org.apache.cassandra.db.RowMutation$RowMutationSerializer.serialize(RowMutation.java:271)
   at 
 org.apache.cassandra.db.RowMutation$RowMutationSerializer.serialize(RowMutation.java:259)
   at org.apache.cassandra.net.MessageOut.serialize(MessageOut.java:120)
   at 
 org.apache.cassandra.net.OutboundTcpConnection.writeInternal(OutboundTcpConnection.java:251)
   at 
 org.apache.cassandra.net.OutboundTcpConnection.writeConnected(OutboundTcpConnection.java:203)
   at 
 org.apache.cassandra.net.OutboundTcpConnection.run(OutboundTcpConnection.java:151)
 ERROR [WRITE-/10.128.194.70] 2014-05-03 13:45:12,843 CassandraDaemon.java 
 (line 198) Exception in thread Thread[WRITE-/10.128.194.70,5,main]
 java.lang.AssertionError
   at 
 org.apache.cassandra.db.RowMutation$RowMutationSerializer.serialize(RowMutation.java:271)
   at 
 org.apache.cassandra.db.RowMutation$RowMutationSerializer.serialize(RowMutation.java:259)
   at org.apache.cassandra.net.MessageOut.serialize(MessageOut.java:120)
   at 
 org.apache.cassandra.net.OutboundTcpConnection.writeInternal(OutboundTcpConnection.java:251)
   at 
 org.apache.cassandra.net.OutboundTcpConnection.writeConnected(OutboundTcpConnection.java:203)
   at 
 org.apache.cassandra.net.OutboundTcpConnection.run(OutboundTcpConnection.java:151)
 ERROR [MutationStage:118] 2014-05-03 13:45:15,048 CassandraDaemon.java (line 
 198) Exception in thread Thread[MutationStage:118,5,main]
 java.lang.AssertionError
   at 
 org.apache.cassandra.db.RowMutation$RowMutationSerializer.serialize(RowMutation.java:271)
   at 
 org.apache.cassandra.db.RowMutation$RowMutationSerializer.serialize(RowMutation.java:259)
   at 
 org.apache.cassandra.utils.FBUtilities.serialize(FBUtilities.java:654)
   at 
 org.apache.cassandra.db.HintedHandOffManager.hintFor(HintedHandOffManager.java:137)
   at 
 org.apache.cassandra.service.StorageProxy.writeHintForMutation(StorageProxy.java:908)
   at 
 org.apache.cassandra.service.StorageProxy$6.runMayThrow(StorageProxy.java:881)
   at 
 org.apache.cassandra.service.StorageProxy$HintRunnable.run(StorageProxy.java:1981)
   at 
 java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
   at java.util.concurrent.FutureTask.run(FutureTask.java:262)
   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)
 ERROR [MutationStage:117] 2014-05-03 13:45:15,048 CassandraDaemon.java (line 
 198) Exception in thread Thread[MutationStage:117,5,main]
 java.lang.AssertionError
   at 
 org.apache.cassandra.db.RowMutation$RowMutationSerializer.serialize(RowMutation.java:271)
   at 
 org.apache.cassandra.db.RowMutation$RowMutationSerializer.serialize(RowMutation.java:259)
   at 
 org.apache.cassandra.utils.FBUtilities.serialize(FBUtilities.java:654)
   at 
 org.apache.cassandra.db.HintedHandOffManager.hintFor(HintedHandOffManager.java:137)
   at 
 org.apache.cassandra.service.StorageProxy.writeHintForMutation(StorageProxy.java:908)
   at 
 org.apache.cassandra.service.StorageProxy$6.runMayThrow(StorageProxy.java:881)
   at 
 

[jira] [Commented] (CASSANDRA-7144) CassandraDaemon RowMutation exception

2014-05-05 Thread Maxime Lamothe-Brassard (JIRA)

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

Maxime Lamothe-Brassard commented on CASSANDRA-7144:


I had mentioned it, probably in the wrong field since it got removed. 2.0.7, 
latest at the moment. Quick update, I ended up decomissioning the node, wiping 
/var/lib/cassandra/* and then re-joining the cluster (same install, just wiped 
the dir). It has 100% solved my problem (so far anyway, about 2 days of uptime).

So it sounds like the data on disk was somehow corrupted somewhere between my 
client code update and repairs.

 CassandraDaemon RowMutation exception
 -

 Key: CASSANDRA-7144
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7144
 Project: Cassandra
  Issue Type: Bug
  Components: Core
 Environment: Ubuntu 12.04 w/ Oracle JVM, 5 nodes cluster. Nodes 2GB / 
 2 Cores in DigitalOcean.
Reporter: Maxime Lamothe-Brassard

 First time reporting a bug here, apologies if I'm not posting it in the right 
 space.
 At what seems like random interval, on random nodes in random situations I 
 will get the following exception. After this the hinted handoff start timing 
 out and the node stops participating in the cluster.
 I started seeing these after switching to the Cassandra Python-Driver from 
 the Python-CQL driver.
 ERROR [WRITE-/10.128.180.108] 2014-05-03 13:45:12,843 CassandraDaemon.java 
 (line 198) Exception in thread Thread[WRITE-/10.128.180.108,5,main]
 java.lang.AssertionError
   at 
 org.apache.cassandra.db.RowMutation$RowMutationSerializer.serialize(RowMutation.java:271)
   at 
 org.apache.cassandra.db.RowMutation$RowMutationSerializer.serialize(RowMutation.java:259)
   at org.apache.cassandra.net.MessageOut.serialize(MessageOut.java:120)
   at 
 org.apache.cassandra.net.OutboundTcpConnection.writeInternal(OutboundTcpConnection.java:251)
   at 
 org.apache.cassandra.net.OutboundTcpConnection.writeConnected(OutboundTcpConnection.java:203)
   at 
 org.apache.cassandra.net.OutboundTcpConnection.run(OutboundTcpConnection.java:151)
 ERROR [WRITE-/10.128.194.70] 2014-05-03 13:45:12,843 CassandraDaemon.java 
 (line 198) Exception in thread Thread[WRITE-/10.128.194.70,5,main]
 java.lang.AssertionError
   at 
 org.apache.cassandra.db.RowMutation$RowMutationSerializer.serialize(RowMutation.java:271)
   at 
 org.apache.cassandra.db.RowMutation$RowMutationSerializer.serialize(RowMutation.java:259)
   at org.apache.cassandra.net.MessageOut.serialize(MessageOut.java:120)
   at 
 org.apache.cassandra.net.OutboundTcpConnection.writeInternal(OutboundTcpConnection.java:251)
   at 
 org.apache.cassandra.net.OutboundTcpConnection.writeConnected(OutboundTcpConnection.java:203)
   at 
 org.apache.cassandra.net.OutboundTcpConnection.run(OutboundTcpConnection.java:151)
 ERROR [MutationStage:118] 2014-05-03 13:45:15,048 CassandraDaemon.java (line 
 198) Exception in thread Thread[MutationStage:118,5,main]
 java.lang.AssertionError
   at 
 org.apache.cassandra.db.RowMutation$RowMutationSerializer.serialize(RowMutation.java:271)
   at 
 org.apache.cassandra.db.RowMutation$RowMutationSerializer.serialize(RowMutation.java:259)
   at 
 org.apache.cassandra.utils.FBUtilities.serialize(FBUtilities.java:654)
   at 
 org.apache.cassandra.db.HintedHandOffManager.hintFor(HintedHandOffManager.java:137)
   at 
 org.apache.cassandra.service.StorageProxy.writeHintForMutation(StorageProxy.java:908)
   at 
 org.apache.cassandra.service.StorageProxy$6.runMayThrow(StorageProxy.java:881)
   at 
 org.apache.cassandra.service.StorageProxy$HintRunnable.run(StorageProxy.java:1981)
   at 
 java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
   at java.util.concurrent.FutureTask.run(FutureTask.java:262)
   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)
 ERROR [MutationStage:117] 2014-05-03 13:45:15,048 CassandraDaemon.java (line 
 198) Exception in thread Thread[MutationStage:117,5,main]
 java.lang.AssertionError
   at 
 org.apache.cassandra.db.RowMutation$RowMutationSerializer.serialize(RowMutation.java:271)
   at 
 org.apache.cassandra.db.RowMutation$RowMutationSerializer.serialize(RowMutation.java:259)
   at 
 org.apache.cassandra.utils.FBUtilities.serialize(FBUtilities.java:654)
   at 
 org.apache.cassandra.db.HintedHandOffManager.hintFor(HintedHandOffManager.java:137)
   at 
 org.apache.cassandra.service.StorageProxy.writeHintForMutation(StorageProxy.java:908)
   at 
 

[jira] [Commented] (CASSANDRA-6861) Optimise our Netty 4 integration

2014-05-05 Thread T Jake Luciani (JIRA)

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

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

The -mode should be: native cql3 prepared

 Optimise our Netty 4 integration
 

 Key: CASSANDRA-6861
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6861
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Benedict
Assignee: T Jake Luciani
Priority: Minor
  Labels: performance
 Fix For: 2.1 rc1


 Now we've upgraded to Netty 4, we're generating a lot of garbage that could 
 be avoided, so we should probably stop that. Should be reasonably easy to 
 hook into Netty's pooled buffers, returning them to the pool once a given 
 message is completed.



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


[04/10] git commit: remove stray bat file

2014-05-05 Thread brandonwilliams
remove stray bat file


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

Branch: refs/heads/trunk
Commit: 64394b2526f99c8cbbc0542d36c52adcc05419b5
Parents: 9eb346a
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon May 5 14:23:21 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon May 5 14:23:27 2014 -0500

--
 bin/sstablemetadata.bat | 33 -
 1 file changed, 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/64394b25/bin/sstablemetadata.bat
--
diff --git a/bin/sstablemetadata.bat b/bin/sstablemetadata.bat
deleted file mode 100644
index 72e6506..000
--- a/bin/sstablemetadata.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@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
-
-setlocal
-
-if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD%\..\..
-if NOT DEFINED JAVA_HOME goto :err
-
-set CLASSPATH=
-for %%i in (%CASSANDRA_HOME%\build\*.jar) do call :append %%i
-for %%i in (%CASSANDRA_HOME%\lib\*.jar) do call :append %%i
-goto start
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-:start
-%JAVA_HOME%\bin\java -cp %CLASSPATH% 
org.apache.cassandra.tools.SSTableMetadataViewer %*



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

2014-05-05 Thread brandonwilliams
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/f5245703
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5245703
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5245703

Branch: refs/heads/trunk
Commit: f52457036d798b1df06bdb7ac3de908e25943313
Parents: 8bbe901 64394b2
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon May 5 14:23:35 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon May 5 14:23:35 2014 -0500

--
 bin/sstablemetadata.bat | 33 -
 1 file changed, 33 deletions(-)
--




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

2014-05-05 Thread brandonwilliams
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/f5245703
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5245703
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5245703

Branch: refs/heads/cassandra-2.0
Commit: f52457036d798b1df06bdb7ac3de908e25943313
Parents: 8bbe901 64394b2
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon May 5 14:23:35 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon May 5 14:23:35 2014 -0500

--
 bin/sstablemetadata.bat | 33 -
 1 file changed, 33 deletions(-)
--




[03/10] git commit: remove stray bat file

2014-05-05 Thread brandonwilliams
remove stray bat file


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

Branch: refs/heads/cassandra-2.1
Commit: 64394b2526f99c8cbbc0542d36c52adcc05419b5
Parents: 9eb346a
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon May 5 14:23:21 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon May 5 14:23:27 2014 -0500

--
 bin/sstablemetadata.bat | 33 -
 1 file changed, 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/64394b25/bin/sstablemetadata.bat
--
diff --git a/bin/sstablemetadata.bat b/bin/sstablemetadata.bat
deleted file mode 100644
index 72e6506..000
--- a/bin/sstablemetadata.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@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
-
-setlocal
-
-if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD%\..\..
-if NOT DEFINED JAVA_HOME goto :err
-
-set CLASSPATH=
-for %%i in (%CASSANDRA_HOME%\build\*.jar) do call :append %%i
-for %%i in (%CASSANDRA_HOME%\lib\*.jar) do call :append %%i
-goto start
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-:start
-%JAVA_HOME%\bin\java -cp %CLASSPATH% 
org.apache.cassandra.tools.SSTableMetadataViewer %*



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

2014-05-05 Thread brandonwilliams
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/f5245703
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5245703
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5245703

Branch: refs/heads/cassandra-2.1
Commit: f52457036d798b1df06bdb7ac3de908e25943313
Parents: 8bbe901 64394b2
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon May 5 14:23:35 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon May 5 14:23:35 2014 -0500

--
 bin/sstablemetadata.bat | 33 -
 1 file changed, 33 deletions(-)
--




[01/10] git commit: remove stray bat file

2014-05-05 Thread brandonwilliams
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-1.2 9eb346a64 - 64394b252
  refs/heads/cassandra-2.0 8bbe901f2 - f52457036
  refs/heads/cassandra-2.1 b62241182 - 07dfb58ad
  refs/heads/trunk 949c5daea - c7fb27abc


remove stray bat file


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

Branch: refs/heads/cassandra-1.2
Commit: 64394b2526f99c8cbbc0542d36c52adcc05419b5
Parents: 9eb346a
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon May 5 14:23:21 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon May 5 14:23:27 2014 -0500

--
 bin/sstablemetadata.bat | 33 -
 1 file changed, 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/64394b25/bin/sstablemetadata.bat
--
diff --git a/bin/sstablemetadata.bat b/bin/sstablemetadata.bat
deleted file mode 100644
index 72e6506..000
--- a/bin/sstablemetadata.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@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
-
-setlocal
-
-if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD%\..\..
-if NOT DEFINED JAVA_HOME goto :err
-
-set CLASSPATH=
-for %%i in (%CASSANDRA_HOME%\build\*.jar) do call :append %%i
-for %%i in (%CASSANDRA_HOME%\lib\*.jar) do call :append %%i
-goto start
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-:start
-%JAVA_HOME%\bin\java -cp %CLASSPATH% 
org.apache.cassandra.tools.SSTableMetadataViewer %*



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

2014-05-05 Thread brandonwilliams
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/07dfb58a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07dfb58a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07dfb58a

Branch: refs/heads/trunk
Commit: 07dfb58adceb23f725a69a0cfa22f19d1b8d1432
Parents: b622411 f524570
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon May 5 14:23:44 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon May 5 14:23:44 2014 -0500

--
 bin/sstablemetadata.bat | 33 -
 1 file changed, 33 deletions(-)
--




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

2014-05-05 Thread brandonwilliams
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/c7fb27ab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7fb27ab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7fb27ab

Branch: refs/heads/trunk
Commit: c7fb27abc449f8cecc92089cb96f97c138095086
Parents: 949c5da 07dfb58
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon May 5 14:23:51 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon May 5 14:23:51 2014 -0500

--
 bin/sstablemetadata.bat | 33 -
 1 file changed, 33 deletions(-)
--




[02/10] git commit: remove stray bat file

2014-05-05 Thread brandonwilliams
remove stray bat file


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

Branch: refs/heads/cassandra-2.0
Commit: 64394b2526f99c8cbbc0542d36c52adcc05419b5
Parents: 9eb346a
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon May 5 14:23:21 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon May 5 14:23:27 2014 -0500

--
 bin/sstablemetadata.bat | 33 -
 1 file changed, 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/64394b25/bin/sstablemetadata.bat
--
diff --git a/bin/sstablemetadata.bat b/bin/sstablemetadata.bat
deleted file mode 100644
index 72e6506..000
--- a/bin/sstablemetadata.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@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
-
-setlocal
-
-if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD%\..\..
-if NOT DEFINED JAVA_HOME goto :err
-
-set CLASSPATH=
-for %%i in (%CASSANDRA_HOME%\build\*.jar) do call :append %%i
-for %%i in (%CASSANDRA_HOME%\lib\*.jar) do call :append %%i
-goto start
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-:start
-%JAVA_HOME%\bin\java -cp %CLASSPATH% 
org.apache.cassandra.tools.SSTableMetadataViewer %*



[jira] [Updated] (CASSANDRA-7160) clean up tools/bin

2014-05-05 Thread Brandon Williams (JIRA)

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

Brandon Williams updated CASSANDRA-7160:


Reviewer: Brandon Williams

 clean up tools/bin
 --

 Key: CASSANDRA-7160
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7160
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Reporter: Brandon Williams
Assignee: Michael Shuler
Priority: Minor
 Fix For: 2.1 rc1


 Right now we have most utils in bin/, but sstablemetadata is an outlier in 
 tools/bin.  For packaging, we don't care what the source directory is, we put 
 everything in /usr/bin.  We want to keep some things out of users' hands 
 unless they know what they're doing (like sstable2json) so I propose that we 
 break these things out into a companion cassandra-tools package that will 
 depend on cassandra, and leave stress as the only thing in tools/bin.



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


[jira] [Created] (CASSANDRA-7160) clean up tools/bin

2014-05-05 Thread Brandon Williams (JIRA)
Brandon Williams created CASSANDRA-7160:
---

 Summary: clean up tools/bin
 Key: CASSANDRA-7160
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7160
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Reporter: Brandon Williams
Assignee: Michael Shuler
Priority: Minor
 Fix For: 2.1 rc1


Right now we have most utils in bin/, but sstablemetadata is an outlier in 
tools/bin.  For packaging, we don't care what the source directory is, we put 
everything in /usr/bin.  We want to keep some things out of users' hands unless 
they know what they're doing (like sstable2json) so I propose that we break 
these things out into a companion cassandra-tools package that will depend on 
cassandra, and leave stress as the only thing in tools/bin.



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


[jira] [Commented] (CASSANDRA-7160) clean up tools/bin

2014-05-05 Thread Brandon Williams (JIRA)

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

Brandon Williams commented on CASSANDRA-7160:
-

Jonathan said we should be putting more stuff in tools, so I'll agree to that.  
What we put in tools goes in the cassandra-tools package, so there is both a 
distinction in the tree as well as in the packages.

 clean up tools/bin
 --

 Key: CASSANDRA-7160
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7160
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Reporter: Brandon Williams
Assignee: Michael Shuler
Priority: Minor
 Fix For: 2.1 rc1


 Right now we have most utils in bin/, but sstablemetadata is an outlier in 
 tools/bin.  For packaging, we don't care what the source directory is, we put 
 everything in /usr/bin.  We want to keep some things out of users' hands 
 unless they know what they're doing (like sstable2json) so I propose that we 
 break these things out into a companion cassandra-tools package that will 
 depend on cassandra, and leave stress as the only thing in tools/bin.



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


[jira] [Commented] (CASSANDRA-7107) General minor tidying of CollationController path

2014-05-05 Thread Aleksey Yeschenko (JIRA)

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

Aleksey Yeschenko commented on CASSANDRA-7107:
--

Only the 'invert' case, although both do still seem fine to me. Don't trust 
myself much ¯\_(ツ)_/¯

 General minor tidying of CollationController path
 -

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


 There is a lot of unnecessary boiler plate when grabbing an iterator from an 
 in-memory column family. This patch:
 * Removes FakeCellName
 * Avoids wrapping a non-OnDiskAtomIterator as an OnDiskAtomIterator except 
 when the wrapping is useful
 * Removes ColumnSlice.NavigableSetIterator and creates a simpler more direct 
 equivalent in ABTC
 * Does not construct a SliceIterator in either ABSC or ABTC if only one slice 
 is requested (just returns that slice as an Iterator)
 * Does not construct multiple list indirections in ABSC when constructing a 
 slice
 * Shares forward/reverse iterators in ABSC between slices and full-iteration
 * Avoids O(N) comparisons during collation of results into an ABSC, by using 
 the knowledge that all columns are provided in insertion order from a merge 
 iterator



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


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

2014-05-05 Thread aleksey
Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java


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

Branch: refs/heads/trunk
Commit: 284d3f7fe0210acfdc9b242c2987124eda5a9c66
Parents: c7fb27a 9881ea6
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon May 5 22:58:58 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon May 5 22:58:58 2014 +0300

--
 CHANGES.txt |   1 +
 .../cassandra/db/ArrayBackedSortedColumns.java  | 254 +++
 .../apache/cassandra/db/AtomicBTreeColumns.java |  76 +-
 .../cassandra/db/CollationController.java   |  46 ++--
 .../org/apache/cassandra/db/ColumnFamily.java   |  17 +-
 .../apache/cassandra/db/ColumnFamilyStore.java  |   5 +-
 .../apache/cassandra/db/RowIteratorFactory.java |  19 +-
 .../apache/cassandra/db/filter/ColumnSlice.java | 146 ---
 .../cassandra/db/filter/ExtendedFilter.java |   4 +-
 .../cassandra/db/filter/IDiskAtomFilter.java|   4 +-
 .../cassandra/db/filter/NamesQueryFilter.java   |  39 +--
 .../apache/cassandra/db/filter/QueryFilter.java |  56 ++--
 .../cassandra/db/filter/SliceQueryFilter.java   |  24 +-
 .../cassandra/service/RowDataResolver.java  |  11 +-
 .../apache/cassandra/utils/MergeIterator.java   |  25 +-
 .../org/apache/cassandra/utils/btree/BTree.java |  12 +-
 .../apache/cassandra/utils/btree/BTreeSet.java  |   8 +-
 .../apache/cassandra/utils/btree/Cursor.java|   8 +-
 18 files changed, 360 insertions(+), 395 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/284d3f7f/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
--
diff --cc src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
index 5cd51d8,f5624d2..ef2c2c6
--- a/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
+++ b/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
@@@ -435,77 -445,25 +446,78 @@@ public class ArrayBackedSortedColumns e
  public IteratorCell reverseIterator(ColumnSlice[] slices)
  {
  maybeSortCells();
- return new SlicesIterator(Arrays.asList(cells).subList(0, size), 
getComparator(), slices, !reversed);
+ return slices.length == 1
+  ? slice(slices[0], !reversed, null)
+  : new SlicesIterator(slices, !reversed);
  }
  
 +public SearchIteratorCellName, Cell searchIterator()
 +{
 +maybeSortCells();
 +
 +return new SearchIteratorCellName, Cell()
 +{
 +// the first index that we could find the next key at, i.e. one 
larger
 +// than the last key's location
 +private int i = 0;
 +
 +// We assume a uniform distribution of keys,
 +// so we keep track of how many keys were skipped to satisfy last 
lookup, and only look at twice that
 +// many keys for next lookup initially, extending to whole range 
only if we couldn't find it in that subrange
 +private int range = size / 2;
 +
 +public boolean hasNext()
 +{
 +return i  size;
 +}
 +
 +public Cell next(CellName name)
 +{
 +if (!isSorted || !hasNext())
 +throw new IllegalStateException();
 +
 +// optimize for runs of sequential matches, as in 
CollationController
 +// checking to see if we've found the desired cells yet 
(CASSANDRA-6933)
 +int c = metadata.comparator.compare(name, cells[i].name());
 +if (c = 0)
 +return c  0 ? null : cells[i++];
 +
 +// use range to manually force a better bsearch pivot by 
breaking it into two calls:
 +// first for i..i+range, then i+range..size if necessary.
 +// 
https://issues.apache.org/jira/browse/CASSANDRA-6933?focusedCommentId=13958264page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13958264
 +int limit = Math.min(size, i + range);
 +int i2 = binarySearch(i + 1, limit, name, 
internalComparator());
 +if (-1 - i2 == limit)
 +i2 = 

[jira] [Updated] (CASSANDRA-7128) Upgrade NBHM

2014-05-05 Thread T Jake Luciani (JIRA)

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

T Jake Luciani updated CASSANDRA-7128:
--

Attachment: (was: Screen Shot 2014-04-30 at 11.07.22 PM.png)

 Upgrade NBHM
 

 Key: CASSANDRA-7128
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7128
 Project: Cassandra
  Issue Type: Improvement
Reporter: T Jake Luciani
Assignee: T Jake Luciani
Priority: Trivial
  Labels: performance
 Fix For: 2.1 rc1


 Upgrade NBHM to use the Boundary maintained version



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


[jira] [Updated] (CASSANDRA-7128) Upgrade NBHM

2014-05-05 Thread T Jake Luciani (JIRA)

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

T Jake Luciani updated CASSANDRA-7128:
--

Description: Upgrade NBHM to use the Boundary maintained version  (was: 
AbstractRowResolver uses a NBHM for each read request.  

Profiler flagged this as a bottleneck since the init() call creates a 
AtomicReferenceFieldUpdater which is stored in a synchronized collection.

A NBHS is most certainly overkill for such a short lived object.  And turns out 
switching it to a CHS in my tests yields a ~5-10% read boost.)

Pushed to https://github.com/tjake/cassandra/tree/7128

 Upgrade NBHM
 

 Key: CASSANDRA-7128
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7128
 Project: Cassandra
  Issue Type: Improvement
Reporter: T Jake Luciani
Assignee: T Jake Luciani
Priority: Trivial
  Labels: performance
 Fix For: 2.1 rc1


 Upgrade NBHM to use the Boundary maintained version



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


[jira] [Updated] (CASSANDRA-7128) Upgrade NBHM

2014-05-05 Thread T Jake Luciani (JIRA)

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

T Jake Luciani updated CASSANDRA-7128:
--

Attachment: (was: 7128.txt)

 Upgrade NBHM
 

 Key: CASSANDRA-7128
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7128
 Project: Cassandra
  Issue Type: Improvement
Reporter: T Jake Luciani
Assignee: T Jake Luciani
Priority: Trivial
  Labels: performance
 Fix For: 2.1 rc1


 Upgrade NBHM to use the Boundary maintained version



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


[jira] [Commented] (CASSANDRA-7128) Upgrade NBHM

2014-05-05 Thread Benedict (JIRA)

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

Benedict commented on CASSANDRA-7128:
-

+1

 Upgrade NBHM
 

 Key: CASSANDRA-7128
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7128
 Project: Cassandra
  Issue Type: Improvement
Reporter: T Jake Luciani
Assignee: T Jake Luciani
Priority: Trivial
  Labels: performance
 Fix For: 2.1 rc1


 Upgrade NBHM to use the Boundary maintained version



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


git commit: high-scale-lib upgrade

2014-05-05 Thread jake
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 9881ea6b3 - f0575f153


high-scale-lib upgrade

Patch by tjake; reviewed by Benedict Elliott Smith for CASSANDRA-7128


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

Branch: refs/heads/cassandra-2.1
Commit: f0575f153b8f0b0caa56f56cc5e93ebd3f784b8e
Parents: 9881ea6
Author: T Jake Luciani j...@apache.org
Authored: Mon May 5 16:07:53 2014 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Mon May 5 16:37:22 2014 -0400

--
 CHANGES.txt  |   1 +
 build.properties.default |   1 +
 build.xml|   8 ++--
 lib/high-scale-lib-1.0.5.jar | Bin 0 - 104776 bytes
 lib/high-scale-lib-1.1.2.jar | Bin 96046 - 0 bytes
 5 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a8b6ae4..553f764 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@ Merged from 1.2:
  * Add Cloudstack snitch (CASSANDRA-7147)
  * Update system.peers correctly when relocating tokens (CASSANDRA-7126)
  * Add Google Compute Engine snitch (CASSANDRA-7132)
+ * Upgrade NBHM lib (CASSANDRA-7128) 
 
 2.1.0-beta2
  * Increase default CL space to 8GB (CASSANDRA-7031)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/build.properties.default
--
diff --git a/build.properties.default b/build.properties.default
index ff6aea0..be9b23b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -4,4 +4,5 @@ artifact.remoteRepository.java.net2:   
http://download.java.net/maven/2
 artifact.remoteRepository.apache:  
https://repository.apache.org/content/repositories/releases
 artifact.remoteRepository.jclouds: http://jclouds.googlecode.com/svn/repo
 artifact.remoteRepository.oauth:   
http://oauth.googlecode.com/svn/code/maven
+artifact.remoteRepository.boundary:   
http://maven.boundary.com/artifactory/external   
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/build.xml
--
diff --git a/build.xml b/build.xml
index 898b141..e8d9dd9 100644
--- a/build.xml
+++ b/build.xml
@@ -283,6 +283,7 @@
   artifact:remoteRepository id=central   
url=${artifact.remoteRepository.central}/
   artifact:remoteRepository id=java.net2 
url=${artifact.remoteRepository.java.net2}/
   artifact:remoteRepository id=apache
url=${artifact.remoteRepository.apache}/
+  artifact:remoteRepository id=boundary  
url=${artifact.remoteRepository.boundary}/
 
   macrodef name=install
 attribute name=pomFile/
@@ -361,7 +362,7 @@
 exclusion groupId=junit artifactId=junit/
   /dependency
   dependency groupId=com.googlecode.json-simple 
artifactId=json-simple version=1.1/
-  dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib version=1.1.2/
+  dependency groupId=com.boundary.high-scale-lib 
artifactId=high-scale-lib version=1.0.5/
   dependency groupId=com.github.jbellis artifactId=jamm 
version=0.2.6/
   dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.3
exclusion groupId=org.slf4j artifactId=slf4j-log4j12/
@@ -470,7 +471,7 @@
 dependency groupId=org.codehaus.jackson 
artifactId=jackson-mapper-asl/
 dependency groupId=jline artifactId=jline/
 dependency groupId=com.googlecode.json-simple 
artifactId=json-simple/
-dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib/
+dependency groupId=com.boundary.high-scale-lib 
artifactId=high-scale-lib/
 dependency groupId=org.yaml artifactId=snakeyaml/
 dependency groupId=org.mindrot artifactId=jbcrypt/
 dependency groupId=com.yammer.metrics artifactId=metrics-core/
@@ -542,6 +543,7 @@
   remoteRepository refid=central/
   remoteRepository refid=apache/
   remoteRepository refid=java.net2/
+  remoteRepository refid=boundary/
   /artifact:dependencies
   artifact:dependencies pomRefId=coverage-deps-pom
  pathId=cobertura.classpath
@@ -567,6 +569,7 @@
 remoteRepository refid=apache/
 remoteRepository refid=central/
 remoteRepository refid=oauth/
+remoteRepository refid=boundary/
   /artifact:dependencies
   copy todir=${test.lib}/jars

[jira] [Commented] (CASSANDRA-7084) o.a.c.db.RecoveryManagerTest.testNothingToRecover Unit Test Flaps in 2.0

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler commented on CASSANDRA-7084:
---

{{git bisect start cassandra-2.0 cassandra-1.2}} with the condition that the 
unit test passes 10x to be called good, got me to:
{noformat}
55b5605b7afcb7ae9bcb9b61959b91502f769db4 is the first bad commit
commit 55b5605b7afcb7ae9bcb9b61959b91502f769db4
Author: Marcus Eriksson marc...@apache.org
Date:   Tue Feb 11 09:18:09 2014 +0100

Stop CommitLogSegment.close() from unnecessarily calling sync() prior to 
cleaning the buffer.

Patch by belliotsmith, reviewed by marcuse for CASSANDRA-6652

:100644 100644 b98dec74fe9a7b0c2fb53910e68f9f359001d427 
93552ef07a377d0627e0511b1f4a62950c394cc6 M  CHANGES.txt
:04 04 deec146f50c5eaf886c87c612564774cb8375c8a 
31e2e75ef8b26815acd0823173a378e8f41b6f6c M  src
{noformat}

 o.a.c.db.RecoveryManagerTest.testNothingToRecover Unit Test Flaps in 2.0
 

 Key: CASSANDRA-7084
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7084
 Project: Cassandra
  Issue Type: Test
  Components: Tests
Reporter: Michael Shuler
Assignee: Michael Shuler
Priority: Minor
 Fix For: 2.0.8


 Example:
   http://cassci.datastax.com/job/cassandra-2.0_utest/326/
 (this test appears to pass consistently in 1.2 and 2.1 with a quick glance - 
 will test out the other branches more thoroughly and bisect)
 {noformat}
 REGRESSION:  org.apache.cassandra.db.RecoveryManagerTest.testNothingToRecover
 Error Message:
 java.io.FileNotFoundException: 
 /var/lib/jenkins/jobs/cassandra-2.0_test/workspace/build/test/cassandra/commitlog/CommitLog-3-1398354429966.log
  (No such file or directory)
 Stack Trace:
 java.lang.RuntimeException: java.io.FileNotFoundException: 
 /var/lib/jenkins/jobs/cassandra-2.0_test/workspace/build/test/cassandra/commitlog/CommitLog-3-1398354429966.log
  (No such file or directory)
   at 
 org.apache.cassandra.io.util.RandomAccessReader.open(RandomAccessReader.java:102)
   at 
 org.apache.cassandra.io.util.RandomAccessReader.open(RandomAccessReader.java:90)
   at 
 org.apache.cassandra.db.commitlog.CommitLogReplayer.recover(CommitLogReplayer.java:186)
   at 
 org.apache.cassandra.db.commitlog.CommitLogReplayer.recover(CommitLogReplayer.java:95)
   at 
 org.apache.cassandra.db.commitlog.CommitLog.recover(CommitLog.java:151)
   at 
 org.apache.cassandra.db.commitlog.CommitLog.recover(CommitLog.java:131)
   at 
 org.apache.cassandra.db.RecoveryManagerTest.testNothingToRecover(RecoveryManagerTest.java:42)
 Caused by: java.io.FileNotFoundException: 
 /var/lib/jenkins/jobs/cassandra-2.0_test/workspace/build/test/cassandra/commitlog/CommitLog-3-1398354429966.log
  (No such file or directory)
   at java.io.RandomAccessFile.open(Native Method)
   at java.io.RandomAccessFile.init(RandomAccessFile.java:241)
   at 
 org.apache.cassandra.io.util.RandomAccessReader.init(RandomAccessReader.java:58)
   at 
 org.apache.cassandra.io.util.RandomAccessReader.open(RandomAccessReader.java:98)
 {noformat}



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


[jira] [Commented] (CASSANDRA-7084) o.a.c.db.RecoveryManagerTest.testNothingToRecover Unit Test Flaps in 2.0

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler commented on CASSANDRA-7084:
---

Looping over the unit test 25x in the cassandra1.2 and cassandra-2.1 branches 
give me complete success. (might be sort of interesting to reverse-bisect what 
fixed the test between 2.0-2.1)

 o.a.c.db.RecoveryManagerTest.testNothingToRecover Unit Test Flaps in 2.0
 

 Key: CASSANDRA-7084
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7084
 Project: Cassandra
  Issue Type: Test
  Components: Tests
Reporter: Michael Shuler
Assignee: Michael Shuler
Priority: Minor
 Fix For: 2.0.8


 Example:
   http://cassci.datastax.com/job/cassandra-2.0_utest/326/
 (this test appears to pass consistently in 1.2 and 2.1 with a quick glance - 
 will test out the other branches more thoroughly and bisect)
 {noformat}
 REGRESSION:  org.apache.cassandra.db.RecoveryManagerTest.testNothingToRecover
 Error Message:
 java.io.FileNotFoundException: 
 /var/lib/jenkins/jobs/cassandra-2.0_test/workspace/build/test/cassandra/commitlog/CommitLog-3-1398354429966.log
  (No such file or directory)
 Stack Trace:
 java.lang.RuntimeException: java.io.FileNotFoundException: 
 /var/lib/jenkins/jobs/cassandra-2.0_test/workspace/build/test/cassandra/commitlog/CommitLog-3-1398354429966.log
  (No such file or directory)
   at 
 org.apache.cassandra.io.util.RandomAccessReader.open(RandomAccessReader.java:102)
   at 
 org.apache.cassandra.io.util.RandomAccessReader.open(RandomAccessReader.java:90)
   at 
 org.apache.cassandra.db.commitlog.CommitLogReplayer.recover(CommitLogReplayer.java:186)
   at 
 org.apache.cassandra.db.commitlog.CommitLogReplayer.recover(CommitLogReplayer.java:95)
   at 
 org.apache.cassandra.db.commitlog.CommitLog.recover(CommitLog.java:151)
   at 
 org.apache.cassandra.db.commitlog.CommitLog.recover(CommitLog.java:131)
   at 
 org.apache.cassandra.db.RecoveryManagerTest.testNothingToRecover(RecoveryManagerTest.java:42)
 Caused by: java.io.FileNotFoundException: 
 /var/lib/jenkins/jobs/cassandra-2.0_test/workspace/build/test/cassandra/commitlog/CommitLog-3-1398354429966.log
  (No such file or directory)
   at java.io.RandomAccessFile.open(Native Method)
   at java.io.RandomAccessFile.init(RandomAccessFile.java:241)
   at 
 org.apache.cassandra.io.util.RandomAccessReader.init(RandomAccessReader.java:58)
   at 
 org.apache.cassandra.io.util.RandomAccessReader.open(RandomAccessReader.java:98)
 {noformat}



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


[jira] [Updated] (CASSANDRA-7084) o.a.c.db.RecoveryManagerTest.testNothingToRecover Unit Test Flaps in 2.0

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler updated CASSANDRA-7084:
--

Assignee: (was: Michael Shuler)

 o.a.c.db.RecoveryManagerTest.testNothingToRecover Unit Test Flaps in 2.0
 

 Key: CASSANDRA-7084
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7084
 Project: Cassandra
  Issue Type: Test
  Components: Tests
Reporter: Michael Shuler
Priority: Minor
 Fix For: 2.0.8


 Example:
   http://cassci.datastax.com/job/cassandra-2.0_utest/326/
 (this test appears to pass consistently in 1.2 and 2.1 with a quick glance - 
 will test out the other branches more thoroughly and bisect)
 {noformat}
 REGRESSION:  org.apache.cassandra.db.RecoveryManagerTest.testNothingToRecover
 Error Message:
 java.io.FileNotFoundException: 
 /var/lib/jenkins/jobs/cassandra-2.0_test/workspace/build/test/cassandra/commitlog/CommitLog-3-1398354429966.log
  (No such file or directory)
 Stack Trace:
 java.lang.RuntimeException: java.io.FileNotFoundException: 
 /var/lib/jenkins/jobs/cassandra-2.0_test/workspace/build/test/cassandra/commitlog/CommitLog-3-1398354429966.log
  (No such file or directory)
   at 
 org.apache.cassandra.io.util.RandomAccessReader.open(RandomAccessReader.java:102)
   at 
 org.apache.cassandra.io.util.RandomAccessReader.open(RandomAccessReader.java:90)
   at 
 org.apache.cassandra.db.commitlog.CommitLogReplayer.recover(CommitLogReplayer.java:186)
   at 
 org.apache.cassandra.db.commitlog.CommitLogReplayer.recover(CommitLogReplayer.java:95)
   at 
 org.apache.cassandra.db.commitlog.CommitLog.recover(CommitLog.java:151)
   at 
 org.apache.cassandra.db.commitlog.CommitLog.recover(CommitLog.java:131)
   at 
 org.apache.cassandra.db.RecoveryManagerTest.testNothingToRecover(RecoveryManagerTest.java:42)
 Caused by: java.io.FileNotFoundException: 
 /var/lib/jenkins/jobs/cassandra-2.0_test/workspace/build/test/cassandra/commitlog/CommitLog-3-1398354429966.log
  (No such file or directory)
   at java.io.RandomAccessFile.open(Native Method)
   at java.io.RandomAccessFile.init(RandomAccessFile.java:241)
   at 
 org.apache.cassandra.io.util.RandomAccessReader.init(RandomAccessReader.java:58)
   at 
 org.apache.cassandra.io.util.RandomAccessReader.open(RandomAccessReader.java:98)
 {noformat}



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


[jira] [Updated] (CASSANDRA-7084) o.a.c.db.RecoveryManagerTest.testNothingToRecover Unit Test Flaps in 2.0

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler updated CASSANDRA-7084:
--

Assignee: Benedict

 o.a.c.db.RecoveryManagerTest.testNothingToRecover Unit Test Flaps in 2.0
 

 Key: CASSANDRA-7084
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7084
 Project: Cassandra
  Issue Type: Test
  Components: Tests
Reporter: Michael Shuler
Assignee: Benedict
Priority: Minor
 Fix For: 2.0.8


 Example:
   http://cassci.datastax.com/job/cassandra-2.0_utest/326/
 (this test appears to pass consistently in 1.2 and 2.1 with a quick glance - 
 will test out the other branches more thoroughly and bisect)
 {noformat}
 REGRESSION:  org.apache.cassandra.db.RecoveryManagerTest.testNothingToRecover
 Error Message:
 java.io.FileNotFoundException: 
 /var/lib/jenkins/jobs/cassandra-2.0_test/workspace/build/test/cassandra/commitlog/CommitLog-3-1398354429966.log
  (No such file or directory)
 Stack Trace:
 java.lang.RuntimeException: java.io.FileNotFoundException: 
 /var/lib/jenkins/jobs/cassandra-2.0_test/workspace/build/test/cassandra/commitlog/CommitLog-3-1398354429966.log
  (No such file or directory)
   at 
 org.apache.cassandra.io.util.RandomAccessReader.open(RandomAccessReader.java:102)
   at 
 org.apache.cassandra.io.util.RandomAccessReader.open(RandomAccessReader.java:90)
   at 
 org.apache.cassandra.db.commitlog.CommitLogReplayer.recover(CommitLogReplayer.java:186)
   at 
 org.apache.cassandra.db.commitlog.CommitLogReplayer.recover(CommitLogReplayer.java:95)
   at 
 org.apache.cassandra.db.commitlog.CommitLog.recover(CommitLog.java:151)
   at 
 org.apache.cassandra.db.commitlog.CommitLog.recover(CommitLog.java:131)
   at 
 org.apache.cassandra.db.RecoveryManagerTest.testNothingToRecover(RecoveryManagerTest.java:42)
 Caused by: java.io.FileNotFoundException: 
 /var/lib/jenkins/jobs/cassandra-2.0_test/workspace/build/test/cassandra/commitlog/CommitLog-3-1398354429966.log
  (No such file or directory)
   at java.io.RandomAccessFile.open(Native Method)
   at java.io.RandomAccessFile.init(RandomAccessFile.java:241)
   at 
 org.apache.cassandra.io.util.RandomAccessReader.init(RandomAccessReader.java:58)
   at 
 org.apache.cassandra.io.util.RandomAccessReader.open(RandomAccessReader.java:98)
 {noformat}



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


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

2014-05-05 Thread jake
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/5c66dc81
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c66dc81
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c66dc81

Branch: refs/heads/trunk
Commit: 5c66dc819b72bea2cd4157648d13dadfe5ac2c31
Parents: 284d3f7 f0575f1
Author: T Jake Luciani j...@apache.org
Authored: Mon May 5 17:13:08 2014 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Mon May 5 17:13:08 2014 -0400

--
 CHANGES.txt  |   1 +
 build.properties.default |   1 +
 build.xml|   8 ++--
 lib/high-scale-lib-1.0.5.jar | Bin 0 - 104776 bytes
 lib/high-scale-lib-1.1.2.jar | Bin 96046 - 0 bytes
 5 files changed, 8 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c66dc81/build.xml
--



[1/2] git commit: high-scale-lib upgrade

2014-05-05 Thread jake
Repository: cassandra
Updated Branches:
  refs/heads/trunk 284d3f7fe - 5c66dc819


high-scale-lib upgrade

Patch by tjake; reviewed by Benedict Elliott Smith for CASSANDRA-7128


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

Branch: refs/heads/trunk
Commit: f0575f153b8f0b0caa56f56cc5e93ebd3f784b8e
Parents: 9881ea6
Author: T Jake Luciani j...@apache.org
Authored: Mon May 5 16:07:53 2014 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Mon May 5 16:37:22 2014 -0400

--
 CHANGES.txt  |   1 +
 build.properties.default |   1 +
 build.xml|   8 ++--
 lib/high-scale-lib-1.0.5.jar | Bin 0 - 104776 bytes
 lib/high-scale-lib-1.1.2.jar | Bin 96046 - 0 bytes
 5 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a8b6ae4..553f764 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@ Merged from 1.2:
  * Add Cloudstack snitch (CASSANDRA-7147)
  * Update system.peers correctly when relocating tokens (CASSANDRA-7126)
  * Add Google Compute Engine snitch (CASSANDRA-7132)
+ * Upgrade NBHM lib (CASSANDRA-7128) 
 
 2.1.0-beta2
  * Increase default CL space to 8GB (CASSANDRA-7031)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/build.properties.default
--
diff --git a/build.properties.default b/build.properties.default
index ff6aea0..be9b23b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -4,4 +4,5 @@ artifact.remoteRepository.java.net2:   
http://download.java.net/maven/2
 artifact.remoteRepository.apache:  
https://repository.apache.org/content/repositories/releases
 artifact.remoteRepository.jclouds: http://jclouds.googlecode.com/svn/repo
 artifact.remoteRepository.oauth:   
http://oauth.googlecode.com/svn/code/maven
+artifact.remoteRepository.boundary:   
http://maven.boundary.com/artifactory/external   
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/build.xml
--
diff --git a/build.xml b/build.xml
index 898b141..e8d9dd9 100644
--- a/build.xml
+++ b/build.xml
@@ -283,6 +283,7 @@
   artifact:remoteRepository id=central   
url=${artifact.remoteRepository.central}/
   artifact:remoteRepository id=java.net2 
url=${artifact.remoteRepository.java.net2}/
   artifact:remoteRepository id=apache
url=${artifact.remoteRepository.apache}/
+  artifact:remoteRepository id=boundary  
url=${artifact.remoteRepository.boundary}/
 
   macrodef name=install
 attribute name=pomFile/
@@ -361,7 +362,7 @@
 exclusion groupId=junit artifactId=junit/
   /dependency
   dependency groupId=com.googlecode.json-simple 
artifactId=json-simple version=1.1/
-  dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib version=1.1.2/
+  dependency groupId=com.boundary.high-scale-lib 
artifactId=high-scale-lib version=1.0.5/
   dependency groupId=com.github.jbellis artifactId=jamm 
version=0.2.6/
   dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.3
exclusion groupId=org.slf4j artifactId=slf4j-log4j12/
@@ -470,7 +471,7 @@
 dependency groupId=org.codehaus.jackson 
artifactId=jackson-mapper-asl/
 dependency groupId=jline artifactId=jline/
 dependency groupId=com.googlecode.json-simple 
artifactId=json-simple/
-dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib/
+dependency groupId=com.boundary.high-scale-lib 
artifactId=high-scale-lib/
 dependency groupId=org.yaml artifactId=snakeyaml/
 dependency groupId=org.mindrot artifactId=jbcrypt/
 dependency groupId=com.yammer.metrics artifactId=metrics-core/
@@ -542,6 +543,7 @@
   remoteRepository refid=central/
   remoteRepository refid=apache/
   remoteRepository refid=java.net2/
+  remoteRepository refid=boundary/
   /artifact:dependencies
   artifact:dependencies pomRefId=coverage-deps-pom
  pathId=cobertura.classpath
@@ -567,6 +569,7 @@
 remoteRepository refid=apache/
 remoteRepository refid=central/
 remoteRepository refid=oauth/
+remoteRepository refid=boundary/
   /artifact:dependencies
   copy todir=${test.lib}/jars
 fileset 

[jira] [Created] (CASSANDRA-7161) o.a.c.db.ColumnFamilyTest.testDigest failing in 2.1

2014-05-05 Thread Michael Shuler (JIRA)
Michael Shuler created CASSANDRA-7161:
-

 Summary: o.a.c.db.ColumnFamilyTest.testDigest failing in 2.1
 Key: CASSANDRA-7161
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7161
 Project: Cassandra
  Issue Type: Test
Reporter: Michael Shuler
Priority: Minor


bisecting...



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


[jira] [Assigned] (CASSANDRA-7161) o.a.c.db.ColumnFamilyTest.testDigest failing in 2.1

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler reassigned CASSANDRA-7161:
-

Assignee: Michael Shuler

 o.a.c.db.ColumnFamilyTest.testDigest failing in 2.1
 ---

 Key: CASSANDRA-7161
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7161
 Project: Cassandra
  Issue Type: Test
Reporter: Michael Shuler
Assignee: Michael Shuler
Priority: Minor
 Fix For: 2.1 rc1


 bisecting...



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


[jira] [Updated] (CASSANDRA-7161) o.a.c.db.ColumnFamilyTest.testDigest failing in 2.1

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler updated CASSANDRA-7161:
--

Assignee: (was: Michael Shuler)

 o.a.c.db.ColumnFamilyTest.testDigest failing in 2.1
 ---

 Key: CASSANDRA-7161
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7161
 Project: Cassandra
  Issue Type: Test
Reporter: Michael Shuler
Priority: Minor
 Fix For: 2.1 rc1


 bisecting...



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


[jira] [Commented] (CASSANDRA-7161) o.a.c.db.ColumnFamilyTest.testDigest failing in 2.1

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler commented on CASSANDRA-7161:
---

{{git bisect start cassandra-2.1 cassandra-2.0}} bisects to:
{noformat}
a2e74354ca51809a11b62dd7995c026807683b0a is the first bad commit
commit a2e74354ca51809a11b62dd7995c026807683b0a
Author: Jonathan Ellis jbel...@apache.org
Date:   Tue Apr 22 07:27:20 2014 -0500

Add range tombstones to read repair digests
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-6863

:100644 100644 ae7410e6c5ab539ced877c8e236126e7898e569c 
495dab2cbaab0ebe0bc711f1ee0c68025fec9ab8 M  CHANGES.txt
:04 04 22c9e9b1c226e01897f4752d447fbf45af683083 
0d7a223e155646591ac3aa060b13e0ee43bdee7f M  src
:04 04 299320d434ba87078e4e5c87ae06b0b16c743e86 
90ea01ff5601fe41e8ecfda9a26ec976d5ca670b M  test
{noformat}

 o.a.c.db.ColumnFamilyTest.testDigest failing in 2.1
 ---

 Key: CASSANDRA-7161
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7161
 Project: Cassandra
  Issue Type: Test
Reporter: Michael Shuler
Assignee: Michael Shuler
Priority: Minor
 Fix For: 2.1 rc1


 bisecting...



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


[jira] [Created] (CASSANDRA-7162) o.a.c.db.marshal.CollectionTypeTest.testMapComparison unit test failing in 2.1

2014-05-05 Thread Michael Shuler (JIRA)
Michael Shuler created CASSANDRA-7162:
-

 Summary: o.a.c.db.marshal.CollectionTypeTest.testMapComparison 
unit test failing in 2.1
 Key: CASSANDRA-7162
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7162
 Project: Cassandra
  Issue Type: Test
  Components: Tests
Reporter: Michael Shuler
Assignee: Michael Shuler
Priority: Minor
 Fix For: 2.1 rc1


bisecting..



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


[jira] [Commented] (CASSANDRA-7162) o.a.c.db.marshal.CollectionTypeTest unit test failing in 2.1

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler commented on CASSANDRA-7162:
---

{{git bisect start cassandra-2.1 cassandra-2.0}} bisects to:
{noformat}
9872b74ef20018e4e7645a8952fd7295e75764ad is the first bad commit
commit 9872b74ef20018e4e7645a8952fd7295e75764ad
Author: Sylvain Lebresne sylv...@datastax.com
Date:   Wed Mar 12 18:58:55 2014 +0100

Native protocol v3

patch by slebresne; reviewed by thobbs for CASSANDRA-6855

:100644 100644 64e5afb002f0adf705e53bfbf579b77615dc575c 
a4811f630ef0cfd56a391db1fc111d09250293ad M  CHANGES.txt
:100644 100644 d2b892e0c5845e6f3b21caebc23a033a09890447 
ba29b378e85561b59dabc78d51e1a1d48fd8ffc0 M  build.xml
:04 04 7b28eed1bc7cbfcc1f896b9e0944e8350847c9bb 
36cf9fdf2959fb5556a1972021fac2f3db94dbdc M  doc
:04 04 7b8a91cbcf79646676c526eeca4d279b51e902f4 
807a405f27a49933935fdd1e7d5b85994f6d7ece M  src
:04 04 38b2629b78fbfa8035918fc2be2fd734df61193d 
592d6e49e416ddd94b3d0b501b28b60304a568ff M  test
{noformat}

 o.a.c.db.marshal.CollectionTypeTest unit test failing in 2.1
 

 Key: CASSANDRA-7162
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7162
 Project: Cassandra
  Issue Type: Test
  Components: Tests
Reporter: Michael Shuler
Assignee: Michael Shuler
Priority: Minor
 Fix For: 2.1 rc1


 bisecting..



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


[jira] [Updated] (CASSANDRA-7162) o.a.c.db.marshal.CollectionTypeTest unit test failing in 2.1

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler updated CASSANDRA-7162:
--

Assignee: (was: Michael Shuler)

 o.a.c.db.marshal.CollectionTypeTest unit test failing in 2.1
 

 Key: CASSANDRA-7162
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7162
 Project: Cassandra
  Issue Type: Test
  Components: Tests
Reporter: Michael Shuler
Priority: Minor
 Fix For: 2.1 rc1


 bisecting..



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


[jira] [Updated] (CASSANDRA-7162) o.a.c.db.marshal.CollectionTypeTest unit test failing in 2.1

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler updated CASSANDRA-7162:
--

Summary: o.a.c.db.marshal.CollectionTypeTest unit test failing in 2.1  
(was: o.a.c.db.marshal.CollectionTypeTest.testMapComparison unit test failing 
in 2.1)

 o.a.c.db.marshal.CollectionTypeTest unit test failing in 2.1
 

 Key: CASSANDRA-7162
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7162
 Project: Cassandra
  Issue Type: Test
  Components: Tests
Reporter: Michael Shuler
Assignee: Michael Shuler
Priority: Minor
 Fix For: 2.1 rc1


 bisecting..



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


[jira] [Commented] (CASSANDRA-6861) Optimise our Netty 4 integration

2014-05-05 Thread Ryan McGuire (JIRA)

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

Ryan McGuire commented on CASSANDRA-6861:
-

http://riptano.github.io/cassandra_performance/graph_v3/graph.html?stats=stats.6861.json

I'm running this a second time to see if the downward spike in the read happens 
again...

 Optimise our Netty 4 integration
 

 Key: CASSANDRA-6861
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6861
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Benedict
Assignee: T Jake Luciani
Priority: Minor
  Labels: performance
 Fix For: 2.1 rc1


 Now we've upgraded to Netty 4, we're generating a lot of garbage that could 
 be avoided, so we should probably stop that. Should be reasonably easy to 
 hook into Netty's pooled buffers, returning them to the pool once a given 
 message is completed.



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


[jira] [Comment Edited] (CASSANDRA-6861) Optimise our Netty 4 integration

2014-05-05 Thread Ryan McGuire (JIRA)

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

Ryan McGuire edited comment on CASSANDRA-6861 at 5/5/14 10:12 PM:
--

http://riptano.github.io/cassandra_performance/graph_v3/graph.html?stats=stats.6861.json

Looks better overall, but I'm running this a second time to see if the downward 
spike in the read happens again...


was (Author: enigmacurry):
http://riptano.github.io/cassandra_performance/graph_v3/graph.html?stats=stats.6861.json

I'm running this a second time to see if the downward spike in the read happens 
again...

 Optimise our Netty 4 integration
 

 Key: CASSANDRA-6861
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6861
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Benedict
Assignee: T Jake Luciani
Priority: Minor
  Labels: performance
 Fix For: 2.1 rc1


 Now we've upgraded to Netty 4, we're generating a lot of garbage that could 
 be avoided, so we should probably stop that. Should be reasonably easy to 
 hook into Netty's pooled buffers, returning them to the pool once a given 
 message is completed.



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


[jira] [Created] (CASSANDRA-7163) dtests should reuse existing clusters where possible

2014-05-05 Thread Ryan McGuire (JIRA)
Ryan McGuire created CASSANDRA-7163:
---

 Summary: dtests should reuse existing clusters where possible
 Key: CASSANDRA-7163
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7163
 Project: Cassandra
  Issue Type: Bug
Reporter: Ryan McGuire
Assignee: Ryan McGuire
Priority: Minor


Many dtests don't require special setup, specifically the cql tests. We can 
reuse the clusters we setup across multiple tests to save time.

Suggestion: only share clusters across a single test suite, and don't share the 
cluster by default, turn it on per-class. If we share them more broadly than 
that we may get into weird states because some tests definitely do mess with 
the cluster setup.



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


[jira] [Updated] (CASSANDRA-7163) dtests should reuse existing clusters where possible

2014-05-05 Thread Ryan McGuire (JIRA)

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

Ryan McGuire updated CASSANDRA-7163:


Issue Type: Test  (was: Bug)

 dtests should reuse existing clusters where possible
 

 Key: CASSANDRA-7163
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7163
 Project: Cassandra
  Issue Type: Test
Reporter: Ryan McGuire
Assignee: Ryan McGuire
Priority: Minor

 Many dtests don't require special setup, specifically the cql tests. We can 
 reuse the clusters we setup across multiple tests to save time.
 Suggestion: only share clusters across a single test suite, and don't share 
 the cluster by default, turn it on per-class. If we share them more broadly 
 than that we may get into weird states because some tests definitely do mess 
 with the cluster setup.



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


[jira] [Updated] (CASSANDRA-5351) Avoid repairing already-repaired data by default

2014-05-05 Thread Shawn Kumar (JIRA)

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

Shawn Kumar updated CASSANDRA-5351:
---

Tester: Shawn Kumar

 Avoid repairing already-repaired data by default
 

 Key: CASSANDRA-5351
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5351
 Project: Cassandra
  Issue Type: Task
  Components: Core
Reporter: Jonathan Ellis
Assignee: Lyuben Todorov
  Labels: repair
 Fix For: 2.1 beta1

 Attachments: 0001-Incremental-repair-wip.patch, 
 0001-keep-repairedAt-time-when-scrubbing-and-no-bad-rows-.patch, 
 5351_node1.log, 5351_node2.log, 5351_node3.log, 5351_nodetool.log


 Repair has always built its merkle tree from all the data in a columnfamily, 
 which is guaranteed to work but is inefficient.
 We can improve this by remembering which sstables have already been 
 successfully repaired, and only repairing sstables new since the last repair. 
  (This automatically makes CASSANDRA-3362 much less of a problem too.)
 The tricky part is, compaction will (if not taught otherwise) mix repaired 
 data together with non-repaired.  So we should segregate unrepaired sstables 
 from the repaired ones.



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


[jira] [Commented] (CASSANDRA-6344) When running CQLSH with file input, exit with error status code if script fails

2014-05-05 Thread Mikhail Stepura (JIRA)

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

Mikhail Stepura commented on CASSANDRA-6344:


[~swong15]
Does it make sense to move {{self.error = True}} into 
{{bin.cqlsh.Shell#printerr()}} ? 

 When running CQLSH with file input, exit with error status code if script 
 fails
 ---

 Key: CASSANDRA-6344
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6344
 Project: Cassandra
  Issue Type: New Feature
  Components: Tools
Reporter: Branden Visser
  Labels: lhf
 Fix For: 1.2.17, 2.0.8, 2.1 rc1

 Attachments: CASSANDRA-6344.txt


 Just thought it would be nice if the cqlsh process would exit with an error 
 status code if there are errors in the script, since it is the only thing the 
 cqlsh process does when executing.
 Preferably a predictable status code could be used for a script error to 
 discern it from some other odd error (i.e., don't use `1` because that could 
 be many things). Maybe `2` or something.



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


[jira] [Commented] (CASSANDRA-6861) Optimise our Netty 4 integration

2014-05-05 Thread Ryan McGuire (JIRA)

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

Ryan McGuire commented on CASSANDRA-6861:
-

The read drop was a fluke, here's trial 2: 
http://riptano.github.io/cassandra_performance/graph_v3/graph.html?stats=stats.6861.2.json

This was a comparison of f0575f153b8 from 2.1 HEAD and your branch' 784db2fde2.

I can re-run this against your rebase 4b6b819a53.

 Optimise our Netty 4 integration
 

 Key: CASSANDRA-6861
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6861
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Benedict
Assignee: T Jake Luciani
Priority: Minor
  Labels: performance
 Fix For: 2.1 rc1


 Now we've upgraded to Netty 4, we're generating a lot of garbage that could 
 be avoided, so we should probably stop that. Should be reasonably easy to 
 hook into Netty's pooled buffers, returning them to the pool once a given 
 message is completed.



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


[jira] [Created] (CASSANDRA-7164) o.a.c..service.RemoveTest unit test failing in 2.1

2014-05-05 Thread Michael Shuler (JIRA)
Michael Shuler created CASSANDRA-7164:
-

 Summary: o.a.c..service.RemoveTest unit test failing in 2.1
 Key: CASSANDRA-7164
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7164
 Project: Cassandra
  Issue Type: Test
  Components: Tests
Reporter: Michael Shuler
Assignee: Michael Shuler
Priority: Minor
 Fix For: 2.1 rc1


bisecting..



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


[jira] [Created] (CASSANDRA-7165) o.a.c.streaming.StreamingTransferTest unit test failing in 2.1

2014-05-05 Thread Michael Shuler (JIRA)
Michael Shuler created CASSANDRA-7165:
-

 Summary: o.a.c.streaming.StreamingTransferTest unit test failing 
in 2.1
 Key: CASSANDRA-7165
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7165
 Project: Cassandra
  Issue Type: Test
  Components: Tests
Reporter: Michael Shuler
Assignee: Michael Shuler
Priority: Minor
 Fix For: 2.1 rc1


having trouble bisecting this one, due to junit timeouts..



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


[jira] [Created] (CASSANDRA-7166) o.a.c.triggers.TriggersSchemaTest unit test fails intermittently in 2.1

2014-05-05 Thread Michael Shuler (JIRA)
Michael Shuler created CASSANDRA-7166:
-

 Summary: o.a.c.triggers.TriggersSchemaTest unit test fails 
intermittently in 2.1
 Key: CASSANDRA-7166
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7166
 Project: Cassandra
  Issue Type: Test
  Components: Tests
Reporter: Michael Shuler
Assignee: Michael Shuler
Priority: Minor
 Fix For: 2.1 rc1


bisecting..



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


[jira] [Created] (CASSANDRA-7167) o.a.c.db.KeyCacheTest unit test failing intermittently in 2.1

2014-05-05 Thread Michael Shuler (JIRA)
Michael Shuler created CASSANDRA-7167:
-

 Summary: o.a.c.db.KeyCacheTest unit test failing intermittently in 
2.1
 Key: CASSANDRA-7167
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7167
 Project: Cassandra
  Issue Type: Test
  Components: Tests
Reporter: Michael Shuler
Assignee: Michael Shuler
Priority: Minor
 Fix For: 2.1 rc1


bisecting..



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


[jira] [Updated] (CASSANDRA-7164) o.a.c.service.RemoveTest unit test failing in 2.1

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler updated CASSANDRA-7164:
--

Summary: o.a.c.service.RemoveTest unit test failing in 2.1  (was: 
o.a.c..service.RemoveTest unit test failing in 2.1)

 o.a.c.service.RemoveTest unit test failing in 2.1
 -

 Key: CASSANDRA-7164
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7164
 Project: Cassandra
  Issue Type: Test
  Components: Tests
Reporter: Michael Shuler
Priority: Minor
 Fix For: 2.1 rc1


 bisecting..



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


[jira] [Commented] (CASSANDRA-6861) Optimise our Netty 4 integration

2014-05-05 Thread Ryan McGuire (JIRA)

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

Ryan McGuire commented on CASSANDRA-6861:
-

compares f0575f153b to 4b6b819a5322 :

riptano.github.io/cassandra_performance/graph_v3/graph.html?stats=stats.6861.3.json

 Optimise our Netty 4 integration
 

 Key: CASSANDRA-6861
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6861
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Benedict
Assignee: T Jake Luciani
Priority: Minor
  Labels: performance
 Fix For: 2.1 rc1


 Now we've upgraded to Netty 4, we're generating a lot of garbage that could 
 be avoided, so we should probably stop that. Should be reasonably easy to 
 hook into Netty's pooled buffers, returning them to the pool once a given 
 message is completed.



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


[jira] [Comment Edited] (CASSANDRA-6861) Optimise our Netty 4 integration

2014-05-05 Thread Ryan McGuire (JIRA)

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

Ryan McGuire edited comment on CASSANDRA-6861 at 5/6/14 12:44 AM:
--

compares f0575f153b to 4b6b819a5322 :

http://riptano.github.io/cassandra_performance/graph_v3/graph.html?stats=stats.6861.3.json


was (Author: enigmacurry):
compares f0575f153b to 4b6b819a5322 :

riptano.github.io/cassandra_performance/graph_v3/graph.html?stats=stats.6861.3.json

 Optimise our Netty 4 integration
 

 Key: CASSANDRA-6861
 URL: https://issues.apache.org/jira/browse/CASSANDRA-6861
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Benedict
Assignee: T Jake Luciani
Priority: Minor
  Labels: performance
 Fix For: 2.1 rc1


 Now we've upgraded to Netty 4, we're generating a lot of garbage that could 
 be avoided, so we should probably stop that. Should be reasonably easy to 
 hook into Netty's pooled buffers, returning them to the pool once a given 
 message is completed.



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


[jira] [Updated] (CASSANDRA-7002) concurrent_schema_changes_test snapshot_test dtest needs to account for hashed data dirs in 2.1

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler updated CASSANDRA-7002:
--

Labels: qa-resolved  (was: )

 concurrent_schema_changes_test snapshot_test dtest needs to account for 
 hashed data dirs in 2.1
 ---

 Key: CASSANDRA-7002
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7002
 Project: Cassandra
  Issue Type: Test
  Components: Tests
Reporter: Michael Shuler
Assignee: Brandon Williams
Priority: Blocker
  Labels: qa-resolved
 Fix For: 2.1 beta2


 {noformat}
 ==
 ERROR: snapshot_test 
 (concurrent_schema_changes_test.TestConcurrentSchemaChanges)
 --
 Traceback (most recent call last):
   File /home/mshuler/git/cassandra-dtest/concurrent_schema_changes_test.py, 
 line 299, in snapshot_test
 for f in os.listdir(dirr):
 OSError: [Errno 2] No such file or directory: 
 '/tmp/dtest-VZwotc/test/node1/data/ks_ns2/cf_ns2'
 {noformat}



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


  1   2   >