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

2014-05-05 Thread Dave Brosius (JIRA)

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

Dave Brosius commented on CASSANDRA-7128:
-

settings.xml, needed to build from pom

{code}
http://maven.apache.org/SETTINGS/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
  http://maven.apache.org/xsd/settings-1.0.0.xsd";>



Default

true



boundary
Boundary

true


true


http://maven.boundary.com/artifactory/external/
default





{code}

> 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)


[1/2] git commit: fix group id (com.boundary) for high-scale-lib

2014-05-05 Thread dbrosius
Repository: cassandra
Updated Branches:
  refs/heads/trunk 8f5c90382 -> 754643c5e


fix group id (com.boundary) for high-scale-lib


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

Branch: refs/heads/trunk
Commit: aa3c10dd0c056da867f8f38f7a9799807ab9d199
Parents: 8f5c16c
Author: Dave Brosius 
Authored: Tue May 6 01:36:53 2014 -0400
Committer: Dave Brosius 
Committed: Tue May 6 01:36:53 2014 -0400

--
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa3c10dd/build.xml
--
diff --git a/build.xml b/build.xml
index e8d9dd9..fe3d970 100644
--- a/build.xml
+++ b/build.xml
@@ -362,7 +362,7 @@
 
   
   
-  
+  
   
   

@@ -471,7 +471,7 @@
 
 
 
-
+
 
 
 



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

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

Branch: refs/heads/trunk
Commit: 754643c5e4368d34102d0cd30def6571f1eddc2f
Parents: 8f5c903 aa3c10d
Author: Dave Brosius 
Authored: Tue May 6 01:37:15 2014 -0400
Committer: Dave Brosius 
Committed: Tue May 6 01:37:15 2014 -0400

--
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


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



git commit: fix group id (com.boundary) for high-scale-lib

2014-05-05 Thread dbrosius
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 8f5c16c49 -> aa3c10dd0


fix group id (com.boundary) for high-scale-lib


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

Branch: refs/heads/cassandra-2.1
Commit: aa3c10dd0c056da867f8f38f7a9799807ab9d199
Parents: 8f5c16c
Author: Dave Brosius 
Authored: Tue May 6 01:36:53 2014 -0400
Committer: Dave Brosius 
Committed: Tue May 6 01:36:53 2014 -0400

--
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa3c10dd/build.xml
--
diff --git a/build.xml b/build.xml
index e8d9dd9..fe3d970 100644
--- a/build.xml
+++ b/build.xml
@@ -362,7 +362,7 @@
 
   
   
-  
+  
   
   

@@ -471,7 +471,7 @@
 
 
 
-
+
 
 
 



[jira] [Comment Edited] (CASSANDRA-7128) Upgrade NBHM

2014-05-05 Thread Dave Brosius (JIRA)

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

Dave Brosius edited comment on CASSANDRA-7128 at 5/6/14 5:00 AM:
-

This patch converts high-scale-lib.jar to one fetched with a maven groupId of 
com.boundary.high-scale-lib

Unfortunately this version of the jar is not available on maven central, but 
only on http://maven.boundary.com/artifactory/repo

What this means is if people now try to build from the pom it will fail. 

try:
ant publish 

mvn -f 
~/.m2/repository/org/apache/cassandra/cassandra-all/2.1.0-beta2-SNAPSHOT/cassandra-all-2.1.0-beta2-SNAPSHOT.pom
 dependency:tree

to see the problem.

The solution is to either

1) add this repo to the published pom
or
2) have users who want to build from the pom add the url to their settings.xml 
file

The first one is easier for users, but is discouraged, the second one is more 
complicated for users, unless they understand what's going on.

If we do 2) we should at least document somewhere what needs doing.

re-opening, just so we can choose one way or another.


--

of course, really ideally is just to get the boundary folks to just publish to 
maven central like every other fool on the planet.


was (Author: dbrosius):
This patch converts high-scale-lib.jar to one fetched with a maven groupId of 
com.boundary.high-scale-lib

Unfortunately this version of the jar is not available on maven central, but 
only on http://maven.boundary.com/artifactory/repo

What this means if people now try to build from the pom it will fail. 

try:

mvn -f 
~/.m2/repository/org/apache/cassandra/cassandra-all/2.1.0-beta2-SNAPSHOT/cassandra-all-2.1.0-beta2-SNAPSHOT.pom
 dependency:tree

to see the problem.

The solution is to either

1) add this repo to the published pom
or
2) have users who want to build from the pom add the url to their settings.xml 
file

The first one is easier for users, but is discouraged, the second one is more 
complicated for users, unless they understand what's going on.

If we do 2) we should at least document somewhere what needs doing.

re-opening, just so we can choose one way or another.


--

of course, really ideally is just to get the boundary folks to just publish to 
maven central like every other fool on the planet.

> 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] [Comment Edited] (CASSANDRA-7128) Upgrade NBHM

2014-05-05 Thread Dave Brosius (JIRA)

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

Dave Brosius edited comment on CASSANDRA-7128 at 5/6/14 4:59 AM:
-

This patch converts high-scale-lib.jar to one fetched with a maven groupId of 
com.boundary.high-scale-lib

Unfortunately this version of the jar is not available on maven central, but 
only on http://maven.boundary.com/artifactory/repo

What this means if people now try to build from the pom it will fail. 

try:

mvn -f 
~/.m2/repository/org/apache/cassandra/cassandra-all/2.1.0-beta2-SNAPSHOT/cassandra-all-2.1.0-beta2-SNAPSHOT.pom
 dependency:tree

to see the problem.

The solution is to either

1) add this repo to the published pom
or
2) have users who want to build from the pom add the url to their settings.xml 
file

The first one is easier for users, but is discouraged, the second one is more 
complicated for users, unless they understand what's going on.

If we do 2) we should at least document somewhere what needs doing.

re-opening, just so we can choose one way or another.


--

of course, really ideally is just to get the boundary folks to just publish to 
maven central like every other fool on the planet.


was (Author: dbrosius):
This patch converts high-scale-lib.jar to one fetched with a maven groupId of 
com.boundary.high-scale-lib

Unfortunately this version of the jar is not available on maven central, but 
only on http://maven.boundary.com/artifactory/repo

What this means if people now try to build from the pom it will fail. 

try:

mvn -f 
~/.m2/repository/org/apache/cassandra/cassandra-all/2.1.0-beta2-SNAPSHOT/cassandra-all-2.1.0-beta2-SNAPSHOT.pom
 dependency:tree

to see the problem.

The solution is to either

1) add this repo to the published pom
or
2) have users who want to build from the pom add the url to their settings.xml 
file

The first one is easier for users, but is discouraged, the second one is more 
complicated for users, unless they understand what's going on.

If we do 2) we should at least document somewhere what needs doing.

re-opening, just so we can choose one way or another.

> 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 Dave Brosius (JIRA)

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

Dave Brosius commented on CASSANDRA-7128:
-

This patch converts high-scale-lib.jar to one fetched with a maven groupId of 
com.boundary.high-scale-lib

Unfortunately this version of the jar is not available on maven central, but 
only on http://maven.boundary.com/artifactory/repo

What this means if people now try to build from the pom it will fail. 

try:

mvn -f 
~/.m2/repository/org/apache/cassandra/cassandra-all/2.1.0-beta2-SNAPSHOT/cassandra-all-2.1.0-beta2-SNAPSHOT.pom
 dependency:tree

to see the problem.

The solution is to either

1) add this repo to the published pom
or
2) have users who want to build from the pom add the url to their settings.xml 
file

The first one is easier for users, but is discouraged, the second one is more 
complicated for users, unless they understand what's going on.

If we do 2) we should at least document somewhere what needs doing.

re-opening, just so we can choose one way or another.

> 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-7122) Replacement nodes have null entries in system.peers

2014-05-05 Thread Richard Low (JIRA)

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

Richard Low commented on CASSANDRA-7122:


CASSANDRA-7126 patch doesn't seem to work - it looks like it is just writing 
the token(s) to the peers table rather than the rest of the entries.

> Replacement nodes have null entries in system.peers
> ---
>
> Key: CASSANDRA-7122
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7122
> Project: Cassandra
>  Issue Type: Bug
>Reporter: Richard Low
>
> If a node is replaced with -Dcassandra.replace_address, the new node has 
> mostly null entries in system.peers:
> {code}
> > select * from system.peers;
>  peer  | data_center | host_id | rack | release_version | rpc_address | 
> schema_version | tokens
> ---+-+-+--+-+-++--
>  127.0.0.3 |null |null | null |null |null |   
> null | {'-3074457345618258602'}
> {code}
> To reproduce, simply kill a node and replace it. The entries are correctly 
> populated if the replacement node is restarted but they are never populated 
> if it isn't.
> I can think of at least two bad consequences of this:
> 1. Drivers like Datastax java-driver use the peers table to find the 
> rpc_address and location info of a node. If the entires are null it assumes 
> rpc_address=ip and the node is in the local DC.
> 2. When using GossipingPropertyFileSnitch and node won't persist the DC/rack 
> of another node so may not be able to locate it during restarts.
> I reproduced in 1.2.15 but from inspection it looks to be present in 1.2.16 
> and 2.0.7.



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


[1/3] git commit: fix error msg loading rackdc properties when system property is specified

2014-05-05 Thread dbrosius
Repository: cassandra
Updated Branches:
  refs/heads/trunk 011f90e99 -> 8f5c90382


fix error msg loading rackdc properties when system property is specified


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

Branch: refs/heads/trunk
Commit: 69e65be8d77716c4ddf318d63f180aceb2393133
Parents: 4791d98
Author: Dave Brosius 
Authored: Tue May 6 00:13:32 2014 -0400
Committer: Dave Brosius 
Committed: Tue May 6 00:13:32 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/69e65be8/src/java/org/apache/cassandra/locator/SnitchProperties.java
--
diff --git a/src/java/org/apache/cassandra/locator/SnitchProperties.java 
b/src/java/org/apache/cassandra/locator/SnitchProperties.java
index 36fec7f..cb0946a 100644
--- a/src/java/org/apache/cassandra/locator/SnitchProperties.java
+++ b/src/java/org/apache/cassandra/locator/SnitchProperties.java
@@ -50,7 +50,7 @@ public class SnitchProperties
 catch (Exception e)
 {
 // do not throw exception here, just consider this an incomplete 
or an empty property file.
-logger.warn("Unable to read " + RACKDC_PROPERTY_FILENAME);
+logger.warn("Unable to read {}", ((configURL != null) ? configURL 
: RACKDC_PROPERTY_FILENAME));
 }
 finally
 {



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

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

Branch: refs/heads/trunk
Commit: 8f5c9038287ce4bb9d4c9872bbf568895b9f1070
Parents: 011f90e 8f5c16c
Author: Dave Brosius 
Authored: Tue May 6 00:16:05 2014 -0400
Committer: Dave Brosius 
Committed: Tue May 6 00:16:05 2014 -0400

--
 src/java/org/apache/cassandra/locator/SnitchProperties.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--




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

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

Branch: refs/heads/trunk
Commit: 8f5c16c499e51efd0d1f26480beb944ed1ed6c70
Parents: ac63e18 69e65be
Author: Dave Brosius 
Authored: Tue May 6 00:15:37 2014 -0400
Committer: Dave Brosius 
Committed: Tue May 6 00:15:37 2014 -0400

--
 src/java/org/apache/cassandra/locator/SnitchProperties.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f5c16c4/src/java/org/apache/cassandra/locator/SnitchProperties.java
--



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

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

Branch: refs/heads/cassandra-2.1
Commit: 8f5c16c499e51efd0d1f26480beb944ed1ed6c70
Parents: ac63e18 69e65be
Author: Dave Brosius 
Authored: Tue May 6 00:15:37 2014 -0400
Committer: Dave Brosius 
Committed: Tue May 6 00:15:37 2014 -0400

--
 src/java/org/apache/cassandra/locator/SnitchProperties.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f5c16c4/src/java/org/apache/cassandra/locator/SnitchProperties.java
--



[1/2] git commit: fix error msg loading rackdc properties when system property is specified

2014-05-05 Thread dbrosius
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 ac63e180a -> 8f5c16c49


fix error msg loading rackdc properties when system property is specified


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

Branch: refs/heads/cassandra-2.1
Commit: 69e65be8d77716c4ddf318d63f180aceb2393133
Parents: 4791d98
Author: Dave Brosius 
Authored: Tue May 6 00:13:32 2014 -0400
Committer: Dave Brosius 
Committed: Tue May 6 00:13:32 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/69e65be8/src/java/org/apache/cassandra/locator/SnitchProperties.java
--
diff --git a/src/java/org/apache/cassandra/locator/SnitchProperties.java 
b/src/java/org/apache/cassandra/locator/SnitchProperties.java
index 36fec7f..cb0946a 100644
--- a/src/java/org/apache/cassandra/locator/SnitchProperties.java
+++ b/src/java/org/apache/cassandra/locator/SnitchProperties.java
@@ -50,7 +50,7 @@ public class SnitchProperties
 catch (Exception e)
 {
 // do not throw exception here, just consider this an incomplete 
or an empty property file.
-logger.warn("Unable to read " + RACKDC_PROPERTY_FILENAME);
+logger.warn("Unable to read {}", ((configURL != null) ? configURL 
: RACKDC_PROPERTY_FILENAME));
 }
 finally
 {



git commit: fix error msg loading rackdc properties when system property is specified

2014-05-05 Thread dbrosius
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 4791d9814 -> 69e65be8d


fix error msg loading rackdc properties when system property is specified


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

Branch: refs/heads/cassandra-2.0
Commit: 69e65be8d77716c4ddf318d63f180aceb2393133
Parents: 4791d98
Author: Dave Brosius 
Authored: Tue May 6 00:13:32 2014 -0400
Committer: Dave Brosius 
Committed: Tue May 6 00:13:32 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/69e65be8/src/java/org/apache/cassandra/locator/SnitchProperties.java
--
diff --git a/src/java/org/apache/cassandra/locator/SnitchProperties.java 
b/src/java/org/apache/cassandra/locator/SnitchProperties.java
index 36fec7f..cb0946a 100644
--- a/src/java/org/apache/cassandra/locator/SnitchProperties.java
+++ b/src/java/org/apache/cassandra/locator/SnitchProperties.java
@@ -50,7 +50,7 @@ public class SnitchProperties
 catch (Exception e)
 {
 // do not throw exception here, just consider this an incomplete 
or an empty property file.
-logger.warn("Unable to read " + RACKDC_PROPERTY_FILENAME);
+logger.warn("Unable to read {}", ((configURL != null) ? configURL 
: RACKDC_PROPERTY_FILENAME));
 }
 finally
 {



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

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

Branch: refs/heads/trunk
Commit: 011f90e9921d221842c2543f9eae6c91979734ed
Parents: 5c66dc8 ac63e18
Author: Dave Brosius 
Authored: Mon May 5 23:46:30 2014 -0400
Committer: Dave Brosius 
Committed: Mon May 5 23:46:30 2014 -0400

--
 src/java/org/apache/cassandra/db/BatchlogManager.java | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--




[1/3] git commit: reduce garbage in BatchlogManager.replayMutations

2014-05-05 Thread dbrosius
Repository: cassandra
Updated Branches:
  refs/heads/trunk 5c66dc819 -> 011f90e99


reduce garbage in BatchlogManager.replayMutations

patch by dbrosius reviewed by jbellis for cassandra-7169


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

Branch: refs/heads/trunk
Commit: 4791d9814d97c6bc373b5b126774e4d1381732a6
Parents: f524570
Author: Dave Brosius 
Authored: Mon May 5 23:36:20 2014 -0400
Committer: Dave Brosius 
Committed: Mon May 5 23:37:20 2014 -0400

--
 src/java/org/apache/cassandra/db/BatchlogManager.java | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4791d981/src/java/org/apache/cassandra/db/BatchlogManager.java
--
diff --git a/src/java/org/apache/cassandra/db/BatchlogManager.java 
b/src/java/org/apache/cassandra/db/BatchlogManager.java
index 5aea736..b92c217 100644
--- a/src/java/org/apache/cassandra/db/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/db/BatchlogManager.java
@@ -278,11 +278,11 @@ public class BatchlogManager implements 
BatchlogManagerMBean
 if (ttl <= 0)
 return; // this batchlog entry has 'expired'
 
+List liveEndpoints = new ArrayList<>();
+List hintEndpoints = new ArrayList<>();
+
 for (RowMutation mutation : mutations)
 {
-List liveEndpoints = new ArrayList<>();
-List hintEndpoints = new ArrayList<>();
-
 String ks = mutation.getKeyspaceName();
 Token tk = 
StorageService.getPartitioner().getToken(mutation.key());
 int mutationSize = (int) 
RowMutation.serializer.serializedSize(mutation, version);
@@ -304,6 +304,9 @@ public class BatchlogManager implements BatchlogManagerMBean
 
 for (InetAddress endpoint : hintEndpoints)
 StorageProxy.writeHintForMutation(mutation, writtenAt, ttl, 
endpoint);
+
+liveEndpoints.clear();
+hintEndpoints.clear();
 }
 }
 



[1/2] git commit: reduce garbage in BatchlogManager.replayMutations

2014-05-05 Thread dbrosius
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 f0575f153 -> ac63e180a


reduce garbage in BatchlogManager.replayMutations

patch by dbrosius reviewed by jbellis for cassandra-7169


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

Branch: refs/heads/cassandra-2.1
Commit: 4791d9814d97c6bc373b5b126774e4d1381732a6
Parents: f524570
Author: Dave Brosius 
Authored: Mon May 5 23:36:20 2014 -0400
Committer: Dave Brosius 
Committed: Mon May 5 23:37:20 2014 -0400

--
 src/java/org/apache/cassandra/db/BatchlogManager.java | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4791d981/src/java/org/apache/cassandra/db/BatchlogManager.java
--
diff --git a/src/java/org/apache/cassandra/db/BatchlogManager.java 
b/src/java/org/apache/cassandra/db/BatchlogManager.java
index 5aea736..b92c217 100644
--- a/src/java/org/apache/cassandra/db/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/db/BatchlogManager.java
@@ -278,11 +278,11 @@ public class BatchlogManager implements 
BatchlogManagerMBean
 if (ttl <= 0)
 return; // this batchlog entry has 'expired'
 
+List liveEndpoints = new ArrayList<>();
+List hintEndpoints = new ArrayList<>();
+
 for (RowMutation mutation : mutations)
 {
-List liveEndpoints = new ArrayList<>();
-List hintEndpoints = new ArrayList<>();
-
 String ks = mutation.getKeyspaceName();
 Token tk = 
StorageService.getPartitioner().getToken(mutation.key());
 int mutationSize = (int) 
RowMutation.serializer.serializedSize(mutation, version);
@@ -304,6 +304,9 @@ public class BatchlogManager implements BatchlogManagerMBean
 
 for (InetAddress endpoint : hintEndpoints)
 StorageProxy.writeHintForMutation(mutation, writtenAt, ttl, 
endpoint);
+
+liveEndpoints.clear();
+hintEndpoints.clear();
 }
 }
 



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

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

Branch: refs/heads/cassandra-2.1
Commit: ac63e180a50071bed398c82713452ccfe5c4237d
Parents: f0575f1 4791d98
Author: Dave Brosius 
Authored: Mon May 5 23:45:53 2014 -0400
Committer: Dave Brosius 
Committed: Mon May 5 23:45:53 2014 -0400

--
 src/java/org/apache/cassandra/db/BatchlogManager.java | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac63e180/src/java/org/apache/cassandra/db/BatchlogManager.java
--
diff --cc src/java/org/apache/cassandra/db/BatchlogManager.java
index de51c8d,b92c217..3ffc7a7
--- a/src/java/org/apache/cassandra/db/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/db/BatchlogManager.java
@@@ -271,14 -278,14 +271,14 @@@ public class BatchlogManager implement
  if (ttl <= 0)
  return; // this batchlog entry has 'expired'
  
+ List liveEndpoints = new ArrayList<>();
+ List hintEndpoints = new ArrayList<>();
+ 
 -for (RowMutation mutation : mutations)
 +for (Mutation mutation : mutations)
  {
- List liveEndpoints = new ArrayList<>();
- List hintEndpoints = new ArrayList<>();
- 
  String ks = mutation.getKeyspaceName();
  Token tk = 
StorageService.getPartitioner().getToken(mutation.key());
 -int mutationSize = (int) 
RowMutation.serializer.serializedSize(mutation, version);
 +int mutationSize = (int) 
Mutation.serializer.serializedSize(mutation, version);
  
  for (InetAddress endpoint : 
Iterables.concat(StorageService.instance.getNaturalEndpoints(ks, tk),
   
StorageService.instance.getTokenMetadata().pendingEndpointsFor(tk, ks)))



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

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

Branch: refs/heads/trunk
Commit: ac63e180a50071bed398c82713452ccfe5c4237d
Parents: f0575f1 4791d98
Author: Dave Brosius 
Authored: Mon May 5 23:45:53 2014 -0400
Committer: Dave Brosius 
Committed: Mon May 5 23:45:53 2014 -0400

--
 src/java/org/apache/cassandra/db/BatchlogManager.java | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac63e180/src/java/org/apache/cassandra/db/BatchlogManager.java
--
diff --cc src/java/org/apache/cassandra/db/BatchlogManager.java
index de51c8d,b92c217..3ffc7a7
--- a/src/java/org/apache/cassandra/db/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/db/BatchlogManager.java
@@@ -271,14 -278,14 +271,14 @@@ public class BatchlogManager implement
  if (ttl <= 0)
  return; // this batchlog entry has 'expired'
  
+ List liveEndpoints = new ArrayList<>();
+ List hintEndpoints = new ArrayList<>();
+ 
 -for (RowMutation mutation : mutations)
 +for (Mutation mutation : mutations)
  {
- List liveEndpoints = new ArrayList<>();
- List hintEndpoints = new ArrayList<>();
- 
  String ks = mutation.getKeyspaceName();
  Token tk = 
StorageService.getPartitioner().getToken(mutation.key());
 -int mutationSize = (int) 
RowMutation.serializer.serializedSize(mutation, version);
 +int mutationSize = (int) 
Mutation.serializer.serializedSize(mutation, version);
  
  for (InetAddress endpoint : 
Iterables.concat(StorageService.instance.getNaturalEndpoints(ks, tk),
   
StorageService.instance.getTokenMetadata().pendingEndpointsFor(tk, ks)))



git commit: reduce garbage in BatchlogManager.replayMutations

2014-05-05 Thread dbrosius
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 f52457036 -> 4791d9814


reduce garbage in BatchlogManager.replayMutations

patch by dbrosius reviewed by jbellis for cassandra-7169


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

Branch: refs/heads/cassandra-2.0
Commit: 4791d9814d97c6bc373b5b126774e4d1381732a6
Parents: f524570
Author: Dave Brosius 
Authored: Mon May 5 23:36:20 2014 -0400
Committer: Dave Brosius 
Committed: Mon May 5 23:37:20 2014 -0400

--
 src/java/org/apache/cassandra/db/BatchlogManager.java | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4791d981/src/java/org/apache/cassandra/db/BatchlogManager.java
--
diff --git a/src/java/org/apache/cassandra/db/BatchlogManager.java 
b/src/java/org/apache/cassandra/db/BatchlogManager.java
index 5aea736..b92c217 100644
--- a/src/java/org/apache/cassandra/db/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/db/BatchlogManager.java
@@ -278,11 +278,11 @@ public class BatchlogManager implements 
BatchlogManagerMBean
 if (ttl <= 0)
 return; // this batchlog entry has 'expired'
 
+List liveEndpoints = new ArrayList<>();
+List hintEndpoints = new ArrayList<>();
+
 for (RowMutation mutation : mutations)
 {
-List liveEndpoints = new ArrayList<>();
-List hintEndpoints = new ArrayList<>();
-
 String ks = mutation.getKeyspaceName();
 Token tk = 
StorageService.getPartitioner().getToken(mutation.key());
 int mutationSize = (int) 
RowMutation.serializer.serializedSize(mutation, version);
@@ -304,6 +304,9 @@ public class BatchlogManager implements BatchlogManagerMBean
 
 for (InetAddress endpoint : hintEndpoints)
 StorageProxy.writeHintForMutation(mutation, writtenAt, ttl, 
endpoint);
+
+liveEndpoints.clear();
+hintEndpoints.clear();
 }
 }
 



[jira] [Updated] (CASSANDRA-7169) reduce garbage in BatchlogManager.replayMutations

2014-05-05 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-7169:
--

Reviewer: Jonathan Ellis  (was: Benedict)

+1

> reduce garbage in BatchlogManager.replayMutations
> -
>
> Key: CASSANDRA-7169
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7169
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Core
>Reporter: Dave Brosius
>Assignee: Dave Brosius
>Priority: Minor
> Fix For: 2.0.8
>
> Attachments: 7169.txt
>
>
> reuse liveEndpoints/hintEndpoints map instead of generating a two new maps 
> for every mutation.
> hintEndpoints is obviously reusable, and liveEndpoints is too, even tho it 
> escapes to attemptDirectDelivery
> against 2.0



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


[jira] [Commented] (CASSANDRA-7168) Add repair aware consistency levels

2014-05-05 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-7168:
---

Clever idea, but you have correctness issues if you overlap with completing 
repairs: replica A serves up repaired data that doesn't include the most recent 
value, replicas B and C finish repair in time and so they don't serve up the 
most recent value either since they are only asked for un-repaired.

Just read at ONE and save yourself the trouble.

> Add repair aware consistency levels
> ---
>
> Key: CASSANDRA-7168
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7168
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Core
>Reporter: T Jake Luciani
>  Labels: performance
> Fix For: 3.0
>
>
> With CASSANDRA-5351 and CASSANDRA-2424 I think there is an opportunity to 
> avoid a lot of extra work when running queries with higher consistency 
> levels.  
> Since repaired data is by definition consistent and we know which sstables 
> are repaired, we can optimize the read path by having a REPAIRED_QUORUM which 
> breaks reads into two phases:
>  
>   1) Read from one replica the result from the repaired sstables. 
>   2) Read from a quorum only the un-repaired data.
> For the node performing 1) we can pipeline the call so it's a single hop.
> In the long run (assuming data is repaired regularly) we will end up with 
> much closer to CL.ONE performance while maintaining consistency.
> Some things to figure out:
>   - If repairs fail on some nodes we can have a situation where we don't have 
> a consistent repaired state across the replicas.  
>   



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


[jira] [Updated] (CASSANDRA-7169) reduce garbage in BatchlogManager.replayMutations

2014-05-05 Thread Brandon Williams (JIRA)

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

Brandon Williams updated CASSANDRA-7169:


Reviewer: Benedict

> reduce garbage in BatchlogManager.replayMutations
> -
>
> Key: CASSANDRA-7169
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7169
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Core
>Reporter: Dave Brosius
>Assignee: Dave Brosius
>Priority: Minor
> Fix For: 2.0.8
>
> Attachments: 7169.txt
>
>
> reuse liveEndpoints/hintEndpoints map instead of generating a two new maps 
> for every mutation.
> hintEndpoints is obviously reusable, and liveEndpoints is too, even tho it 
> escapes to attemptDirectDelivery
> against 2.0



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


[jira] [Updated] (CASSANDRA-7169) reduce garbage in BatchlogManager.replayMutations

2014-05-05 Thread Dave Brosius (JIRA)

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

Dave Brosius updated CASSANDRA-7169:


Attachment: 7169.txt

> reduce garbage in BatchlogManager.replayMutations
> -
>
> Key: CASSANDRA-7169
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7169
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Core
>Reporter: Dave Brosius
>Assignee: Dave Brosius
>Priority: Minor
> Fix For: 2.0.8
>
> Attachments: 7169.txt
>
>
> reuse liveEndpoints/hintEndpoints map instead of generating a two new maps 
> for every mutation.
> hintEndpoints is obviously reusable, and liveEndpoints is too, even tho it 
> escapes to attemptDirectDelivery
> against 2.0



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


[jira] [Created] (CASSANDRA-7169) reduce garbage in BatchlogManager.replayMutations

2014-05-05 Thread Dave Brosius (JIRA)
Dave Brosius created CASSANDRA-7169:
---

 Summary: reduce garbage in BatchlogManager.replayMutations
 Key: CASSANDRA-7169
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7169
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Dave Brosius
Assignee: Dave Brosius
Priority: Minor
 Fix For: 2.0.8


reuse liveEndpoints/hintEndpoints map instead of generating a two new maps for 
every mutation.

hintEndpoints is obviously reusable, and liveEndpoints is too, even tho it 
escapes to attemptDirectDelivery


against 2.0



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


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

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler commented on CASSANDRA-7166:
---

this failed earlier today on jenkins at (the commit from bisect hasn't even 
built, yet..):
http://cassci.datastax.com/job/cassandra-2.1_utest/237/testReport/junit/org.apache.cassandra.triggers/TriggersSchemaTest/removeTriggerFromCf/
http://cassci.datastax.com/job/cassandra-2.1_utest/237/changes

and a couple days ago at:
http://cassci.datastax.com/job/cassandra-2.1_utest/225/testReport/junit/org.apache.cassandra.triggers/TriggersSchemaTest/removeTriggerFromCf/
http://cassci.datastax.com/job/cassandra-2.1_utest/225/changes (makes no sense 
to me..)

keeping this ticket for a bit longer..

> 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: T Jake Luciani
>Priority: Minor
> Fix For: 2.1 rc1
>
>
> bisecting..



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


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

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler reassigned CASSANDRA-7166:
-

Assignee: Michael Shuler  (was: T Jake Luciani)

> 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] [Commented] (CASSANDRA-7168) Add repair aware consistency levels

2014-05-05 Thread Brandon Williams (JIRA)

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

Brandon Williams commented on CASSANDRA-7168:
-

Sounds like REPAIRED_QUORUM isn't going to be a lot of win over QUORUM then 
since we still have to check multiple nodes, but I guess we'll see.

> Add repair aware consistency levels
> ---
>
> Key: CASSANDRA-7168
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7168
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Core
>Reporter: T Jake Luciani
>  Labels: performance
> Fix For: 3.0
>
>
> With CASSANDRA-5351 and CASSANDRA-2424 I think there is an opportunity to 
> avoid a lot of extra work when running queries with higher consistency 
> levels.  
> Since repaired data is by definition consistent and we know which sstables 
> are repaired, we can optimize the read path by having a REPAIRED_QUORUM which 
> breaks reads into two phases:
>  
>   1) Read from one replica the result from the repaired sstables. 
>   2) Read from a quorum only the un-repaired data.
> For the node performing 1) we can pipeline the call so it's a single hop.
> In the long run (assuming data is repaired regularly) we will end up with 
> much closer to CL.ONE performance while maintaining consistency.
> Some things to figure out:
>   - If repairs fail on some nodes we can have a situation where we don't have 
> a consistent repaired state across the replicas.  
>   



--
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 Brandon Williams (JIRA)

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

Brandon Williams updated CASSANDRA-7164:


Reviewer: Yuki Morishita

> 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: Joshua McKenzie
>Priority: Minor
> Fix For: 2.1 rc1
>
> Attachments: 7164_v1.txt
>
>
> bisecting..



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


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

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler commented on CASSANDRA-7166:
---

Jake, I'm using 10x pass as good for these intermittent ones - just noticed it 
landed on a commit from today, so I'll double check and reassign, if needed, 
but here's what I'm using - I might bump it up to 25 or so.

{{git bisect run ../unittest_bisect_10xgood.sh TriggersSchemaTest}}

{code}
#!/bin/bash
if [ ${1} ]; then
  ant clean
  ant jar || exit 125
  for i in {1..10}; do
echo " Run #${i} "
ant test -Dtest.name=${1}
RET=$?
if [ "${RET}" -ne "0" ]; then
  break
fi
  done
else
  echo "  ${0} needs a unit test to run.."
  exit 255
fi
exit ${RET}
{code}

> 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: T Jake Luciani
>Priority: Minor
> Fix For: 2.1 rc1
>
>
> bisecting..



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


[jira] [Commented] (CASSANDRA-7168) Add repair aware consistency levels

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

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

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

1) only gives you part of the result.  It will only be correct as-of the last 
repair time.  But 2) is all the latest data including what is in the memtable.

The idea is the coordinator takes the result of 1) and merges in 2) to get the 
complete consistent view of the result.  So there could be the case where in 
repaired data a row existed but in a subsequest write in the memtable it was 
tombstoned.  In this case the corrdinator would see the tomstone and the result 
would not include the cell from the repaired result. The same way we deal with 
merging multiple sstables together.

> Add repair aware consistency levels
> ---
>
> Key: CASSANDRA-7168
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7168
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Core
>Reporter: T Jake Luciani
>  Labels: performance
> Fix For: 3.0
>
>
> With CASSANDRA-5351 and CASSANDRA-2424 I think there is an opportunity to 
> avoid a lot of extra work when running queries with higher consistency 
> levels.  
> Since repaired data is by definition consistent and we know which sstables 
> are repaired, we can optimize the read path by having a REPAIRED_QUORUM which 
> breaks reads into two phases:
>  
>   1) Read from one replica the result from the repaired sstables. 
>   2) Read from a quorum only the un-repaired data.
> For the node performing 1) we can pipeline the call so it's a single hop.
> In the long run (assuming data is repaired regularly) we will end up with 
> much closer to CL.ONE performance while maintaining consistency.
> Some things to figure out:
>   - If repairs fail on some nodes we can have a situation where we don't have 
> a consistent repaired state across the replicas.  
>   



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


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

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler updated CASSANDRA-7166:
--

Assignee: Michael Shuler  (was: T Jake Luciani)

> 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] [Updated] (CASSANDRA-7166) o.a.c.triggers.TriggersSchemaTest unit test fails intermittently in 2.1

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler updated CASSANDRA-7166:
--

Assignee: T Jake Luciani  (was: Michael Shuler)

> 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: T Jake Luciani
>Priority: Minor
> Fix For: 2.1 rc1
>
>
> bisecting..



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


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

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler updated CASSANDRA-7166:
--

Assignee: T Jake Luciani  (was: Michael Shuler)

> 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: T Jake Luciani
>Priority: Minor
> Fix For: 2.1 rc1
>
>
> bisecting..



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


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

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler commented on CASSANDRA-7166:
---

bisecting lands me on:
{noformat}
f0575f153b8f0b0caa56f56cc5e93ebd3f784b8e is the first bad commit
commit f0575f153b8f0b0caa56f56cc5e93ebd3f784b8e
Author: T Jake Luciani 
Date:   Mon May 5 16:07:53 2014 -0400

high-scale-lib upgrade

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

:100644 100644 a8b6ae4c1c6e7b3d409a3e83bef45eece95d3956 
553f7640dc8533ba8b3add594776753f9be500a3 M  CHANGES.txt
:100644 100644 ff6aea0a80fc817719fc9dadbb5d76fee9c4cc29 
be9b23bd01b3eb883c3c9f098121608f112adfe2 M  build.properties.default
:100644 100644 898b141f46974b972c4bf82ae72d0591d0a7eb60 
e8d9dd9374c052d01c0e596aa5d2cecb52acc834 M  build.xml
:04 04 27b394974b147dcd0319f30d5fcc8c3f8494ccad 
f71edfdfabe7e303eabfd201e166a675878d448d M  lib
{noformat}

> 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] [Updated] (CASSANDRA-7164) o.a.c.service.RemoveTest unit test failing in 2.1

2014-05-05 Thread Joshua McKenzie (JIRA)

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

Joshua McKenzie updated CASSANDRA-7164:
---

Attachment: 7164_v1.txt

> 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: Joshua McKenzie
>Priority: Minor
> Fix For: 2.1 rc1
>
> Attachments: 7164_v1.txt
>
>
> bisecting..



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


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

2014-05-05 Thread Joshua McKenzie (JIRA)

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

Joshua McKenzie commented on CASSANDRA-7164:


Logic was off by 1 on lastReturned in HostStreamingData.  Patch attached.

> 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: Joshua McKenzie
>Priority: Minor
> Fix For: 2.1 rc1
>
> Attachments: 7164_v1.txt
>
>
> bisecting..



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


[jira] [Commented] (CASSANDRA-7168) Add repair aware consistency levels

2014-05-05 Thread Brandon Williams (JIRA)

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

Brandon Williams commented on CASSANDRA-7168:
-

I guess don't understand how 1) can ever happen, unless the query is exactly 
when the repair ends.

> Add repair aware consistency levels
> ---
>
> Key: CASSANDRA-7168
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7168
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Core
>Reporter: T Jake Luciani
>  Labels: performance
> Fix For: 3.0
>
>
> With CASSANDRA-5351 and CASSANDRA-2424 I think there is an opportunity to 
> avoid a lot of extra work when running queries with higher consistency 
> levels.  
> Since repaired data is by definition consistent and we know which sstables 
> are repaired, we can optimize the read path by having a REPAIRED_QUORUM which 
> breaks reads into two phases:
>  
>   1) Read from one replica the result from the repaired sstables. 
>   2) Read from a quorum only the un-repaired data.
> For the node performing 1) we can pipeline the call so it's a single hop.
> In the long run (assuming data is repaired regularly) we will end up with 
> much closer to CL.ONE performance while maintaining consistency.
> Some things to figure out:
>   - If repairs fail on some nodes we can have a situation where we don't have 
> a consistent repaired state across the replicas.  
>   



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


[jira] [Commented] (CASSANDRA-7168) Add repair aware consistency levels

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

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

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

Right, this is what 2) is for.

The coordinator would collate the result.

> Add repair aware consistency levels
> ---
>
> Key: CASSANDRA-7168
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7168
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Core
>Reporter: T Jake Luciani
>  Labels: performance
> Fix For: 3.0
>
>
> With CASSANDRA-5351 and CASSANDRA-2424 I think there is an opportunity to 
> avoid a lot of extra work when running queries with higher consistency 
> levels.  
> Since repaired data is by definition consistent and we know which sstables 
> are repaired, we can optimize the read path by having a REPAIRED_QUORUM which 
> breaks reads into two phases:
>  
>   1) Read from one replica the result from the repaired sstables. 
>   2) Read from a quorum only the un-repaired data.
> For the node performing 1) we can pipeline the call so it's a single hop.
> In the long run (assuming data is repaired regularly) we will end up with 
> much closer to CL.ONE performance while maintaining consistency.
> Some things to figure out:
>   - If repairs fail on some nodes we can have a situation where we don't have 
> a consistent repaired state across the replicas.  
>   



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


[jira] [Commented] (CASSANDRA-7168) Add repair aware consistency levels

2014-05-05 Thread Brandon Williams (JIRA)

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

Brandon Williams commented on CASSANDRA-7168:
-

bq. 1) Read from one replica the result from the repaired sstables. 

ISTM if you do this you can't guarantee the data hasn't been updated after the 
repair on some other node, since the repair time will always be in the past.

> Add repair aware consistency levels
> ---
>
> Key: CASSANDRA-7168
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7168
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Core
>Reporter: T Jake Luciani
>  Labels: performance
> Fix For: 3.0
>
>
> With CASSANDRA-5351 and CASSANDRA-2424 I think there is an opportunity to 
> avoid a lot of extra work when running queries with higher consistency 
> levels.  
> Since repaired data is by definition consistent and we know which sstables 
> are repaired, we can optimize the read path by having a REPAIRED_QUORUM which 
> breaks reads into two phases:
>  
>   1) Read from one replica the result from the repaired sstables. 
>   2) Read from a quorum only the un-repaired data.
> For the node performing 1) we can pipeline the call so it's a single hop.
> In the long run (assuming data is repaired regularly) we will end up with 
> much closer to CL.ONE performance while maintaining consistency.
> Some things to figure out:
>   - If repairs fail on some nodes we can have a situation where we don't have 
> a consistent repaired state across the replicas.  
>   



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


[jira] [Created] (CASSANDRA-7168) Add repair aware consistency levels

2014-05-05 Thread T Jake Luciani (JIRA)
T Jake Luciani created CASSANDRA-7168:
-

 Summary: Add repair aware consistency levels
 Key: CASSANDRA-7168
 URL: https://issues.apache.org/jira/browse/CASSANDRA-7168
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: T Jake Luciani
 Fix For: 3.0


With CASSANDRA-5351 and CASSANDRA-2424 I think there is an opportunity to avoid 
a lot of extra work when running queries with higher consistency levels.  

Since repaired data is by definition consistent and we know which sstables are 
repaired, we can optimize the read path by having a REPAIRED_QUORUM which 
breaks reads into two phases:
 
  1) Read from one replica the result from the repaired sstables. 
  2) Read from a quorum only the un-repaired data.

For the node performing 1) we can pipeline the call so it's a single hop.

In the long run (assuming data is repaired regularly) we will end up with much 
closer to CL.ONE performance while maintaining consistency.

Some things to figure out:
  - If repairs fail on some nodes we can have a situation where we don't have a 
consistent repaired state across the replicas.  
  



--
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)


[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-tabpanel&focusedCommentId=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] [Assigned] (CASSANDRA-7164) o.a.c.service.RemoveTest unit test failing in 2.1

2014-05-05 Thread Brandon Williams (JIRA)

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

Brandon Williams reassigned CASSANDRA-7164:
---

Assignee: Joshua McKenzie

> 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: Joshua McKenzie
>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-tabpanel&focusedCommentId=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] [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:
--

Assignee: (was: Michael Shuler)

> 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-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:comment-tabpanel&focusedCommentId=13990142#comment-13990142
 ] 

Michael Shuler commented on CASSANDRA-7164:
---

bisecting 2.1-2.0, this results in:
{noformat}
44fa2cdb48cf6b4e589d5c48f5c57f0a93c03b60 is the first bad commit
commit 44fa2cdb48cf6b4e589d5c48f5c57f0a93c03b60
Author: Joshua McKenzie 
Date:   Thu May 1 17:51:12 2014 -0500

Parallel streaming for sstableloader

patch by Joshua Mckenzie; reviewed by yukim for CASSANDRA-3668

:100644 100644 16fcdfce5583992f03cf15742608b9b381426633 
86940eabcb06353848cfc05978b5b7de721e1c46 M  CHANGES.txt
:04 04 3c6ba85e184e5339b2b85b18796653403f5a7db6 
72f90ec23ef0b33dda7a2bbe4d7e59bed87d7b78 M  src
:04 04 ef0fe5679b4a83556e3f4d276902e15ece902fff 
e2472de08bd32a62056098a5e500b2daf62d46d8 M  test
{noformat}

> 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] [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] [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] [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-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-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] [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-tabpanel&focusedCommentId=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] [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-tabpanel&focusedCommentId=13990098#comment-13990098
 ] 

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

There were a couple performance related changes that went into the 2.1 branch 
which my branch was missing.  I just rebased my branch with all the changes. 
Can you check what commit you had in your 2.1 branch test?

> 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-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-tabpanel&focusedCommentId=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-7163) dtests should reuse existing clusters where possible

2014-05-05 Thread Russ Hatch (JIRA)

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

Russ Hatch commented on CASSANDRA-7163:
---

One possibility here might be some simple helpers in the Tester class to track 
a keyspace name on a per-test basis. A uuid would be great for this, and would 
prevent table name collisions. Then the tests can just ask for a keyspace when 
needed (and not really care what the actual value is).

> 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] [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] [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] [Commented] (CASSANDRA-7159) sstablemetadata command should print some more stuff

2014-05-05 Thread Brandon Williams (JIRA)

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

Brandon Williams commented on CASSANDRA-7159:
-

Would also be nice if it exposed the tombstone info, since I see a lot of 
people ask about this and then be told to run sstablegarbage on it.

> sstablemetadata command should print some more stuff
> 
>
> Key: CASSANDRA-7159
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7159
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Tools
>Reporter: Jeremiah Jordan
>Priority: Trivial
>  Labels: lhf
>
> It would be nice if the sstablemetadata command printed out some more of the 
> stuff we track.  Like the Min/Max column names and the min/max token in the 
> file.



--
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-tabpanel&focusedCommentId=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] [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-tabpanel&focusedCommentId=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] [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-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-tabpanel&focusedCommentId=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 
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] [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] [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-tabpanel&focusedCommentId=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 
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] [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:
--

Fix Version/s: 2.1 rc1

> 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-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)


[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 
Authored: Mon May 5 16:07:53 2014 -0400
Committer: T Jake Luciani 
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 @@
   
   
   
+  
 
   
 
@@ -361,7 +362,7 @@
 
   
   
-  
+  
   
   

@@ -470,7 +471,7 @@
 
 
 
-
+
 
 
 
@@ -542,6 +543,7 @@
   
   
   
+  
   
   
@@ -567,6 +569,7 @@
 
 
 
+
   
   
 
@@ -587,6 +590,7 @@
 
 
 
+
   
   
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/lib/high-scale-lib-1.0.5.jar
--
diff --git a/lib/high-scale-lib-1.0.5.jar b/lib/high-scale-lib-1.0.5.jar
new file mode 100644
index 000..d184472
Binary files /dev/null and b/lib/high-scale-lib-1.0.5.jar differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/lib/high-scale-lib-1.1.2.jar
--
diff --git a/lib/high-scale-lib-1.1.2.jar b/lib/high-scale-lib-1.1.2.jar
deleted file mode 100644
index 6343a70..000
Binary files a/lib/high-scale-lib-1.1.2.jar and /dev/null differ



[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 
Authored: Mon May 5 17:13:08 2014 -0400
Committer: T Jake Luciani 
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
--



[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.(RandomAccessFile.java:241)
>   at 
> org.apache.cassandra.io.util.RandomAccessReader.(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.(RandomAccessFile.java:241)
>   at 
> org.apache.cassandra.io.util.RandomAccessReader.(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-tabpanel&focusedCommentId=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.(RandomAccessFile.java:241)
>   at 
> org.apache.cassandra.io.util.RandomAccessReader.(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-tabpanel&focusedCommentId=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 
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.(RandomAccessFile.java:241)
>   at 
> org.apache.cassandra.io.util.RandomAccessReader.(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)


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 
Authored: Mon May 5 16:07:53 2014 -0400
Committer: T Jake Luciani 
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 @@
   
   
   
+  
 
   
 
@@ -361,7 +362,7 @@
 
   
   
-  
+  
   
   

@@ -470,7 +471,7 @@
 
 
 
-
+
 
 
 
@@ -542,6 +543,7 @@
   
   
   
+  
   
   
@@ -567,6 +569,7 @@
 
 
 
+
   
   
 
@@ -587,6 +590,7 @@
 
 
 
+
   
   
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/lib/high-scale-lib-1.0.5.jar
--
diff --git a/lib/high-scale-lib-1.0.5.jar b/lib/high-scale-lib-1.0.5.jar
new file mode 100644
index 000..d184472
Binary files /dev/null and b/lib/high-scale-lib-1.0.5.jar differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/lib/high-scale-lib-1.1.2.jar
--
diff --git a/lib/high-scale-lib-1.1.2.jar b/lib/high-scale-lib-1.1.2.jar
deleted file mode 100644
index 6343a70..000
Binary files a/lib/high-scale-lib-1.1.2.jar and /dev/null differ



[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-tabpanel&focusedCommentId=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)


[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] [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] [Commented] (CASSANDRA-7107) General minor tidying of CollationController path

2014-05-05 Thread Benedict (JIRA)

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

Benedict commented on CASSANDRA-7107:
-

Well, just to be sure:

* We translate a slice to the range \[lb..ub\) - i.e. lb is inclusive; 
* We search in the range [0..lb) to translate the next slice - lb is exclusive 
here

So I'm pretty sure it's fine - lb always gets returned in the first iterator, 
and is never searched for building the following iterator, but is the exact 
boundary at which we start our search.

> 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 
Authored: Mon May 5 22:58:58 2014 +0300
Committer: Aleksey Yeschenko 
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 Iterator 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 SearchIterator searchIterator()
 +{
 +maybeSortCells();
 +
 +return new SearchIterator()
 +{
 +// 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=13958264&page=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 = binarySearch(limit, size, name, 
internalComparator());
 +

[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-tabpanel&focusedCommentId=13989908#comment-13989908
 ] 

Marcus Eriksson commented on CASSANDRA-6696:


bq.  flush to one L0 file per disk
yep, will do that first, then tweak and benchmark if more files are better

> 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-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-tabpanel&focusedCommentId=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)


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

2014-05-05 Thread Benedict (JIRA)

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

Benedict commented on CASSANDRA-7107:
-

LGTM. I don't think there's any off-by-1 error, unless I'm missing something: 
do you have a specific case you think may be off?

> 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)


[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-tabpanel&focusedCommentId=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-7010) bootstrap_test simple_bootstrap_test dtest fails in 2.1

2014-05-05 Thread Michael Shuler (JIRA)

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

Michael Shuler commented on CASSANDRA-7010:
---

this is intermittent - failed once in about 10 runs runs on 2.1, and it failed 
in the same manner on 2.0 once, but 25 runs later on 2.0, it hasn't failed..

> bootstrap_test simple_bootstrap_test dtest fails in 2.1
> ---
>
> Key: CASSANDRA-7010
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7010
> Project: Cassandra
>  Issue Type: Test
>  Components: Tests
>Reporter: Michael Shuler
> Fix For: 2.1 rc1
>
>
> I patched ccm with https://github.com/pcmanus/ccm/pull/109 and got an error 
> from simple_bootstrap:
> {noformat}
> ==
> FAIL: simple_bootstrap_test (bootstrap_test.TestBootstrap)
> --
> Traceback (most recent call last):
>   File "/home/mshuler/git/cassandra-dtest/bootstrap_test.py", line 58, in 
> simple_bootstrap_test
> assert_almost_equal(initial_size, 2 * size1)
>   File "/home/mshuler/git/cassandra-dtest/assertions.py", line 26, in 
> assert_almost_equal
> assert vmin > vmax * (1.0 - error), "values not within %.2f%% of the max: 
> %s" % (error * 100, args)
> AssertionError: values not within 16.00% of the max: (0, 186396)
> {noformat}



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


[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)


[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 
Authored: Mon May 5 14:23:44 2014 -0500
Committer: Brandon Williams 
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 
Authored: Mon May 5 14:23:51 2014 -0500
Committer: Brandon Williams 
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 
Authored: Mon May 5 14:23:21 2014 -0500
Committer: Brandon Williams 
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 %*



[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 
Authored: Mon May 5 14:23:21 2014 -0500
Committer: Brandon Williams 
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 %*



[08/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/cassandra-2.1
Commit: 07dfb58adceb23f725a69a0cfa22f19d1b8d1432
Parents: b622411 f524570
Author: Brandon Williams 
Authored: Mon May 5 14:23:44 2014 -0500
Committer: Brandon Williams 
Committed: Mon May 5 14:23:44 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 
Authored: Mon May 5 14:23:35 2014 -0500
Committer: Brandon Williams 
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 
Authored: Mon May 5 14:23:21 2014 -0500
Committer: Brandon Williams 
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 
Authored: Mon May 5 14:23:35 2014 -0500
Committer: Brandon Williams 
Committed: Mon May 5 14:23:35 2014 -0500

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




[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 
Authored: Mon May 5 14:23:35 2014 -0500
Committer: Brandon Williams 
Committed: Mon May 5 14:23:35 2014 -0500

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




  1   2   >