from:"jmckenzie"

[19/22] cassandra git commit: 10089 - 3.0 patch

2015-11-11 Thread jmckenzie

10089 - 3.0 patch


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

Branch: refs/heads/trunk
Commit: 9a90e9894e9e079058876cf2b16a47d29ba0a32a
Parents: 30eecb2
Author: Stefania Alborghetti 
Authored: Wed Nov 11 15:05:35 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:05:35 2015 -0500

--
 .../org/apache/cassandra/gms/EndpointState.java |  76 ++---
 .../apache/cassandra/gms/FailureDetector.java   |   7 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  47 +++---
 .../apache/cassandra/gms/VersionedValue.java|   5 +
 .../cassandra/service/StorageService.java   |  61 ---
 .../apache/cassandra/gms/EndpointStateTest.java | 159 +++
 .../cassandra/locator/CloudstackSnitchTest.java |   4 +-
 .../apache/cassandra/locator/EC2SnitchTest.java |   4 +-
 .../locator/GoogleCloudSnitchTest.java  |   4 +-
 9 files changed, 282 insertions(+), 85 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a90e989/src/java/org/apache/cassandra/gms/EndpointState.java
--
diff --git a/src/java/org/apache/cassandra/gms/EndpointState.java 
b/src/java/org/apache/cassandra/gms/EndpointState.java
index d1c023a..70f2a68 100644
--- a/src/java/org/apache/cassandra/gms/EndpointState.java
+++ b/src/java/org/apache/cassandra/gms/EndpointState.java
@@ -18,7 +18,11 @@
 package org.apache.cassandra.gms;
 
 import java.io.*;
+import java.util.Collections;
+import java.util.EnumMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,8 +30,6 @@ import org.apache.cassandra.db.TypeSizes;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.io.util.DataInputPlus;
 import org.apache.cassandra.io.util.DataOutputPlus;
-import org.cliffc.high_scale_lib.NonBlockingHashMap;
-
 /**
  * This abstraction represents both the HeartBeatState and the 
ApplicationState in an EndpointState
  * instance. Any state for a given endpoint can be retrieved from this 
instance.
@@ -41,7 +43,7 @@ public class EndpointState
 public final static IVersionedSerializer serializer = new 
EndpointStateSerializer();
 
 private volatile HeartBeatState hbState;
-final Map applicationState = new 
NonBlockingHashMap();
+private final AtomicReference> 
applicationState;
 
 /* fields below do not get serialized */
 private volatile long updateTimestamp;
@@ -49,7 +51,13 @@ public class EndpointState
 
 EndpointState(HeartBeatState initialHbState)
 {
+this(initialHbState, new EnumMap(ApplicationState.class));
+}
+
+EndpointState(HeartBeatState initialHbState, Map states)
+{
 hbState = initialHbState;
+applicationState = new AtomicReference>(new EnumMap<>(states));
 updateTimestamp = System.nanoTime();
 isAlive = true;
 }
@@ -67,21 +75,37 @@ public class EndpointState
 
 public VersionedValue getApplicationState(ApplicationState key)
 {
-return applicationState.get(key);
+return applicationState.get().get(key);
 }
 
-/**
- * TODO replace this with operations that don't expose private state
- */
-@Deprecated
-public Map getApplicationStateMap()
+public Set> states()
+{
+return applicationState.get().entrySet();
+}
+
+public void addApplicationState(ApplicationState key, VersionedValue value)
 {
-return applicationState;
+addApplicationStates(Collections.singletonMap(key, value));
 }
 
-void addApplicationState(ApplicationState key, VersionedValue value)
+public void addApplicationStates(Map 
values)
 {
-applicationState.put(key, value);
+addApplicationStates(values.entrySet());
+}
+
+public void addApplicationStates(Set> values)
+{
+while (true)
+{
+Map orig = 
applicationState.get();
+Map copy = new EnumMap<>(orig);
+
+for (Map.Entry value : values)
+

[22/22] cassandra git commit: Merge branch 'cassandra-3.1' into trunk

2015-11-11 Thread jmckenzie

Merge branch 'cassandra-3.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/7d6dbf89
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d6dbf89
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d6dbf89

Branch: refs/heads/trunk
Commit: 7d6dbf897cd14e6c5811a0588f25e5c11385a9fd
Parents: 55811e5 1fe90d3
Author: Joshua McKenzie 
Authored: Wed Nov 11 15:06:23 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:06:23 2015 -0500

--
 .../org/apache/cassandra/gms/EndpointState.java |  76 ++---
 .../apache/cassandra/gms/FailureDetector.java   |   7 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  47 +++---
 .../apache/cassandra/gms/VersionedValue.java|   5 +
 .../cassandra/service/StorageService.java   |  61 ---
 .../apache/cassandra/gms/EndpointStateTest.java | 159 +++
 .../cassandra/locator/CloudstackSnitchTest.java |   4 +-
 .../apache/cassandra/locator/EC2SnitchTest.java |   4 +-
 .../locator/GoogleCloudSnitchTest.java  |   4 +-
 9 files changed, 282 insertions(+), 85 deletions(-)
--

[13/22] cassandra git commit: 10089 - 2.2 patch

2015-11-11 Thread jmckenzie

10089 - 2.2 patch


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

Branch: refs/heads/cassandra-2.2
Commit: 6bb6bb005197c33fa94026d472ff78d4f36613cc
Parents: 87fe1e0
Author: Stefania Alborghetti 
Authored: Wed Nov 11 15:04:25 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:04:25 2015 -0500

--
 .../org/apache/cassandra/gms/EndpointState.java |  76 ++---
 .../apache/cassandra/gms/FailureDetector.java   |   7 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  47 +++---
 .../apache/cassandra/gms/VersionedValue.java|   5 +
 .../cassandra/service/StorageService.java   |  65 
 .../apache/cassandra/gms/EndpointStateTest.java | 159 +++
 .../cassandra/locator/CloudstackSnitchTest.java |   4 +-
 .../apache/cassandra/locator/EC2SnitchTest.java |   4 +-
 .../locator/GoogleCloudSnitchTest.java  |   4 +-
 9 files changed, 283 insertions(+), 88 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bb6bb00/src/java/org/apache/cassandra/gms/EndpointState.java
--
diff --git a/src/java/org/apache/cassandra/gms/EndpointState.java 
b/src/java/org/apache/cassandra/gms/EndpointState.java
index 0e6985a..931da8d 100644
--- a/src/java/org/apache/cassandra/gms/EndpointState.java
+++ b/src/java/org/apache/cassandra/gms/EndpointState.java
@@ -18,7 +18,11 @@
 package org.apache.cassandra.gms;
 
 import java.io.*;
+import java.util.Collections;
+import java.util.EnumMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,8 +31,6 @@ import org.apache.cassandra.db.TypeSizes;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.io.util.DataOutputPlus;
 
-import org.cliffc.high_scale_lib.NonBlockingHashMap;
-
 /**
  * This abstraction represents both the HeartBeatState and the 
ApplicationState in an EndpointState
  * instance. Any state for a given endpoint can be retrieved from this 
instance.
@@ -42,7 +44,7 @@ public class EndpointState
 public final static IVersionedSerializer serializer = new 
EndpointStateSerializer();
 
 private volatile HeartBeatState hbState;
-final Map applicationState = new 
NonBlockingHashMap();
+private final AtomicReference> 
applicationState;
 
 /* fields below do not get serialized */
 private volatile long updateTimestamp;
@@ -50,7 +52,13 @@ public class EndpointState
 
 EndpointState(HeartBeatState initialHbState)
 {
+this(initialHbState, new EnumMap(ApplicationState.class));
+}
+
+EndpointState(HeartBeatState initialHbState, Map states)
+{
 hbState = initialHbState;
+applicationState = new AtomicReference>(new EnumMap<>(states));
 updateTimestamp = System.nanoTime();
 isAlive = true;
 }
@@ -68,21 +76,37 @@ public class EndpointState
 
 public VersionedValue getApplicationState(ApplicationState key)
 {
-return applicationState.get(key);
+return applicationState.get().get(key);
 }
 
-/**
- * TODO replace this with operations that don't expose private state
- */
-@Deprecated
-public Map getApplicationStateMap()
+public Set> states()
+{
+return applicationState.get().entrySet();
+}
+
+public void addApplicationState(ApplicationState key, VersionedValue value)
 {
-return applicationState;
+addApplicationStates(Collections.singletonMap(key, value));
 }
 
-void addApplicationState(ApplicationState key, VersionedValue value)
+public void addApplicationStates(Map 
values)
 {
-applicationState.put(key, value);
+addApplicationStates(values.entrySet());
+}
+
+public void addApplicationStates(Set> values)
+{
+while (true)
+{
+Map orig = 
applicationState.get();
+Map copy = new EnumMap<>(orig);
+
+for (Map.Entry value : values)
+copy.put(value.getKey(),

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

2015-11-11 Thread jmckenzie

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 87fe1e09f15b373fd74473dddee12e289287b7aa
Parents: 9fc957c 6bad57f
Author: Joshua McKenzie 
Authored: Wed Nov 11 15:03:24 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:03:24 2015 -0500

--

--

[18/22] cassandra git commit: 10089 - 3.0 patch

2015-11-11 Thread jmckenzie

10089 - 3.0 patch


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

Branch: refs/heads/cassandra-3.0
Commit: 9a90e9894e9e079058876cf2b16a47d29ba0a32a
Parents: 30eecb2
Author: Stefania Alborghetti 
Authored: Wed Nov 11 15:05:35 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:05:35 2015 -0500

--
 .../org/apache/cassandra/gms/EndpointState.java |  76 ++---
 .../apache/cassandra/gms/FailureDetector.java   |   7 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  47 +++---
 .../apache/cassandra/gms/VersionedValue.java|   5 +
 .../cassandra/service/StorageService.java   |  61 ---
 .../apache/cassandra/gms/EndpointStateTest.java | 159 +++
 .../cassandra/locator/CloudstackSnitchTest.java |   4 +-
 .../apache/cassandra/locator/EC2SnitchTest.java |   4 +-
 .../locator/GoogleCloudSnitchTest.java  |   4 +-
 9 files changed, 282 insertions(+), 85 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a90e989/src/java/org/apache/cassandra/gms/EndpointState.java
--
diff --git a/src/java/org/apache/cassandra/gms/EndpointState.java 
b/src/java/org/apache/cassandra/gms/EndpointState.java
index d1c023a..70f2a68 100644
--- a/src/java/org/apache/cassandra/gms/EndpointState.java
+++ b/src/java/org/apache/cassandra/gms/EndpointState.java
@@ -18,7 +18,11 @@
 package org.apache.cassandra.gms;
 
 import java.io.*;
+import java.util.Collections;
+import java.util.EnumMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,8 +30,6 @@ import org.apache.cassandra.db.TypeSizes;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.io.util.DataInputPlus;
 import org.apache.cassandra.io.util.DataOutputPlus;
-import org.cliffc.high_scale_lib.NonBlockingHashMap;
-
 /**
  * This abstraction represents both the HeartBeatState and the 
ApplicationState in an EndpointState
  * instance. Any state for a given endpoint can be retrieved from this 
instance.
@@ -41,7 +43,7 @@ public class EndpointState
 public final static IVersionedSerializer serializer = new 
EndpointStateSerializer();
 
 private volatile HeartBeatState hbState;
-final Map applicationState = new 
NonBlockingHashMap();
+private final AtomicReference> 
applicationState;
 
 /* fields below do not get serialized */
 private volatile long updateTimestamp;
@@ -49,7 +51,13 @@ public class EndpointState
 
 EndpointState(HeartBeatState initialHbState)
 {
+this(initialHbState, new EnumMap(ApplicationState.class));
+}
+
+EndpointState(HeartBeatState initialHbState, Map states)
+{
 hbState = initialHbState;
+applicationState = new AtomicReference>(new EnumMap<>(states));
 updateTimestamp = System.nanoTime();
 isAlive = true;
 }
@@ -67,21 +75,37 @@ public class EndpointState
 
 public VersionedValue getApplicationState(ApplicationState key)
 {
-return applicationState.get(key);
+return applicationState.get().get(key);
 }
 
-/**
- * TODO replace this with operations that don't expose private state
- */
-@Deprecated
-public Map getApplicationStateMap()
+public Set> states()
+{
+return applicationState.get().entrySet();
+}
+
+public void addApplicationState(ApplicationState key, VersionedValue value)
 {
-return applicationState;
+addApplicationStates(Collections.singletonMap(key, value));
 }
 
-void addApplicationState(ApplicationState key, VersionedValue value)
+public void addApplicationStates(Map 
values)
 {
-applicationState.put(key, value);
+addApplicationStates(values.entrySet());
+}
+
+public void addApplicationStates(Set> values)
+{
+while (true)
+{
+Map orig = 
applicationState.get();
+Map copy = new EnumMap<>(orig);
+
+for (Map.Entry value : values)
+

[17/22] cassandra git commit: 10089 - 3.0 patch

2015-11-11 Thread jmckenzie

10089 - 3.0 patch


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

Branch: refs/heads/cassandra-3.1
Commit: 9a90e9894e9e079058876cf2b16a47d29ba0a32a
Parents: 30eecb2
Author: Stefania Alborghetti 
Authored: Wed Nov 11 15:05:35 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:05:35 2015 -0500

--
 .../org/apache/cassandra/gms/EndpointState.java |  76 ++---
 .../apache/cassandra/gms/FailureDetector.java   |   7 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  47 +++---
 .../apache/cassandra/gms/VersionedValue.java|   5 +
 .../cassandra/service/StorageService.java   |  61 ---
 .../apache/cassandra/gms/EndpointStateTest.java | 159 +++
 .../cassandra/locator/CloudstackSnitchTest.java |   4 +-
 .../apache/cassandra/locator/EC2SnitchTest.java |   4 +-
 .../locator/GoogleCloudSnitchTest.java  |   4 +-
 9 files changed, 282 insertions(+), 85 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a90e989/src/java/org/apache/cassandra/gms/EndpointState.java
--
diff --git a/src/java/org/apache/cassandra/gms/EndpointState.java 
b/src/java/org/apache/cassandra/gms/EndpointState.java
index d1c023a..70f2a68 100644
--- a/src/java/org/apache/cassandra/gms/EndpointState.java
+++ b/src/java/org/apache/cassandra/gms/EndpointState.java
@@ -18,7 +18,11 @@
 package org.apache.cassandra.gms;
 
 import java.io.*;
+import java.util.Collections;
+import java.util.EnumMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,8 +30,6 @@ import org.apache.cassandra.db.TypeSizes;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.io.util.DataInputPlus;
 import org.apache.cassandra.io.util.DataOutputPlus;
-import org.cliffc.high_scale_lib.NonBlockingHashMap;
-
 /**
  * This abstraction represents both the HeartBeatState and the 
ApplicationState in an EndpointState
  * instance. Any state for a given endpoint can be retrieved from this 
instance.
@@ -41,7 +43,7 @@ public class EndpointState
 public final static IVersionedSerializer serializer = new 
EndpointStateSerializer();
 
 private volatile HeartBeatState hbState;
-final Map applicationState = new 
NonBlockingHashMap();
+private final AtomicReference> 
applicationState;
 
 /* fields below do not get serialized */
 private volatile long updateTimestamp;
@@ -49,7 +51,13 @@ public class EndpointState
 
 EndpointState(HeartBeatState initialHbState)
 {
+this(initialHbState, new EnumMap(ApplicationState.class));
+}
+
+EndpointState(HeartBeatState initialHbState, Map states)
+{
 hbState = initialHbState;
+applicationState = new AtomicReference>(new EnumMap<>(states));
 updateTimestamp = System.nanoTime();
 isAlive = true;
 }
@@ -67,21 +75,37 @@ public class EndpointState
 
 public VersionedValue getApplicationState(ApplicationState key)
 {
-return applicationState.get(key);
+return applicationState.get().get(key);
 }
 
-/**
- * TODO replace this with operations that don't expose private state
- */
-@Deprecated
-public Map getApplicationStateMap()
+public Set> states()
+{
+return applicationState.get().entrySet();
+}
+
+public void addApplicationState(ApplicationState key, VersionedValue value)
 {
-return applicationState;
+addApplicationStates(Collections.singletonMap(key, value));
 }
 
-void addApplicationState(ApplicationState key, VersionedValue value)
+public void addApplicationStates(Map 
values)
 {
-applicationState.put(key, value);
+addApplicationStates(values.entrySet());
+}
+
+public void addApplicationStates(Set> values)
+{
+while (true)
+{
+Map orig = 
applicationState.get();
+Map copy = new EnumMap<>(orig);
+
+for (Map.Entry value : values)
+

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

2015-11-11 Thread jmckenzie

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: 87fe1e09f15b373fd74473dddee12e289287b7aa
Parents: 9fc957c 6bad57f
Author: Joshua McKenzie 
Authored: Wed Nov 11 15:03:24 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:03:24 2015 -0500

--

--

[05/22] cassandra git commit: Fix NPE in Gossip handleStateNormal

2015-11-11 Thread jmckenzie

Fix NPE in Gossip handleStateNormal

Patch by stefania; reviewed by jknighton for CASSANDRA-10089


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

Branch: refs/heads/cassandra-3.0
Commit: 6bad57fc3cf967838a220d8402db37ed9a5b3b4e
Parents: 3674ad9
Author: Stefania Alborghetti 
Authored: Wed Nov 11 15:02:26 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:02:26 2015 -0500

--
 .../org/apache/cassandra/gms/EndpointState.java |  76 ++---
 .../apache/cassandra/gms/FailureDetector.java   |   7 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  47 +++---
 .../apache/cassandra/gms/VersionedValue.java|   5 +
 .../cassandra/service/StorageService.java   |  65 
 .../apache/cassandra/gms/EndpointStateTest.java | 159 +++
 .../cassandra/locator/CloudstackSnitchTest.java |   8 +-
 .../apache/cassandra/locator/EC2SnitchTest.java |   4 +-
 .../locator/GoogleCloudSnitchTest.java  |   8 +-
 9 files changed, 283 insertions(+), 96 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bad57fc/src/java/org/apache/cassandra/gms/EndpointState.java
--
diff --git a/src/java/org/apache/cassandra/gms/EndpointState.java 
b/src/java/org/apache/cassandra/gms/EndpointState.java
index 1029374..3e29295 100644
--- a/src/java/org/apache/cassandra/gms/EndpointState.java
+++ b/src/java/org/apache/cassandra/gms/EndpointState.java
@@ -18,7 +18,11 @@
 package org.apache.cassandra.gms;
 
 import java.io.*;
+import java.util.Collections;
+import java.util.EnumMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,8 +31,6 @@ import org.apache.cassandra.db.TypeSizes;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.io.util.DataOutputPlus;
 
-import org.cliffc.high_scale_lib.NonBlockingHashMap;
-
 /**
  * This abstraction represents both the HeartBeatState and the 
ApplicationState in an EndpointState
  * instance. Any state for a given endpoint can be retrieved from this 
instance.
@@ -42,7 +44,7 @@ public class EndpointState
 public final static IVersionedSerializer serializer = new 
EndpointStateSerializer();
 
 private volatile HeartBeatState hbState;
-final Map applicationState = new 
NonBlockingHashMap();
+private final AtomicReference> 
applicationState;
 
 /* fields below do not get serialized */
 private volatile long updateTimestamp;
@@ -50,7 +52,13 @@ public class EndpointState
 
 EndpointState(HeartBeatState initialHbState)
 {
+this(initialHbState, new EnumMap(ApplicationState.class));
+}
+
+EndpointState(HeartBeatState initialHbState, Map states)
+{
 hbState = initialHbState;
+applicationState = new AtomicReference>(new EnumMap<>(states));
 updateTimestamp = System.nanoTime();
 isAlive = true;
 }
@@ -68,21 +76,37 @@ public class EndpointState
 
 public VersionedValue getApplicationState(ApplicationState key)
 {
-return applicationState.get(key);
+return applicationState.get().get(key);
 }
 
-/**
- * TODO replace this with operations that don't expose private state
- */
-@Deprecated
-public Map getApplicationStateMap()
+public Set> states()
+{
+return applicationState.get().entrySet();
+}
+
+public void addApplicationState(ApplicationState key, VersionedValue value)
 {
-return applicationState;
+addApplicationStates(Collections.singletonMap(key, value));
 }
 
-void addApplicationState(ApplicationState key, VersionedValue value)
+public void addApplicationStates(Map 
values)
 {
-applicationState.put(key, value);
+addApplicationStates(values.entrySet());
+}
+
+public void addApplicationStates(Set> values)
+{
+while (true)
+{
+Map orig = 
applicationState.get();
+Map copy = new EnumMap<>(orig);
+
+for (Map.Entry

[12/22] cassandra git commit: 10089 - 2.2 patch

2015-11-11 Thread jmckenzie

10089 - 2.2 patch


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

Branch: refs/heads/trunk
Commit: 6bb6bb005197c33fa94026d472ff78d4f36613cc
Parents: 87fe1e0
Author: Stefania Alborghetti 
Authored: Wed Nov 11 15:04:25 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:04:25 2015 -0500

--
 .../org/apache/cassandra/gms/EndpointState.java |  76 ++---
 .../apache/cassandra/gms/FailureDetector.java   |   7 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  47 +++---
 .../apache/cassandra/gms/VersionedValue.java|   5 +
 .../cassandra/service/StorageService.java   |  65 
 .../apache/cassandra/gms/EndpointStateTest.java | 159 +++
 .../cassandra/locator/CloudstackSnitchTest.java |   4 +-
 .../apache/cassandra/locator/EC2SnitchTest.java |   4 +-
 .../locator/GoogleCloudSnitchTest.java  |   4 +-
 9 files changed, 283 insertions(+), 88 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bb6bb00/src/java/org/apache/cassandra/gms/EndpointState.java
--
diff --git a/src/java/org/apache/cassandra/gms/EndpointState.java 
b/src/java/org/apache/cassandra/gms/EndpointState.java
index 0e6985a..931da8d 100644
--- a/src/java/org/apache/cassandra/gms/EndpointState.java
+++ b/src/java/org/apache/cassandra/gms/EndpointState.java
@@ -18,7 +18,11 @@
 package org.apache.cassandra.gms;
 
 import java.io.*;
+import java.util.Collections;
+import java.util.EnumMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,8 +31,6 @@ import org.apache.cassandra.db.TypeSizes;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.io.util.DataOutputPlus;
 
-import org.cliffc.high_scale_lib.NonBlockingHashMap;
-
 /**
  * This abstraction represents both the HeartBeatState and the 
ApplicationState in an EndpointState
  * instance. Any state for a given endpoint can be retrieved from this 
instance.
@@ -42,7 +44,7 @@ public class EndpointState
 public final static IVersionedSerializer serializer = new 
EndpointStateSerializer();
 
 private volatile HeartBeatState hbState;
-final Map applicationState = new 
NonBlockingHashMap();
+private final AtomicReference> 
applicationState;
 
 /* fields below do not get serialized */
 private volatile long updateTimestamp;
@@ -50,7 +52,13 @@ public class EndpointState
 
 EndpointState(HeartBeatState initialHbState)
 {
+this(initialHbState, new EnumMap(ApplicationState.class));
+}
+
+EndpointState(HeartBeatState initialHbState, Map states)
+{
 hbState = initialHbState;
+applicationState = new AtomicReference>(new EnumMap<>(states));
 updateTimestamp = System.nanoTime();
 isAlive = true;
 }
@@ -68,21 +76,37 @@ public class EndpointState
 
 public VersionedValue getApplicationState(ApplicationState key)
 {
-return applicationState.get(key);
+return applicationState.get().get(key);
 }
 
-/**
- * TODO replace this with operations that don't expose private state
- */
-@Deprecated
-public Map getApplicationStateMap()
+public Set> states()
+{
+return applicationState.get().entrySet();
+}
+
+public void addApplicationState(ApplicationState key, VersionedValue value)
 {
-return applicationState;
+addApplicationStates(Collections.singletonMap(key, value));
 }
 
-void addApplicationState(ApplicationState key, VersionedValue value)
+public void addApplicationStates(Map 
values)
 {
-applicationState.put(key, value);
+addApplicationStates(values.entrySet());
+}
+
+public void addApplicationStates(Set> values)
+{
+while (true)
+{
+Map orig = 
applicationState.get();
+Map copy = new EnumMap<>(orig);
+
+for (Map.Entry value : values)
+copy.put(value.getKey(),

[03/22] cassandra git commit: Fix NPE in Gossip handleStateNormal

2015-11-11 Thread jmckenzie

Fix NPE in Gossip handleStateNormal

Patch by stefania; reviewed by jknighton for CASSANDRA-10089


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

Branch: refs/heads/cassandra-2.2
Commit: 6bad57fc3cf967838a220d8402db37ed9a5b3b4e
Parents: 3674ad9
Author: Stefania Alborghetti 
Authored: Wed Nov 11 15:02:26 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:02:26 2015 -0500

--
 .../org/apache/cassandra/gms/EndpointState.java |  76 ++---
 .../apache/cassandra/gms/FailureDetector.java   |   7 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  47 +++---
 .../apache/cassandra/gms/VersionedValue.java|   5 +
 .../cassandra/service/StorageService.java   |  65 
 .../apache/cassandra/gms/EndpointStateTest.java | 159 +++
 .../cassandra/locator/CloudstackSnitchTest.java |   8 +-
 .../apache/cassandra/locator/EC2SnitchTest.java |   4 +-
 .../locator/GoogleCloudSnitchTest.java  |   8 +-
 9 files changed, 283 insertions(+), 96 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bad57fc/src/java/org/apache/cassandra/gms/EndpointState.java
--
diff --git a/src/java/org/apache/cassandra/gms/EndpointState.java 
b/src/java/org/apache/cassandra/gms/EndpointState.java
index 1029374..3e29295 100644
--- a/src/java/org/apache/cassandra/gms/EndpointState.java
+++ b/src/java/org/apache/cassandra/gms/EndpointState.java
@@ -18,7 +18,11 @@
 package org.apache.cassandra.gms;
 
 import java.io.*;
+import java.util.Collections;
+import java.util.EnumMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,8 +31,6 @@ import org.apache.cassandra.db.TypeSizes;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.io.util.DataOutputPlus;
 
-import org.cliffc.high_scale_lib.NonBlockingHashMap;
-
 /**
  * This abstraction represents both the HeartBeatState and the 
ApplicationState in an EndpointState
  * instance. Any state for a given endpoint can be retrieved from this 
instance.
@@ -42,7 +44,7 @@ public class EndpointState
 public final static IVersionedSerializer serializer = new 
EndpointStateSerializer();
 
 private volatile HeartBeatState hbState;
-final Map applicationState = new 
NonBlockingHashMap();
+private final AtomicReference> 
applicationState;
 
 /* fields below do not get serialized */
 private volatile long updateTimestamp;
@@ -50,7 +52,13 @@ public class EndpointState
 
 EndpointState(HeartBeatState initialHbState)
 {
+this(initialHbState, new EnumMap(ApplicationState.class));
+}
+
+EndpointState(HeartBeatState initialHbState, Map states)
+{
 hbState = initialHbState;
+applicationState = new AtomicReference>(new EnumMap<>(states));
 updateTimestamp = System.nanoTime();
 isAlive = true;
 }
@@ -68,21 +76,37 @@ public class EndpointState
 
 public VersionedValue getApplicationState(ApplicationState key)
 {
-return applicationState.get(key);
+return applicationState.get().get(key);
 }
 
-/**
- * TODO replace this with operations that don't expose private state
- */
-@Deprecated
-public Map getApplicationStateMap()
+public Set> states()
+{
+return applicationState.get().entrySet();
+}
+
+public void addApplicationState(ApplicationState key, VersionedValue value)
 {
-return applicationState;
+addApplicationStates(Collections.singletonMap(key, value));
 }
 
-void addApplicationState(ApplicationState key, VersionedValue value)
+public void addApplicationStates(Map 
values)
 {
-applicationState.put(key, value);
+addApplicationStates(values.entrySet());
+}
+
+public void addApplicationStates(Set> values)
+{
+while (true)
+{
+Map orig = 
applicationState.get();
+Map copy = new EnumMap<>(orig);
+
+for (Map.Entry

[10/22] cassandra git commit: 10089 - 2.2 patch

2015-11-11 Thread jmckenzie

10089 - 2.2 patch


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

Branch: refs/heads/cassandra-3.0
Commit: 6bb6bb005197c33fa94026d472ff78d4f36613cc
Parents: 87fe1e0
Author: Stefania Alborghetti 
Authored: Wed Nov 11 15:04:25 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:04:25 2015 -0500

--
 .../org/apache/cassandra/gms/EndpointState.java |  76 ++---
 .../apache/cassandra/gms/FailureDetector.java   |   7 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  47 +++---
 .../apache/cassandra/gms/VersionedValue.java|   5 +
 .../cassandra/service/StorageService.java   |  65 
 .../apache/cassandra/gms/EndpointStateTest.java | 159 +++
 .../cassandra/locator/CloudstackSnitchTest.java |   4 +-
 .../apache/cassandra/locator/EC2SnitchTest.java |   4 +-
 .../locator/GoogleCloudSnitchTest.java  |   4 +-
 9 files changed, 283 insertions(+), 88 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bb6bb00/src/java/org/apache/cassandra/gms/EndpointState.java
--
diff --git a/src/java/org/apache/cassandra/gms/EndpointState.java 
b/src/java/org/apache/cassandra/gms/EndpointState.java
index 0e6985a..931da8d 100644
--- a/src/java/org/apache/cassandra/gms/EndpointState.java
+++ b/src/java/org/apache/cassandra/gms/EndpointState.java
@@ -18,7 +18,11 @@
 package org.apache.cassandra.gms;
 
 import java.io.*;
+import java.util.Collections;
+import java.util.EnumMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,8 +31,6 @@ import org.apache.cassandra.db.TypeSizes;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.io.util.DataOutputPlus;
 
-import org.cliffc.high_scale_lib.NonBlockingHashMap;
-
 /**
  * This abstraction represents both the HeartBeatState and the 
ApplicationState in an EndpointState
  * instance. Any state for a given endpoint can be retrieved from this 
instance.
@@ -42,7 +44,7 @@ public class EndpointState
 public final static IVersionedSerializer serializer = new 
EndpointStateSerializer();
 
 private volatile HeartBeatState hbState;
-final Map applicationState = new 
NonBlockingHashMap();
+private final AtomicReference> 
applicationState;
 
 /* fields below do not get serialized */
 private volatile long updateTimestamp;
@@ -50,7 +52,13 @@ public class EndpointState
 
 EndpointState(HeartBeatState initialHbState)
 {
+this(initialHbState, new EnumMap(ApplicationState.class));
+}
+
+EndpointState(HeartBeatState initialHbState, Map states)
+{
 hbState = initialHbState;
+applicationState = new AtomicReference>(new EnumMap<>(states));
 updateTimestamp = System.nanoTime();
 isAlive = true;
 }
@@ -68,21 +76,37 @@ public class EndpointState
 
 public VersionedValue getApplicationState(ApplicationState key)
 {
-return applicationState.get(key);
+return applicationState.get().get(key);
 }
 
-/**
- * TODO replace this with operations that don't expose private state
- */
-@Deprecated
-public Map getApplicationStateMap()
+public Set> states()
+{
+return applicationState.get().entrySet();
+}
+
+public void addApplicationState(ApplicationState key, VersionedValue value)
 {
-return applicationState;
+addApplicationStates(Collections.singletonMap(key, value));
 }
 
-void addApplicationState(ApplicationState key, VersionedValue value)
+public void addApplicationStates(Map 
values)
 {
-applicationState.put(key, value);
+addApplicationStates(values.entrySet());
+}
+
+public void addApplicationStates(Set> values)
+{
+while (true)
+{
+Map orig = 
applicationState.get();
+Map copy = new EnumMap<>(orig);
+
+for (Map.Entry value : values)
+copy.put(value.getKey(),

[11/22] cassandra git commit: 10089 - 2.2 patch

2015-11-11 Thread jmckenzie

10089 - 2.2 patch


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

Branch: refs/heads/cassandra-3.1
Commit: 6bb6bb005197c33fa94026d472ff78d4f36613cc
Parents: 87fe1e0
Author: Stefania Alborghetti 
Authored: Wed Nov 11 15:04:25 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:04:25 2015 -0500

--
 .../org/apache/cassandra/gms/EndpointState.java |  76 ++---
 .../apache/cassandra/gms/FailureDetector.java   |   7 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  47 +++---
 .../apache/cassandra/gms/VersionedValue.java|   5 +
 .../cassandra/service/StorageService.java   |  65 
 .../apache/cassandra/gms/EndpointStateTest.java | 159 +++
 .../cassandra/locator/CloudstackSnitchTest.java |   4 +-
 .../apache/cassandra/locator/EC2SnitchTest.java |   4 +-
 .../locator/GoogleCloudSnitchTest.java  |   4 +-
 9 files changed, 283 insertions(+), 88 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bb6bb00/src/java/org/apache/cassandra/gms/EndpointState.java
--
diff --git a/src/java/org/apache/cassandra/gms/EndpointState.java 
b/src/java/org/apache/cassandra/gms/EndpointState.java
index 0e6985a..931da8d 100644
--- a/src/java/org/apache/cassandra/gms/EndpointState.java
+++ b/src/java/org/apache/cassandra/gms/EndpointState.java
@@ -18,7 +18,11 @@
 package org.apache.cassandra.gms;
 
 import java.io.*;
+import java.util.Collections;
+import java.util.EnumMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,8 +31,6 @@ import org.apache.cassandra.db.TypeSizes;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.io.util.DataOutputPlus;
 
-import org.cliffc.high_scale_lib.NonBlockingHashMap;
-
 /**
  * This abstraction represents both the HeartBeatState and the 
ApplicationState in an EndpointState
  * instance. Any state for a given endpoint can be retrieved from this 
instance.
@@ -42,7 +44,7 @@ public class EndpointState
 public final static IVersionedSerializer serializer = new 
EndpointStateSerializer();
 
 private volatile HeartBeatState hbState;
-final Map applicationState = new 
NonBlockingHashMap();
+private final AtomicReference> 
applicationState;
 
 /* fields below do not get serialized */
 private volatile long updateTimestamp;
@@ -50,7 +52,13 @@ public class EndpointState
 
 EndpointState(HeartBeatState initialHbState)
 {
+this(initialHbState, new EnumMap(ApplicationState.class));
+}
+
+EndpointState(HeartBeatState initialHbState, Map states)
+{
 hbState = initialHbState;
+applicationState = new AtomicReference>(new EnumMap<>(states));
 updateTimestamp = System.nanoTime();
 isAlive = true;
 }
@@ -68,21 +76,37 @@ public class EndpointState
 
 public VersionedValue getApplicationState(ApplicationState key)
 {
-return applicationState.get(key);
+return applicationState.get().get(key);
 }
 
-/**
- * TODO replace this with operations that don't expose private state
- */
-@Deprecated
-public Map getApplicationStateMap()
+public Set> states()
+{
+return applicationState.get().entrySet();
+}
+
+public void addApplicationState(ApplicationState key, VersionedValue value)
 {
-return applicationState;
+addApplicationStates(Collections.singletonMap(key, value));
 }
 
-void addApplicationState(ApplicationState key, VersionedValue value)
+public void addApplicationStates(Map 
values)
 {
-applicationState.put(key, value);
+addApplicationStates(values.entrySet());
+}
+
+public void addApplicationStates(Set> values)
+{
+while (true)
+{
+Map orig = 
applicationState.get();
+Map copy = new EnumMap<>(orig);
+
+for (Map.Entry value : values)
+copy.put(value.getKey(),

[01/22] cassandra git commit: Fix NPE in Gossip handleStateNormal

2015-11-11 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 3674ad9da -> 6bad57fc3
  refs/heads/cassandra-2.2 9fc957cf3 -> 6bb6bb005
  refs/heads/cassandra-3.0 49c9c01f5 -> 9a90e9894
  refs/heads/cassandra-3.1 6f7b38987 -> 1fe90d34b
  refs/heads/trunk 55811e561 -> 7d6dbf897


Fix NPE in Gossip handleStateNormal

Patch by stefania; reviewed by jknighton for CASSANDRA-10089


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

Branch: refs/heads/cassandra-2.1
Commit: 6bad57fc3cf967838a220d8402db37ed9a5b3b4e
Parents: 3674ad9
Author: Stefania Alborghetti 
Authored: Wed Nov 11 15:02:26 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:02:26 2015 -0500

--
 .../org/apache/cassandra/gms/EndpointState.java |  76 ++---
 .../apache/cassandra/gms/FailureDetector.java   |   7 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  47 +++---
 .../apache/cassandra/gms/VersionedValue.java|   5 +
 .../cassandra/service/StorageService.java   |  65 
 .../apache/cassandra/gms/EndpointStateTest.java | 159 +++
 .../cassandra/locator/CloudstackSnitchTest.java |   8 +-
 .../apache/cassandra/locator/EC2SnitchTest.java |   4 +-
 .../locator/GoogleCloudSnitchTest.java  |   8 +-
 9 files changed, 283 insertions(+), 96 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bad57fc/src/java/org/apache/cassandra/gms/EndpointState.java
--
diff --git a/src/java/org/apache/cassandra/gms/EndpointState.java 
b/src/java/org/apache/cassandra/gms/EndpointState.java
index 1029374..3e29295 100644
--- a/src/java/org/apache/cassandra/gms/EndpointState.java
+++ b/src/java/org/apache/cassandra/gms/EndpointState.java
@@ -18,7 +18,11 @@
 package org.apache.cassandra.gms;
 
 import java.io.*;
+import java.util.Collections;
+import java.util.EnumMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,8 +31,6 @@ import org.apache.cassandra.db.TypeSizes;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.io.util.DataOutputPlus;
 
-import org.cliffc.high_scale_lib.NonBlockingHashMap;
-
 /**
  * This abstraction represents both the HeartBeatState and the 
ApplicationState in an EndpointState
  * instance. Any state for a given endpoint can be retrieved from this 
instance.
@@ -42,7 +44,7 @@ public class EndpointState
 public final static IVersionedSerializer serializer = new 
EndpointStateSerializer();
 
 private volatile HeartBeatState hbState;
-final Map applicationState = new 
NonBlockingHashMap();
+private final AtomicReference> 
applicationState;
 
 /* fields below do not get serialized */
 private volatile long updateTimestamp;
@@ -50,7 +52,13 @@ public class EndpointState
 
 EndpointState(HeartBeatState initialHbState)
 {
+this(initialHbState, new EnumMap(ApplicationState.class));
+}
+
+EndpointState(HeartBeatState initialHbState, Map states)
+{
 hbState = initialHbState;
+applicationState = new AtomicReference>(new EnumMap<>(states));
 updateTimestamp = System.nanoTime();
 isAlive = true;
 }
@@ -68,21 +76,37 @@ public class EndpointState
 
 public VersionedValue getApplicationState(ApplicationState key)
 {
-return applicationState.get(key);
+return applicationState.get().get(key);
 }
 
-/**
- * TODO replace this with operations that don't expose private state
- */
-@Deprecated
-public Map getApplicationStateMap()
+public Set> states()
+{
+return applicationState.get().entrySet();
+}
+
+public void addApplicationState(ApplicationState key, VersionedValue value)
 {
-return applicationState;
+addApplicationStates(Collections.singletonMap(key, value));
 }
 
-void addApplicationState(ApplicationState key, VersionedValue value)
+public void addApplicationStates(Map 
values)
 {
-applicationState.put(key, value);
+addApplicationStates(values.entrySet());
+}
+
+public void

[21/22] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

2015-11-11 Thread jmckenzie

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: 1fe90d34bb7282df0b383289b13a9a190162ce4a
Parents: 6f7b389 9a90e98
Author: Joshua McKenzie 
Authored: Wed Nov 11 15:06:08 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:06:08 2015 -0500

--
 .../org/apache/cassandra/gms/EndpointState.java |  76 ++---
 .../apache/cassandra/gms/FailureDetector.java   |   7 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  47 +++---
 .../apache/cassandra/gms/VersionedValue.java|   5 +
 .../cassandra/service/StorageService.java   |  61 ---
 .../apache/cassandra/gms/EndpointStateTest.java | 159 +++
 .../cassandra/locator/CloudstackSnitchTest.java |   4 +-
 .../apache/cassandra/locator/EC2SnitchTest.java |   4 +-
 .../locator/GoogleCloudSnitchTest.java  |   4 +-
 9 files changed, 282 insertions(+), 85 deletions(-)
--

[20/22] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

2015-11-11 Thread jmckenzie

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/cassandra-3.1
Commit: 1fe90d34bb7282df0b383289b13a9a190162ce4a
Parents: 6f7b389 9a90e98
Author: Joshua McKenzie 
Authored: Wed Nov 11 15:06:08 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:06:08 2015 -0500

--
 .../org/apache/cassandra/gms/EndpointState.java |  76 ++---
 .../apache/cassandra/gms/FailureDetector.java   |   7 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  47 +++---
 .../apache/cassandra/gms/VersionedValue.java|   5 +
 .../cassandra/service/StorageService.java   |  61 ---
 .../apache/cassandra/gms/EndpointStateTest.java | 159 +++
 .../cassandra/locator/CloudstackSnitchTest.java |   4 +-
 .../apache/cassandra/locator/EC2SnitchTest.java |   4 +-
 .../locator/GoogleCloudSnitchTest.java  |   4 +-
 9 files changed, 282 insertions(+), 85 deletions(-)
--

[04/22] cassandra git commit: Fix NPE in Gossip handleStateNormal

2015-11-11 Thread jmckenzie

Fix NPE in Gossip handleStateNormal

Patch by stefania; reviewed by jknighton for CASSANDRA-10089


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

Branch: refs/heads/trunk
Commit: 6bad57fc3cf967838a220d8402db37ed9a5b3b4e
Parents: 3674ad9
Author: Stefania Alborghetti 
Authored: Wed Nov 11 15:02:26 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:02:26 2015 -0500

--
 .../org/apache/cassandra/gms/EndpointState.java |  76 ++---
 .../apache/cassandra/gms/FailureDetector.java   |   7 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  47 +++---
 .../apache/cassandra/gms/VersionedValue.java|   5 +
 .../cassandra/service/StorageService.java   |  65 
 .../apache/cassandra/gms/EndpointStateTest.java | 159 +++
 .../cassandra/locator/CloudstackSnitchTest.java |   8 +-
 .../apache/cassandra/locator/EC2SnitchTest.java |   4 +-
 .../locator/GoogleCloudSnitchTest.java  |   8 +-
 9 files changed, 283 insertions(+), 96 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bad57fc/src/java/org/apache/cassandra/gms/EndpointState.java
--
diff --git a/src/java/org/apache/cassandra/gms/EndpointState.java 
b/src/java/org/apache/cassandra/gms/EndpointState.java
index 1029374..3e29295 100644
--- a/src/java/org/apache/cassandra/gms/EndpointState.java
+++ b/src/java/org/apache/cassandra/gms/EndpointState.java
@@ -18,7 +18,11 @@
 package org.apache.cassandra.gms;
 
 import java.io.*;
+import java.util.Collections;
+import java.util.EnumMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,8 +31,6 @@ import org.apache.cassandra.db.TypeSizes;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.io.util.DataOutputPlus;
 
-import org.cliffc.high_scale_lib.NonBlockingHashMap;
-
 /**
  * This abstraction represents both the HeartBeatState and the 
ApplicationState in an EndpointState
  * instance. Any state for a given endpoint can be retrieved from this 
instance.
@@ -42,7 +44,7 @@ public class EndpointState
 public final static IVersionedSerializer serializer = new 
EndpointStateSerializer();
 
 private volatile HeartBeatState hbState;
-final Map applicationState = new 
NonBlockingHashMap();
+private final AtomicReference> 
applicationState;
 
 /* fields below do not get serialized */
 private volatile long updateTimestamp;
@@ -50,7 +52,13 @@ public class EndpointState
 
 EndpointState(HeartBeatState initialHbState)
 {
+this(initialHbState, new EnumMap(ApplicationState.class));
+}
+
+EndpointState(HeartBeatState initialHbState, Map states)
+{
 hbState = initialHbState;
+applicationState = new AtomicReference>(new EnumMap<>(states));
 updateTimestamp = System.nanoTime();
 isAlive = true;
 }
@@ -68,21 +76,37 @@ public class EndpointState
 
 public VersionedValue getApplicationState(ApplicationState key)
 {
-return applicationState.get(key);
+return applicationState.get().get(key);
 }
 
-/**
- * TODO replace this with operations that don't expose private state
- */
-@Deprecated
-public Map getApplicationStateMap()
+public Set> states()
+{
+return applicationState.get().entrySet();
+}
+
+public void addApplicationState(ApplicationState key, VersionedValue value)
 {
-return applicationState;
+addApplicationStates(Collections.singletonMap(key, value));
 }
 
-void addApplicationState(ApplicationState key, VersionedValue value)
+public void addApplicationStates(Map 
values)
 {
-applicationState.put(key, value);
+addApplicationStates(values.entrySet());
+}
+
+public void addApplicationStates(Set> values)
+{
+while (true)
+{
+Map orig = 
applicationState.get();
+Map copy = new EnumMap<>(orig);
+
+for (Map.Entry

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

2015-11-11 Thread jmckenzie

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: 87fe1e09f15b373fd74473dddee12e289287b7aa
Parents: 9fc957c 6bad57f
Author: Joshua McKenzie 
Authored: Wed Nov 11 15:03:24 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:03:24 2015 -0500

--

--

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

2015-11-11 Thread jmckenzie

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.1
Commit: 87fe1e09f15b373fd74473dddee12e289287b7aa
Parents: 9fc957c 6bad57f
Author: Joshua McKenzie 
Authored: Wed Nov 11 15:03:24 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Nov 11 15:03:24 2015 -0500

--

--

[1/6] cassandra git commit: Redirect stderr/stdout to console on Windows launch. Add -q to quiet if desired.

2015-11-06 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 cb429063c -> f8783b7bb
  refs/heads/cassandra-3.0 39bc5de68 -> 97dc8d525
  refs/heads/trunk 33f5dc578 -> a2c14f852


Redirect stderr/stdout to console on Windows launch. Add -q to quiet if desired.

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10641


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

Branch: refs/heads/cassandra-2.2
Commit: f8783b7bb1bd16d29565c3be86480a7188e91ee0
Parents: cb42906
Author: Joshua McKenzie <jmcken...@apache.org>
Authored: Fri Nov 6 13:42:14 2015 -0500
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Fri Nov 6 13:42:14 2015 -0500

--
 bin/cassandra.ps1 | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8783b7b/bin/cassandra.ps1
--
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 44ba9a4..25b701b 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -17,7 +17,7 @@
 Function PrintUsage
 {
 echo @"
-usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-D arg] [-E 
errorfile] [-install | -uninstall] [-help]
+usage: cassandra.ps1 [-f] [-h] [-q] [-a] [-p pidfile] [-H dumpfile] [-D arg] 
[-E errorfile] [-install | -uninstall] [-help]
 -f  Run cassandra in foreground
 -installinstall cassandra as a service
 -uninstall  remove cassandra service
@@ -28,6 +28,7 @@ usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-D 
arg] [-E errorfile
 -v  Print cassandra version and exit
 -s  Show detailed jvm environment information during launch
 -a  Aggressive startup. Skip VerifyPorts check. For use in dev 
environments.
+-q  Quiet output. Does not print stdout/stderr to console 
(when run without -f)
 -help   print this message
 
 NOTE: installing cassandra as a service requires Commons Daemon Service 
Runner
@@ -253,7 +254,14 @@ $env:JAVA_BIN
 }
 else
 {
-$proc = Start-Process -FilePath "$cmd" -ArgumentList 
$arg1,$arg2,$arg3,$arg4 -PassThru -WindowStyle Hidden
+if ($q)
+{
+$proc = Start-Process -FilePath "$cmd" -ArgumentList 
$arg1,$arg2,$arg3,$arg4 -PassThru -WindowStyle Hidden
+}
+else
+{
+$proc = Start-Process -FilePath "$cmd" -ArgumentList 
$arg1,$arg2,$arg3,$arg4 -PassThru -NoNewWindow
+}
 
 $exitCode = $?
 
@@ -366,6 +374,7 @@ for ($i = 0; $i -lt $args.count; $i++)
 "-H"{ $H = $args[++$i]; CheckEmptyParam($H) }
 "-E"{ $E = $args[++$i]; CheckEmptyParam($E) }
 "-a"{ $a = $True }
+"-q"{ $q = $True }
 default
 {
 "Invalid argument: " + $args[$i];

[3/6] cassandra git commit: Redirect stderr/stdout to console on Windows launch. Add -q to quiet if desired.

2015-11-06 Thread jmckenzie

Redirect stderr/stdout to console on Windows launch. Add -q to quiet if desired.

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10641


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

Branch: refs/heads/trunk
Commit: f8783b7bb1bd16d29565c3be86480a7188e91ee0
Parents: cb42906
Author: Joshua McKenzie <jmcken...@apache.org>
Authored: Fri Nov 6 13:42:14 2015 -0500
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Fri Nov 6 13:42:14 2015 -0500

--
 bin/cassandra.ps1 | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8783b7b/bin/cassandra.ps1
--
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 44ba9a4..25b701b 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -17,7 +17,7 @@
 Function PrintUsage
 {
 echo @"
-usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-D arg] [-E 
errorfile] [-install | -uninstall] [-help]
+usage: cassandra.ps1 [-f] [-h] [-q] [-a] [-p pidfile] [-H dumpfile] [-D arg] 
[-E errorfile] [-install | -uninstall] [-help]
 -f  Run cassandra in foreground
 -installinstall cassandra as a service
 -uninstall  remove cassandra service
@@ -28,6 +28,7 @@ usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-D 
arg] [-E errorfile
 -v  Print cassandra version and exit
 -s  Show detailed jvm environment information during launch
 -a  Aggressive startup. Skip VerifyPorts check. For use in dev 
environments.
+-q  Quiet output. Does not print stdout/stderr to console 
(when run without -f)
 -help   print this message
 
 NOTE: installing cassandra as a service requires Commons Daemon Service 
Runner
@@ -253,7 +254,14 @@ $env:JAVA_BIN
 }
 else
 {
-$proc = Start-Process -FilePath "$cmd" -ArgumentList 
$arg1,$arg2,$arg3,$arg4 -PassThru -WindowStyle Hidden
+if ($q)
+{
+$proc = Start-Process -FilePath "$cmd" -ArgumentList 
$arg1,$arg2,$arg3,$arg4 -PassThru -WindowStyle Hidden
+}
+else
+{
+$proc = Start-Process -FilePath "$cmd" -ArgumentList 
$arg1,$arg2,$arg3,$arg4 -PassThru -NoNewWindow
+}
 
 $exitCode = $?
 
@@ -366,6 +374,7 @@ for ($i = 0; $i -lt $args.count; $i++)
 "-H"{ $H = $args[++$i]; CheckEmptyParam($H) }
 "-E"{ $E = $args[++$i]; CheckEmptyParam($E) }
 "-a"{ $a = $True }
+"-q"{ $q = $True }
 default
 {
 "Invalid argument: " + $args[$i];

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

2015-11-06 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 97dc8d525574a68a43fb05cf41d88c3342a68e72
Parents: 39bc5de f8783b7
Author: Joshua McKenzie 
Authored: Fri Nov 6 13:42:49 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 6 13:42:49 2015 -0500

--
 bin/cassandra.ps1 | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)
--

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

2015-11-06 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 97dc8d525574a68a43fb05cf41d88c3342a68e72
Parents: 39bc5de f8783b7
Author: Joshua McKenzie 
Authored: Fri Nov 6 13:42:49 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 6 13:42:49 2015 -0500

--
 bin/cassandra.ps1 | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)
--

[2/6] cassandra git commit: Redirect stderr/stdout to console on Windows launch. Add -q to quiet if desired.

2015-11-06 Thread jmckenzie

Redirect stderr/stdout to console on Windows launch. Add -q to quiet if desired.

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10641


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

Branch: refs/heads/cassandra-3.0
Commit: f8783b7bb1bd16d29565c3be86480a7188e91ee0
Parents: cb42906
Author: Joshua McKenzie <jmcken...@apache.org>
Authored: Fri Nov 6 13:42:14 2015 -0500
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Fri Nov 6 13:42:14 2015 -0500

--
 bin/cassandra.ps1 | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8783b7b/bin/cassandra.ps1
--
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 44ba9a4..25b701b 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -17,7 +17,7 @@
 Function PrintUsage
 {
 echo @"
-usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-D arg] [-E 
errorfile] [-install | -uninstall] [-help]
+usage: cassandra.ps1 [-f] [-h] [-q] [-a] [-p pidfile] [-H dumpfile] [-D arg] 
[-E errorfile] [-install | -uninstall] [-help]
 -f  Run cassandra in foreground
 -installinstall cassandra as a service
 -uninstall  remove cassandra service
@@ -28,6 +28,7 @@ usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-D 
arg] [-E errorfile
 -v  Print cassandra version and exit
 -s  Show detailed jvm environment information during launch
 -a  Aggressive startup. Skip VerifyPorts check. For use in dev 
environments.
+-q  Quiet output. Does not print stdout/stderr to console 
(when run without -f)
 -help   print this message
 
 NOTE: installing cassandra as a service requires Commons Daemon Service 
Runner
@@ -253,7 +254,14 @@ $env:JAVA_BIN
 }
 else
 {
-$proc = Start-Process -FilePath "$cmd" -ArgumentList 
$arg1,$arg2,$arg3,$arg4 -PassThru -WindowStyle Hidden
+if ($q)
+{
+$proc = Start-Process -FilePath "$cmd" -ArgumentList 
$arg1,$arg2,$arg3,$arg4 -PassThru -WindowStyle Hidden
+}
+else
+{
+$proc = Start-Process -FilePath "$cmd" -ArgumentList 
$arg1,$arg2,$arg3,$arg4 -PassThru -NoNewWindow
+}
 
 $exitCode = $?
 
@@ -366,6 +374,7 @@ for ($i = 0; $i -lt $args.count; $i++)
 "-H"{ $H = $args[++$i]; CheckEmptyParam($H) }
 "-E"{ $E = $args[++$i]; CheckEmptyParam($E) }
 "-a"{ $a = $True }
+"-q"{ $q = $True }
 default
 {
 "Invalid argument: " + $args[$i];

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

2015-11-06 Thread jmckenzie

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: a2c14f85244ac12e232b459137853a37a19dcfdd
Parents: 33f5dc5 97dc8d5
Author: Joshua McKenzie 
Authored: Fri Nov 6 13:42:59 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 6 13:42:59 2015 -0500

--
 bin/cassandra.ps1 | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)
--

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

2015-10-14 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 5f5e9602df803ba34260a62e12faec33a98dd428
Parents: 1415fa5 7875326
Author: Joshua McKenzie 
Authored: Wed Oct 14 14:44:24 2015 -0400
Committer: Joshua McKenzie 
Committed: Wed Oct 14 14:44:24 2015 -0400

--
 bin/cassandra.ps1 | 8 
 1 file changed, 8 insertions(+)
--

[3/6] cassandra git commit: Add -a option to skip TIME_WAIT port check on Windows startup

2015-10-14 Thread jmckenzie

Add -a option to skip TIME_WAIT port check on Windows startup

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10524


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

Branch: refs/heads/trunk
Commit: 78753263e52ada59f8836e83f00c0613488df87e
Parents: 25366f7
Author: Joshua McKenzie <jmcken...@apache.org>
Authored: Wed Oct 14 14:43:32 2015 -0400
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Wed Oct 14 14:43:32 2015 -0400

--
 bin/cassandra.ps1 | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/78753263/bin/cassandra.ps1
--
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 5cc99aa..8cdd433 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -27,6 +27,7 @@ usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-D 
arg] [-E errorfile
 -E  change JVM ErrorFile
 -v  Print cassandra version and exit
 -s  Show detailed jvm environment information during launch
+-a  Aggressive startup. Ignore ports that are TIME_WAIT for 
VerifyPorts check.
 -help   print this message
 
 NOTE: installing cassandra as a service requires Commons Daemon Service 
Runner
@@ -307,6 +308,10 @@ Function VerifyPortsAreAvailable
 {
 if ($line -match "TCP" -and $line -match $portRegex)
 {
+if ($a -and $line -match "TIME_WAIT")
+{
+   continue
+}
 Write-Error "Found a port already in use. Aborting startup"
 Write-Error $line
 Exit
@@ -352,12 +357,15 @@ for ($i = 0; $i -lt $args.count; $i++)
 "-install"  { $install = $True }
 "-uninstall"{ $uninstall = $True }
 "-help" { PrintUsage }
+"-?"{ PrintUsage }
+"--help"{ PrintUsage }
 "-v"{ $v = $True }
 "-f"{ $f = $True }
 "-s"{ $s = $True }
 "-p"{ $p = $args[++$i]; CheckEmptyParam($p) }
 "-H"{ $H = $args[++$i]; CheckEmptyParam($H) }
 "-E"{ $E = $args[++$i]; CheckEmptyParam($E) }
+"-a"{ $a = $True }
 default
 {
 "Invalid argument: " + $args[$i];

[2/3] cassandra git commit: Revert 7486, make CMS default GC, move gc opts to conf/jvm.options

2015-10-14 Thread jmckenzie

Revert 7486, make CMS default GC, move gc opts to conf/jvm.options

Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10403


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

Branch: refs/heads/trunk
Commit: 1415fa512a21b933f89f8ff25b3fd12cfbbbf4cb
Parents: ebb2b1b
Author: Paulo Motta <pauloricard...@gmail.com>
Authored: Wed Oct 14 14:36:52 2015 -0400
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Wed Oct 14 14:36:52 2015 -0400

--
 CHANGES.txt  |   2 +
 NEWS.txt |   2 +-
 conf/cassandra-env.ps1   | 122 --
 conf/cassandra-env.sh| 134 --
 conf/jvm.options | 105 +
 debian/cassandra.install |   1 +
 debian/init  |   1 +
 7 files changed, 280 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1415fa51/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 54b505a..66e34b6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 3.0-rc2
+ * Revert CASSANDRA-7486, make CMS default GC, move GC config to
+   conf/jvm.options (CASSANDRA-10403)
  * Fix TeeingAppender causing some logs to be truncated/empty (CASSANDRA-10447)
  * Allow EACH_QUORUM for reads (CASSANDRA-9602)
  * Fix potential ClassCastException while upgrading (CASSANDRA-10468)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1415fa51/NEWS.txt
--
diff --git a/NEWS.txt b/NEWS.txt
index 1176dcd..9ff43a2 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -54,7 +54,7 @@ Upgrading
- Max mutation size is now configurable via max_mutation_size_in_kb setting 
in
  cassandra.yaml; the default is half the size commitlog_segment_size_in_mb 
* 1024.
- 3.0 requires Java 8u40 or later.
-   - The default JVM GC has been changed to G1GC.
+   - Garbage collection options were moved from cassandra-env to jvm.options 
file.
- New transaction log files have been introduced to replace the 
compactions_in_progress
  system table, temporary file markers (tmp and tmplink) and sstable 
ancerstors.
  Therefore, compaction metadata no longer contains ancestors. Transaction 
log files

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1415fa51/conf/cassandra-env.ps1
--
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 7a4a61e..3c9d815 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -128,16 +128,18 @@ Function CalculateHeapSizes
 }
 
 # Validate that we need to run this function and that our config is good
-if ($env:MAX_HEAP_SIZE)
+if (($env:MAX_HEAP_SIZE -and !$env:HEAP_NEWSIZE) -or (!$env:MAX_HEAP_SIZE 
-and $env:HEAP_NEWSIZE))
 {
-return
+echo "Please set or unset MAX_HEAP_SIZE and HEAP_NEWSIZE in pairs.  
Aborting startup."
+exit 1
 }
 
 $memObject = Get-WMIObject -class win32_physicalmemory
 if ($memObject -eq $null)
 {
-echo "WARNING!  Could not determine system memory.  Defaulting to 2G 
heap.  Manually override in conf\cassandra-env.ps1 for different heap values."
+echo "WARNING!  Could not determine system memory.  Defaulting to 2G 
heap, 512M newgen.  Manually override in conf\jvm.options for different heap 
values."
 $env:MAX_HEAP_SIZE = "2048M"
+$env:HEAP_NEWSIZE = "512M"
 return
 }
 
@@ -174,6 +176,20 @@ Function CalculateHeapSizes
 $maxHeapMB = $quarterMem
 }
 $env:MAX_HEAP_SIZE = [System.Convert]::ToString($maxHeapMB) + "M"
+
+# Young gen: min(max_sensible_per_modern_cpu_core * num_cores, 1/4
+$maxYGPerCore = 100
+$maxYGTotal = $maxYGPerCore * $systemCores
+$desiredYG = [Math]::Truncate($maxHeapMB / 4)
+
+if ($desiredYG -gt $maxYGTotal)
+{
+$env:HEAP_NEWSIZE = [System.Convert]::ToString($maxYGTotal) + "M"
+}
+else
+{
+$env:HEAP_NEWSIZE = [System.Convert]::ToString($desiredYG) + "M"
+}
 }
 
 #-
@@ -294,12 +310,71 @@ Function SetCassandraEnvironment
 # Override these to set the amount of memory to allocate to the JVM at
 # start-up. For production use you may wish to adjust this for your
 # environment. MAX_HEAP_SIZE is the total amount of memory dedicated
-# to the Java heap.
+

[1/6] cassandra git commit: Add -a option to skip TIME_WAIT port check on Windows startup

2015-10-14 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 25366f7d4 -> 78753263e
  refs/heads/cassandra-3.0 1415fa512 -> 5f5e9602d
  refs/heads/trunk d4a297640 -> d87aab987


Add -a option to skip TIME_WAIT port check on Windows startup

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10524


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

Branch: refs/heads/cassandra-2.2
Commit: 78753263e52ada59f8836e83f00c0613488df87e
Parents: 25366f7
Author: Joshua McKenzie <jmcken...@apache.org>
Authored: Wed Oct 14 14:43:32 2015 -0400
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Wed Oct 14 14:43:32 2015 -0400

--
 bin/cassandra.ps1 | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/78753263/bin/cassandra.ps1
--
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 5cc99aa..8cdd433 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -27,6 +27,7 @@ usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-D 
arg] [-E errorfile
 -E  change JVM ErrorFile
 -v  Print cassandra version and exit
 -s  Show detailed jvm environment information during launch
+-a  Aggressive startup. Ignore ports that are TIME_WAIT for 
VerifyPorts check.
 -help   print this message
 
 NOTE: installing cassandra as a service requires Commons Daemon Service 
Runner
@@ -307,6 +308,10 @@ Function VerifyPortsAreAvailable
 {
 if ($line -match "TCP" -and $line -match $portRegex)
 {
+if ($a -and $line -match "TIME_WAIT")
+{
+   continue
+}
 Write-Error "Found a port already in use. Aborting startup"
 Write-Error $line
 Exit
@@ -352,12 +357,15 @@ for ($i = 0; $i -lt $args.count; $i++)
 "-install"  { $install = $True }
 "-uninstall"{ $uninstall = $True }
 "-help" { PrintUsage }
+"-?"{ PrintUsage }
+"--help"{ PrintUsage }
 "-v"{ $v = $True }
 "-f"{ $f = $True }
 "-s"{ $s = $True }
 "-p"{ $p = $args[++$i]; CheckEmptyParam($p) }
 "-H"{ $H = $args[++$i]; CheckEmptyParam($H) }
 "-E"{ $E = $args[++$i]; CheckEmptyParam($E) }
+"-a"{ $a = $True }
 default
 {
 "Invalid argument: " + $args[$i];

[2/6] cassandra git commit: Add -a option to skip TIME_WAIT port check on Windows startup

2015-10-14 Thread jmckenzie

Add -a option to skip TIME_WAIT port check on Windows startup

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10524


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

Branch: refs/heads/cassandra-3.0
Commit: 78753263e52ada59f8836e83f00c0613488df87e
Parents: 25366f7
Author: Joshua McKenzie <jmcken...@apache.org>
Authored: Wed Oct 14 14:43:32 2015 -0400
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Wed Oct 14 14:43:32 2015 -0400

--
 bin/cassandra.ps1 | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/78753263/bin/cassandra.ps1
--
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 5cc99aa..8cdd433 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -27,6 +27,7 @@ usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-D 
arg] [-E errorfile
 -E  change JVM ErrorFile
 -v  Print cassandra version and exit
 -s  Show detailed jvm environment information during launch
+-a  Aggressive startup. Ignore ports that are TIME_WAIT for 
VerifyPorts check.
 -help   print this message
 
 NOTE: installing cassandra as a service requires Commons Daemon Service 
Runner
@@ -307,6 +308,10 @@ Function VerifyPortsAreAvailable
 {
 if ($line -match "TCP" -and $line -match $portRegex)
 {
+if ($a -and $line -match "TIME_WAIT")
+{
+   continue
+}
 Write-Error "Found a port already in use. Aborting startup"
 Write-Error $line
 Exit
@@ -352,12 +357,15 @@ for ($i = 0; $i -lt $args.count; $i++)
 "-install"  { $install = $True }
 "-uninstall"{ $uninstall = $True }
 "-help" { PrintUsage }
+"-?"{ PrintUsage }
+"--help"{ PrintUsage }
 "-v"{ $v = $True }
 "-f"{ $f = $True }
 "-s"{ $s = $True }
 "-p"{ $p = $args[++$i]; CheckEmptyParam($p) }
 "-H"{ $H = $args[++$i]; CheckEmptyParam($H) }
 "-E"{ $E = $args[++$i]; CheckEmptyParam($E) }
+"-a"{ $a = $True }
 default
 {
 "Invalid argument: " + $args[$i];

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

2015-10-14 Thread jmckenzie

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: d87aab9872ca7d47f21562146e73f4f702bd5961
Parents: d4a2976 5f5e960
Author: Joshua McKenzie 
Authored: Wed Oct 14 14:44:52 2015 -0400
Committer: Joshua McKenzie 
Committed: Wed Oct 14 14:44:52 2015 -0400

--
 bin/cassandra.ps1 | 8 
 1 file changed, 8 insertions(+)
--

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

2015-10-14 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 5f5e9602df803ba34260a62e12faec33a98dd428
Parents: 1415fa5 7875326
Author: Joshua McKenzie 
Authored: Wed Oct 14 14:44:24 2015 -0400
Committer: Joshua McKenzie 
Committed: Wed Oct 14 14:44:24 2015 -0400

--
 bin/cassandra.ps1 | 8 
 1 file changed, 8 insertions(+)
--

[1/3] cassandra git commit: Revert 7486, make CMS default GC, move gc opts to conf/jvm.options

2015-10-14 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 ebb2b1bed -> 1415fa512
  refs/heads/trunk bcd921c3c -> d4a297640


Revert 7486, make CMS default GC, move gc opts to conf/jvm.options

Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10403


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

Branch: refs/heads/cassandra-3.0
Commit: 1415fa512a21b933f89f8ff25b3fd12cfbbbf4cb
Parents: ebb2b1b
Author: Paulo Motta <pauloricard...@gmail.com>
Authored: Wed Oct 14 14:36:52 2015 -0400
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Wed Oct 14 14:36:52 2015 -0400

--
 CHANGES.txt  |   2 +
 NEWS.txt |   2 +-
 conf/cassandra-env.ps1   | 122 --
 conf/cassandra-env.sh| 134 --
 conf/jvm.options | 105 +
 debian/cassandra.install |   1 +
 debian/init  |   1 +
 7 files changed, 280 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1415fa51/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 54b505a..66e34b6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 3.0-rc2
+ * Revert CASSANDRA-7486, make CMS default GC, move GC config to
+   conf/jvm.options (CASSANDRA-10403)
  * Fix TeeingAppender causing some logs to be truncated/empty (CASSANDRA-10447)
  * Allow EACH_QUORUM for reads (CASSANDRA-9602)
  * Fix potential ClassCastException while upgrading (CASSANDRA-10468)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1415fa51/NEWS.txt
--
diff --git a/NEWS.txt b/NEWS.txt
index 1176dcd..9ff43a2 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -54,7 +54,7 @@ Upgrading
- Max mutation size is now configurable via max_mutation_size_in_kb setting 
in
  cassandra.yaml; the default is half the size commitlog_segment_size_in_mb 
* 1024.
- 3.0 requires Java 8u40 or later.
-   - The default JVM GC has been changed to G1GC.
+   - Garbage collection options were moved from cassandra-env to jvm.options 
file.
- New transaction log files have been introduced to replace the 
compactions_in_progress
  system table, temporary file markers (tmp and tmplink) and sstable 
ancerstors.
  Therefore, compaction metadata no longer contains ancestors. Transaction 
log files

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1415fa51/conf/cassandra-env.ps1
--
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 7a4a61e..3c9d815 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -128,16 +128,18 @@ Function CalculateHeapSizes
 }
 
 # Validate that we need to run this function and that our config is good
-if ($env:MAX_HEAP_SIZE)
+if (($env:MAX_HEAP_SIZE -and !$env:HEAP_NEWSIZE) -or (!$env:MAX_HEAP_SIZE 
-and $env:HEAP_NEWSIZE))
 {
-return
+echo "Please set or unset MAX_HEAP_SIZE and HEAP_NEWSIZE in pairs.  
Aborting startup."
+exit 1
 }
 
 $memObject = Get-WMIObject -class win32_physicalmemory
 if ($memObject -eq $null)
 {
-echo "WARNING!  Could not determine system memory.  Defaulting to 2G 
heap.  Manually override in conf\cassandra-env.ps1 for different heap values."
+echo "WARNING!  Could not determine system memory.  Defaulting to 2G 
heap, 512M newgen.  Manually override in conf\jvm.options for different heap 
values."
 $env:MAX_HEAP_SIZE = "2048M"
+$env:HEAP_NEWSIZE = "512M"
 return
 }
 
@@ -174,6 +176,20 @@ Function CalculateHeapSizes
 $maxHeapMB = $quarterMem
 }
 $env:MAX_HEAP_SIZE = [System.Convert]::ToString($maxHeapMB) + "M"
+
+# Young gen: min(max_sensible_per_modern_cpu_core * num_cores, 1/4
+$maxYGPerCore = 100
+$maxYGTotal = $maxYGPerCore * $systemCores
+$desiredYG = [Math]::Truncate($maxHeapMB / 4)
+
+if ($desiredYG -gt $maxYGTotal)
+{
+$env:HEAP_NEWSIZE = [System.Convert]::ToString($maxYGTotal) + "M"
+}
+else
+{
+$env:HEAP_NEWSIZE = [System.Convert]::ToString($desiredYG) + "M"
+}
 }
 
 #-
@@ -294,12 +310,71 @@ Function SetCassandraEnvironment
 # Override these to set the amount of memory to allocate to the JVM at
 # start-up. For

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

2015-10-14 Thread jmckenzie

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: d4a297640d16d537b22569d0732f80b031da3917
Parents: bcd921c 1415fa5
Author: Joshua McKenzie 
Authored: Wed Oct 14 14:38:11 2015 -0400
Committer: Joshua McKenzie 
Committed: Wed Oct 14 14:38:11 2015 -0400

--
 CHANGES.txt  |   2 +
 NEWS.txt |   2 +-
 conf/cassandra-env.ps1   | 122 --
 conf/cassandra-env.sh| 134 --
 conf/jvm.options | 105 +
 debian/cassandra.install |   1 +
 debian/init  |   1 +
 7 files changed, 280 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4a29764/CHANGES.txt
--
diff --cc CHANGES.txt
index 7a74ec8,66e34b6..a3a1740
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,6 +1,11 @@@
 +3.2
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0-rc2
+  * Revert CASSANDRA-7486, make CMS default GC, move GC config to
+conf/jvm.options (CASSANDRA-10403)
   * Fix TeeingAppender causing some logs to be truncated/empty 
(CASSANDRA-10447)
   * Allow EACH_QUORUM for reads (CASSANDRA-9602)
   * Fix potential ClassCastException while upgrading (CASSANDRA-10468)

[1/8] cassandra git commit: Make Windows -a startup skip VerifyPorts check entirely

2015-10-19 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 3cd750012 -> 728f94e79
  refs/heads/cassandra-3.0 7159a754a -> fa909cc42
  refs/heads/trunk c0c513b64 -> a9060f033


Make Windows -a startup skip VerifyPorts check entirely

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10524


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

Branch: refs/heads/cassandra-2.2
Commit: 728f94e798662bf8e0e4ad0f4d236394868cb7d6
Parents: 3cd7500
Author: Joshua McKenzie <jmcken...@apache.org>
Authored: Mon Oct 19 15:11:07 2015 -0400
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Mon Oct 19 15:11:07 2015 -0400

--
 bin/cassandra.ps1 | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/728f94e7/bin/cassandra.ps1
--
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 8cdd433..44ba9a4 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -27,7 +27,7 @@ usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-D 
arg] [-E errorfile
 -E  change JVM ErrorFile
 -v  Print cassandra version and exit
 -s  Show detailed jvm environment information during launch
--a  Aggressive startup. Ignore ports that are TIME_WAIT for 
VerifyPorts check.
+-a  Aggressive startup. Skip VerifyPorts check. For use in dev 
environments.
 -help   print this message
 
 NOTE: installing cassandra as a service requires Commons Daemon Service 
Runner
@@ -281,6 +281,10 @@ WARNING! Failed to write pidfile to $pidfile.  
stop-server.bat and
 #-
 Function VerifyPortsAreAvailable
 {
+if ($a)
+{
+return
+}
 # Need to confirm 5 different ports are available or die if any are 
currently bound
 # From cassandra.yaml:
 #   storage_port
@@ -308,10 +312,6 @@ Function VerifyPortsAreAvailable
 {
 if ($line -match "TCP" -and $line -match $portRegex)
 {
-if ($a -and $line -match "TIME_WAIT")
-{
-   continue
-}
 Write-Error "Found a port already in use. Aborting startup"
 Write-Error $line
 Exit

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

2015-10-19 Thread jmckenzie

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: a9060f0335b4a7e4dd38b6ea012ae9d2c6f3d2a7
Parents: c0c513b fa909cc
Author: Joshua McKenzie 
Authored: Mon Oct 19 15:12:57 2015 -0400
Committer: Joshua McKenzie 
Committed: Mon Oct 19 15:12:57 2015 -0400

--
 bin/cassandra.ps1  | 10 +-
 conf/cassandra-env.ps1 |  5 +
 2 files changed, 10 insertions(+), 5 deletions(-)
--

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

2015-10-19 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: f807b8c6ed1af297d29314399b9f250a966581f4
Parents: 7159a75 728f94e
Author: Joshua McKenzie 
Authored: Mon Oct 19 15:11:43 2015 -0400
Committer: Joshua McKenzie 
Committed: Mon Oct 19 15:11:43 2015 -0400

--
 bin/cassandra.ps1 | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--

[7/8] cassandra git commit: Fix MAX_HEAP_SIZE check on Windows startup

2015-10-19 Thread jmckenzie

Fix MAX_HEAP_SIZE check on Windows startup

Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10553


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

Branch: refs/heads/cassandra-3.0
Commit: fa909cc420a349140d1a0b1b744350fad70f64b9
Parents: f807b8c
Author: Paulo Motta <pauloricard...@gmail.com>
Authored: Mon Oct 19 15:12:19 2015 -0400
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Mon Oct 19 15:12:19 2015 -0400

--
 conf/cassandra-env.ps1 | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa909cc4/conf/cassandra-env.ps1
--
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 3c9d815..a38429e 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -128,6 +128,11 @@ Function CalculateHeapSizes
 }
 
 # Validate that we need to run this function and that our config is good
+if ($env:MAX_HEAP_SIZE -and $env:HEAP_NEWSIZE)
+{
+return
+}
+
 if (($env:MAX_HEAP_SIZE -and !$env:HEAP_NEWSIZE) -or (!$env:MAX_HEAP_SIZE 
-and $env:HEAP_NEWSIZE))
 {
 echo "Please set or unset MAX_HEAP_SIZE and HEAP_NEWSIZE in pairs.  
Aborting startup."

[6/8] cassandra git commit: Fix MAX_HEAP_SIZE check on Windows startup

2015-10-19 Thread jmckenzie

Fix MAX_HEAP_SIZE check on Windows startup

Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10553


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

Branch: refs/heads/trunk
Commit: fa909cc420a349140d1a0b1b744350fad70f64b9
Parents: f807b8c
Author: Paulo Motta <pauloricard...@gmail.com>
Authored: Mon Oct 19 15:12:19 2015 -0400
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Mon Oct 19 15:12:19 2015 -0400

--
 conf/cassandra-env.ps1 | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa909cc4/conf/cassandra-env.ps1
--
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 3c9d815..a38429e 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -128,6 +128,11 @@ Function CalculateHeapSizes
 }
 
 # Validate that we need to run this function and that our config is good
+if ($env:MAX_HEAP_SIZE -and $env:HEAP_NEWSIZE)
+{
+return
+}
+
 if (($env:MAX_HEAP_SIZE -and !$env:HEAP_NEWSIZE) -or (!$env:MAX_HEAP_SIZE 
-and $env:HEAP_NEWSIZE))
 {
 echo "Please set or unset MAX_HEAP_SIZE and HEAP_NEWSIZE in pairs.  
Aborting startup."

[3/8] cassandra git commit: Make Windows -a startup skip VerifyPorts check entirely

2015-10-19 Thread jmckenzie

Make Windows -a startup skip VerifyPorts check entirely

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10524


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

Branch: refs/heads/trunk
Commit: 728f94e798662bf8e0e4ad0f4d236394868cb7d6
Parents: 3cd7500
Author: Joshua McKenzie <jmcken...@apache.org>
Authored: Mon Oct 19 15:11:07 2015 -0400
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Mon Oct 19 15:11:07 2015 -0400

--
 bin/cassandra.ps1 | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/728f94e7/bin/cassandra.ps1
--
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 8cdd433..44ba9a4 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -27,7 +27,7 @@ usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-D 
arg] [-E errorfile
 -E  change JVM ErrorFile
 -v  Print cassandra version and exit
 -s  Show detailed jvm environment information during launch
--a  Aggressive startup. Ignore ports that are TIME_WAIT for 
VerifyPorts check.
+-a  Aggressive startup. Skip VerifyPorts check. For use in dev 
environments.
 -help   print this message
 
 NOTE: installing cassandra as a service requires Commons Daemon Service 
Runner
@@ -281,6 +281,10 @@ WARNING! Failed to write pidfile to $pidfile.  
stop-server.bat and
 #-
 Function VerifyPortsAreAvailable
 {
+if ($a)
+{
+return
+}
 # Need to confirm 5 different ports are available or die if any are 
currently bound
 # From cassandra.yaml:
 #   storage_port
@@ -308,10 +312,6 @@ Function VerifyPortsAreAvailable
 {
 if ($line -match "TCP" -and $line -match $portRegex)
 {
-if ($a -and $line -match "TIME_WAIT")
-{
-   continue
-}
 Write-Error "Found a port already in use. Aborting startup"
 Write-Error $line
 Exit

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

2015-10-19 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: f807b8c6ed1af297d29314399b9f250a966581f4
Parents: 7159a75 728f94e
Author: Joshua McKenzie 
Authored: Mon Oct 19 15:11:43 2015 -0400
Committer: Joshua McKenzie 
Committed: Mon Oct 19 15:11:43 2015 -0400

--
 bin/cassandra.ps1 | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--

[2/8] cassandra git commit: Make Windows -a startup skip VerifyPorts check entirely

2015-10-19 Thread jmckenzie

Make Windows -a startup skip VerifyPorts check entirely

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10524


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

Branch: refs/heads/cassandra-3.0
Commit: 728f94e798662bf8e0e4ad0f4d236394868cb7d6
Parents: 3cd7500
Author: Joshua McKenzie <jmcken...@apache.org>
Authored: Mon Oct 19 15:11:07 2015 -0400
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Mon Oct 19 15:11:07 2015 -0400

--
 bin/cassandra.ps1 | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/728f94e7/bin/cassandra.ps1
--
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 8cdd433..44ba9a4 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -27,7 +27,7 @@ usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-D 
arg] [-E errorfile
 -E  change JVM ErrorFile
 -v  Print cassandra version and exit
 -s  Show detailed jvm environment information during launch
--a  Aggressive startup. Ignore ports that are TIME_WAIT for 
VerifyPorts check.
+-a  Aggressive startup. Skip VerifyPorts check. For use in dev 
environments.
 -help   print this message
 
 NOTE: installing cassandra as a service requires Commons Daemon Service 
Runner
@@ -281,6 +281,10 @@ WARNING! Failed to write pidfile to $pidfile.  
stop-server.bat and
 #-
 Function VerifyPortsAreAvailable
 {
+if ($a)
+{
+return
+}
 # Need to confirm 5 different ports are available or die if any are 
currently bound
 # From cassandra.yaml:
 #   storage_port
@@ -308,10 +312,6 @@ Function VerifyPortsAreAvailable
 {
 if ($line -match "TCP" -and $line -match $portRegex)
 {
-if ($a -and $line -match "TIME_WAIT")
-{
-   continue
-}
 Write-Error "Found a port already in use. Aborting startup"
 Write-Error $line
 Exit

cassandra git commit: Fix ReadCommandTest

2015-10-20 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/trunk e017d89a6 -> 881e2da0a


Fix ReadCommandTest

Patch by jjirsa; reviewed by stefania for CASSANDRA-10555


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

Branch: refs/heads/trunk
Commit: 881e2da0a4c37f54fbd52ed66f080e33af02b978
Parents: e017d89
Author: Jeff Jirsa 
Authored: Tue Oct 20 11:32:52 2015 -0400
Committer: Joshua McKenzie 
Committed: Tue Oct 20 11:32:52 2015 -0400

--
 test/unit/org/apache/cassandra/db/ReadCommandTest.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/881e2da0/test/unit/org/apache/cassandra/db/ReadCommandTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/ReadCommandTest.java 
b/test/unit/org/apache/cassandra/db/ReadCommandTest.java
index fcaa92f..663080b 100644
--- a/test/unit/org/apache/cassandra/db/ReadCommandTest.java
+++ b/test/unit/org/apache/cassandra/db/ReadCommandTest.java
@@ -90,6 +90,8 @@ public class ReadCommandTest
 {
 ColumnFamilyStore cfs = 
Keyspace.open(KEYSPACE).getColumnFamilyStore(CF2);
 
+cfs.truncateBlocking();
+
 new RowUpdateBuilder(cfs.metadata, 0, ByteBufferUtil.bytes("key"))
 .clustering("cc")
 .add("a", ByteBufferUtil.bytes("abcd"))
@@ -119,6 +121,8 @@ public class ReadCommandTest
 {
 ColumnFamilyStore cfs = 
Keyspace.open(KEYSPACE).getColumnFamilyStore(CF2);
 
+cfs.truncateBlocking();
+
 new RowUpdateBuilder(cfs.metadata, 0, ByteBufferUtil.bytes("key"))
 .clustering("cc")
 .add("a", ByteBufferUtil.bytes("abcd"))
@@ -128,7 +132,7 @@ public class ReadCommandTest
 cfs.forceBlockingFlush();
 
 new RowUpdateBuilder(cfs.metadata, 0, ByteBufferUtil.bytes("key"))
-.clustering("cdd")
+.clustering("dd")
 .add("a", ByteBufferUtil.bytes("abcd"))
 .build()
 .apply();

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

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 2a1271382a65095941583935a5de3b4d2031b736
Parents: 79bf03d 9f02182
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:48:50 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:48:50 2015 -0500

--

--

[16/18] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: d404362adcca5bf62ab9c4bf24b0bd36eb13ab1c
Parents: 421c41d ed424bd
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:50:12 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:50:12 2015 -0500

--
 .../apache/cassandra/service/StorageProxy.java  | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)
--

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

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:
test/unit/org/apache/cassandra/db/HintedHandOffTest.java


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

Branch: refs/heads/cassandra-3.0
Commit: 9f021823fe0403dd0e34280a08a84389ec981a85
Parents: bfbcca1 e291382
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:48:03 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:48:03 2015 -0500

--
 .../org/apache/cassandra/db/HintedHandOffManager.java   | 12 +---
 src/java/org/apache/cassandra/service/StorageProxy.java | 11 ++-
 .../unit/org/apache/cassandra/db/HintedHandOffTest.java |  5 +++--
 3 files changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f021823/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f021823/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 3a62640,b701015..5e4d912
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -1012,19 -983,18 +1012,20 @@@ public class StorageProxy implements St
  public static void writeHintForMutation(Mutation mutation, long now, int 
ttl, InetAddress target)
  {
  assert ttl > 0;
+ 
  UUID hostId = 
StorageService.instance.getTokenMetadata().getHostId(target);
- if (hostId == null)
+ if (hostId != null)
  {
- logger.warn("Missing host Id for {}", target.getHostAddress());
- throw new AssertionError("Missing host Id for " + 
target.getHostAddress());
+ HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
Pair.create(target, hostId)).apply();
+ StorageMetrics.totalHints.inc();
  }
- HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
hostId).apply();
- StorageMetrics.totalHints.inc();
+ else
+ logger.debug("Discarding hint for endpoint not part of ring: {}", 
target);
  }
  
 -private static void sendMessagesToNonlocalDC(MessageOut message, Collection targets, 
AbstractWriteResponseHandler handler)
 +private static void sendMessagesToNonlocalDC(MessageOut message,
 + Collection 
targets,
 + 
AbstractWriteResponseHandler handler)
  {
  Iterator iter = targets.iterator();
  InetAddress target = iter.next();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f021823/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
--
diff --cc test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index ce14c37,ad1e6cf..6bb6be2
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@@ -36,9 -34,8 +36,10 @@@ import org.apache.cassandra.cql3.Untype
  import org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy;
  import org.apache.cassandra.db.marshal.Int32Type;
  import org.apache.cassandra.db.marshal.UUIDType;
 +import org.apache.cassandra.exceptions.ConfigurationException;
 +import org.apache.cassandra.locator.SimpleStrategy;
  import org.apache.cassandra.utils.ByteBufferUtil;
+ import org.apache.cassandra.utils.Pair;
  
  import static org.junit.Assert.assertEquals;
  import static org.apache.cassandra.cql3.QueryProcessor.executeInternal;
@@@ -79,8 -66,8 +80,8 @@@ public class HintedHandOffTes
  HintedHandOffManager.instance.hintFor(rm,
System.currentTimeMillis(),

HintedHandOffManager.calculateHintTTL(rm),
-   UUID.randomUUID())
+   
Pair.create(InetAddress.getByName("127.0.0.1"), UUID.randomUUID()))
 - .apply();
 + .applyUnsafe();
  
  // flush data to disk
  hintStore.forceBlockingFlush();
@@@ -120,8 -107,8 +121,8 @@@
  HintedHandOffManager.instance.hintFor(rm,
System.currentTimeMillis(),

[01/18] cassandra git commit: Fix missing host ID on hinted handoff write

2015-11-13 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 582b66fbd -> e291382fd
  refs/heads/cassandra-2.2 bfbcca1bf -> 9f021823f
  refs/heads/cassandra-3.0 79bf03d4e -> ed424bdd6
  refs/heads/cassandra-3.1 421c41d57 -> d404362ad
  refs/heads/trunk ee06e78bb -> 9c5bdb261


Fix missing host ID on hinted handoff write

Patch by pauloricardomg; reviewed by aweisberg for CASSANDRA-10485


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

Branch: refs/heads/cassandra-2.1
Commit: e291382fd00e4c7fc9258116885267515da3c49c
Parents: 582b66f
Author: Paulo Motta 
Authored: Fri Nov 13 09:46:57 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:46:57 2015 -0500

--
 .../org/apache/cassandra/db/HintedHandOffManager.java   | 12 +---
 src/java/org/apache/cassandra/service/StorageProxy.java | 11 ++-
 .../unit/org/apache/cassandra/db/HintedHandOffTest.java |  5 +++--
 3 files changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e291382f/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java 
b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 4fbdd27..0d3ef39 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -130,16 +130,14 @@ public class HintedHandOffManager implements 
HintedHandOffManagerMBean
  * Returns a mutation representing a Hint to be sent to 
targetId
  * as soon as it becomes available again.
  */
-public Mutation hintFor(Mutation mutation, long now, int ttl, UUID 
targetId)
+public Mutation hintFor(Mutation mutation, long now, int ttl, 
Pair target)
 {
 assert ttl > 0;
 
-InetAddress endpoint = 
StorageService.instance.getTokenMetadata().getEndpointForHostId(targetId);
-// during tests we may not have a matching endpoint, but this would be 
unexpected in real clusters
-if (endpoint != null)
-metrics.incrCreatedHints(endpoint);
-else
-logger.warn("Unable to find matching endpoint for target {} when 
storing a hint", targetId);
+InetAddress endpoint = target.left;
+UUID targetId = target.right;
+
+metrics.incrCreatedHints(endpoint);
 
 UUID hintId = UUIDGen.getTimeUUID();
 // serialize the hint with id and version as a composite column name

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e291382f/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java 
b/src/java/org/apache/cassandra/service/StorageProxy.java
index 4f20ef0..b701015 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -983,14 +983,15 @@ public class StorageProxy implements StorageProxyMBean
 public static void writeHintForMutation(Mutation mutation, long now, int 
ttl, InetAddress target)
 {
 assert ttl > 0;
+
 UUID hostId = 
StorageService.instance.getTokenMetadata().getHostId(target);
-if (hostId == null)
+if (hostId != null)
 {
-logger.warn("Missing host Id for {}", target.getHostAddress());
-throw new AssertionError("Missing host Id for " + 
target.getHostAddress());
+HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
Pair.create(target, hostId)).apply();
+StorageMetrics.totalHints.inc();
 }
-HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
hostId).apply();
-StorageMetrics.totalHints.inc();
+else
+logger.debug("Discarding hint for endpoint not part of ring: {}", 
target);
 }
 
 private static void sendMessagesToNonlocalDC(MessageOut message, Collection targets, 
AbstractWriteResponseHandler handler)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e291382f/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java 
b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index c29c08e..ad1e6cf 100644
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@ -35,6

[03/18] cassandra git commit: Fix missing host ID on hinted handoff write

2015-11-13 Thread jmckenzie

Fix missing host ID on hinted handoff write

Patch by pauloricardomg; reviewed by aweisberg for CASSANDRA-10485


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

Branch: refs/heads/cassandra-3.0
Commit: e291382fd00e4c7fc9258116885267515da3c49c
Parents: 582b66f
Author: Paulo Motta 
Authored: Fri Nov 13 09:46:57 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:46:57 2015 -0500

--
 .../org/apache/cassandra/db/HintedHandOffManager.java   | 12 +---
 src/java/org/apache/cassandra/service/StorageProxy.java | 11 ++-
 .../unit/org/apache/cassandra/db/HintedHandOffTest.java |  5 +++--
 3 files changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e291382f/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java 
b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 4fbdd27..0d3ef39 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -130,16 +130,14 @@ public class HintedHandOffManager implements 
HintedHandOffManagerMBean
  * Returns a mutation representing a Hint to be sent to 
targetId
  * as soon as it becomes available again.
  */
-public Mutation hintFor(Mutation mutation, long now, int ttl, UUID 
targetId)
+public Mutation hintFor(Mutation mutation, long now, int ttl, 
Pair target)
 {
 assert ttl > 0;
 
-InetAddress endpoint = 
StorageService.instance.getTokenMetadata().getEndpointForHostId(targetId);
-// during tests we may not have a matching endpoint, but this would be 
unexpected in real clusters
-if (endpoint != null)
-metrics.incrCreatedHints(endpoint);
-else
-logger.warn("Unable to find matching endpoint for target {} when 
storing a hint", targetId);
+InetAddress endpoint = target.left;
+UUID targetId = target.right;
+
+metrics.incrCreatedHints(endpoint);
 
 UUID hintId = UUIDGen.getTimeUUID();
 // serialize the hint with id and version as a composite column name

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e291382f/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java 
b/src/java/org/apache/cassandra/service/StorageProxy.java
index 4f20ef0..b701015 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -983,14 +983,15 @@ public class StorageProxy implements StorageProxyMBean
 public static void writeHintForMutation(Mutation mutation, long now, int 
ttl, InetAddress target)
 {
 assert ttl > 0;
+
 UUID hostId = 
StorageService.instance.getTokenMetadata().getHostId(target);
-if (hostId == null)
+if (hostId != null)
 {
-logger.warn("Missing host Id for {}", target.getHostAddress());
-throw new AssertionError("Missing host Id for " + 
target.getHostAddress());
+HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
Pair.create(target, hostId)).apply();
+StorageMetrics.totalHints.inc();
 }
-HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
hostId).apply();
-StorageMetrics.totalHints.inc();
+else
+logger.debug("Discarding hint for endpoint not part of ring: {}", 
target);
 }
 
 private static void sendMessagesToNonlocalDC(MessageOut message, Collection targets, 
AbstractWriteResponseHandler handler)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e291382f/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java 
b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index c29c08e..ad1e6cf 100644
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@ -35,6 +35,7 @@ import 
org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy;
 import org.apache.cassandra.db.marshal.Int32Type;
 import org.apache.cassandra.db.marshal.UUIDType;
 import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.utils.Pair;
 
 import

[15/18] cassandra git commit: 10485-3.0 patch

2015-11-13 Thread jmckenzie

10485-3.0 patch


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

Branch: refs/heads/cassandra-3.1
Commit: ed424bdd65ccf11742f2016ae5bc0b3ad5a99571
Parents: 2a12713
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:49:31 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:49:31 2015 -0500

--
 .../apache/cassandra/service/StorageProxy.java  | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed424bdd/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java 
b/src/java/org/apache/cassandra/service/StorageProxy.java
index 6bcc2f8..63fa8cf 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -2476,10 +2476,22 @@ public class StorageProxy implements StorageProxyMBean
 {
 public void runMayThrow()
 {
-logger.trace("Adding hints for {}", targets);
-HintsService.instance.write(Iterables.transform(targets, 
StorageService.instance::getHostIdForEndpoint),
-Hint.create(mutation, 
System.currentTimeMillis()));
-
targets.forEach(HintsService.instance.metrics::incrCreatedHints);
+Set validTargets = new HashSet<>(targets.size());
+Set hostIds = new HashSet<>(targets.size());
+for (InetAddress target : targets)
+{
+UUID hostId = 
StorageService.instance.getHostIdForEndpoint(target);
+if (hostId != null)
+{
+hostIds.add(hostId);
+validTargets.add(target);
+}
+else
+logger.debug("Discarding hint for endpoint not part of 
ring: {}", target);
+}
+logger.trace("Adding hints for {}", validTargets);
+HintsService.instance.write(hostIds, Hint.create(mutation, 
System.currentTimeMillis()));
+
validTargets.forEach(HintsService.instance.metrics::incrCreatedHints);
 // Notify the handler only for CL == ANY
 if (responseHandler != null && 
responseHandler.consistencyLevel == ConsistencyLevel.ANY)
 responseHandler.response(null);

[17/18] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/cassandra-3.1
Commit: d404362adcca5bf62ab9c4bf24b0bd36eb13ab1c
Parents: 421c41d ed424bd
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:50:12 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:50:12 2015 -0500

--
 .../apache/cassandra/service/StorageProxy.java  | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)
--

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

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:
test/unit/org/apache/cassandra/db/HintedHandOffTest.java


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

Branch: refs/heads/trunk
Commit: 9f021823fe0403dd0e34280a08a84389ec981a85
Parents: bfbcca1 e291382
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:48:03 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:48:03 2015 -0500

--
 .../org/apache/cassandra/db/HintedHandOffManager.java   | 12 +---
 src/java/org/apache/cassandra/service/StorageProxy.java | 11 ++-
 .../unit/org/apache/cassandra/db/HintedHandOffTest.java |  5 +++--
 3 files changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f021823/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f021823/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 3a62640,b701015..5e4d912
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -1012,19 -983,18 +1012,20 @@@ public class StorageProxy implements St
  public static void writeHintForMutation(Mutation mutation, long now, int 
ttl, InetAddress target)
  {
  assert ttl > 0;
+ 
  UUID hostId = 
StorageService.instance.getTokenMetadata().getHostId(target);
- if (hostId == null)
+ if (hostId != null)
  {
- logger.warn("Missing host Id for {}", target.getHostAddress());
- throw new AssertionError("Missing host Id for " + 
target.getHostAddress());
+ HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
Pair.create(target, hostId)).apply();
+ StorageMetrics.totalHints.inc();
  }
- HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
hostId).apply();
- StorageMetrics.totalHints.inc();
+ else
+ logger.debug("Discarding hint for endpoint not part of ring: {}", 
target);
  }
  
 -private static void sendMessagesToNonlocalDC(MessageOut message, Collection targets, 
AbstractWriteResponseHandler handler)
 +private static void sendMessagesToNonlocalDC(MessageOut message,
 + Collection 
targets,
 + 
AbstractWriteResponseHandler handler)
  {
  Iterator iter = targets.iterator();
  InetAddress target = iter.next();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f021823/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
--
diff --cc test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index ce14c37,ad1e6cf..6bb6be2
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@@ -36,9 -34,8 +36,10 @@@ import org.apache.cassandra.cql3.Untype
  import org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy;
  import org.apache.cassandra.db.marshal.Int32Type;
  import org.apache.cassandra.db.marshal.UUIDType;
 +import org.apache.cassandra.exceptions.ConfigurationException;
 +import org.apache.cassandra.locator.SimpleStrategy;
  import org.apache.cassandra.utils.ByteBufferUtil;
+ import org.apache.cassandra.utils.Pair;
  
  import static org.junit.Assert.assertEquals;
  import static org.apache.cassandra.cql3.QueryProcessor.executeInternal;
@@@ -79,8 -66,8 +80,8 @@@ public class HintedHandOffTes
  HintedHandOffManager.instance.hintFor(rm,
System.currentTimeMillis(),

HintedHandOffManager.calculateHintTTL(rm),
-   UUID.randomUUID())
+   
Pair.create(InetAddress.getByName("127.0.0.1"), UUID.randomUUID()))
 - .apply();
 + .applyUnsafe();
  
  // flush data to disk
  hintStore.forceBlockingFlush();
@@@ -120,8 -107,8 +121,8 @@@
  HintedHandOffManager.instance.hintFor(rm,
System.currentTimeMillis(),

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

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:
test/unit/org/apache/cassandra/db/HintedHandOffTest.java


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

Branch: refs/heads/cassandra-3.1
Commit: 9f021823fe0403dd0e34280a08a84389ec981a85
Parents: bfbcca1 e291382
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:48:03 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:48:03 2015 -0500

--
 .../org/apache/cassandra/db/HintedHandOffManager.java   | 12 +---
 src/java/org/apache/cassandra/service/StorageProxy.java | 11 ++-
 .../unit/org/apache/cassandra/db/HintedHandOffTest.java |  5 +++--
 3 files changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f021823/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f021823/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 3a62640,b701015..5e4d912
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -1012,19 -983,18 +1012,20 @@@ public class StorageProxy implements St
  public static void writeHintForMutation(Mutation mutation, long now, int 
ttl, InetAddress target)
  {
  assert ttl > 0;
+ 
  UUID hostId = 
StorageService.instance.getTokenMetadata().getHostId(target);
- if (hostId == null)
+ if (hostId != null)
  {
- logger.warn("Missing host Id for {}", target.getHostAddress());
- throw new AssertionError("Missing host Id for " + 
target.getHostAddress());
+ HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
Pair.create(target, hostId)).apply();
+ StorageMetrics.totalHints.inc();
  }
- HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
hostId).apply();
- StorageMetrics.totalHints.inc();
+ else
+ logger.debug("Discarding hint for endpoint not part of ring: {}", 
target);
  }
  
 -private static void sendMessagesToNonlocalDC(MessageOut message, Collection targets, 
AbstractWriteResponseHandler handler)
 +private static void sendMessagesToNonlocalDC(MessageOut message,
 + Collection 
targets,
 + 
AbstractWriteResponseHandler handler)
  {
  Iterator iter = targets.iterator();
  InetAddress target = iter.next();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f021823/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
--
diff --cc test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index ce14c37,ad1e6cf..6bb6be2
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@@ -36,9 -34,8 +36,10 @@@ import org.apache.cassandra.cql3.Untype
  import org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy;
  import org.apache.cassandra.db.marshal.Int32Type;
  import org.apache.cassandra.db.marshal.UUIDType;
 +import org.apache.cassandra.exceptions.ConfigurationException;
 +import org.apache.cassandra.locator.SimpleStrategy;
  import org.apache.cassandra.utils.ByteBufferUtil;
+ import org.apache.cassandra.utils.Pair;
  
  import static org.junit.Assert.assertEquals;
  import static org.apache.cassandra.cql3.QueryProcessor.executeInternal;
@@@ -79,8 -66,8 +80,8 @@@ public class HintedHandOffTes
  HintedHandOffManager.instance.hintFor(rm,
System.currentTimeMillis(),

HintedHandOffManager.calculateHintTTL(rm),
-   UUID.randomUUID())
+   
Pair.create(InetAddress.getByName("127.0.0.1"), UUID.randomUUID()))
 - .apply();
 + .applyUnsafe();
  
  // flush data to disk
  hintStore.forceBlockingFlush();
@@@ -120,8 -107,8 +121,8 @@@
  HintedHandOffManager.instance.hintFor(rm,
System.currentTimeMillis(),

[05/18] cassandra git commit: Fix missing host ID on hinted handoff write

2015-11-13 Thread jmckenzie

Fix missing host ID on hinted handoff write

Patch by pauloricardomg; reviewed by aweisberg for CASSANDRA-10485


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

Branch: refs/heads/trunk
Commit: e291382fd00e4c7fc9258116885267515da3c49c
Parents: 582b66f
Author: Paulo Motta 
Authored: Fri Nov 13 09:46:57 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:46:57 2015 -0500

--
 .../org/apache/cassandra/db/HintedHandOffManager.java   | 12 +---
 src/java/org/apache/cassandra/service/StorageProxy.java | 11 ++-
 .../unit/org/apache/cassandra/db/HintedHandOffTest.java |  5 +++--
 3 files changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e291382f/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java 
b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 4fbdd27..0d3ef39 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -130,16 +130,14 @@ public class HintedHandOffManager implements 
HintedHandOffManagerMBean
  * Returns a mutation representing a Hint to be sent to 
targetId
  * as soon as it becomes available again.
  */
-public Mutation hintFor(Mutation mutation, long now, int ttl, UUID 
targetId)
+public Mutation hintFor(Mutation mutation, long now, int ttl, 
Pair target)
 {
 assert ttl > 0;
 
-InetAddress endpoint = 
StorageService.instance.getTokenMetadata().getEndpointForHostId(targetId);
-// during tests we may not have a matching endpoint, but this would be 
unexpected in real clusters
-if (endpoint != null)
-metrics.incrCreatedHints(endpoint);
-else
-logger.warn("Unable to find matching endpoint for target {} when 
storing a hint", targetId);
+InetAddress endpoint = target.left;
+UUID targetId = target.right;
+
+metrics.incrCreatedHints(endpoint);
 
 UUID hintId = UUIDGen.getTimeUUID();
 // serialize the hint with id and version as a composite column name

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e291382f/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java 
b/src/java/org/apache/cassandra/service/StorageProxy.java
index 4f20ef0..b701015 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -983,14 +983,15 @@ public class StorageProxy implements StorageProxyMBean
 public static void writeHintForMutation(Mutation mutation, long now, int 
ttl, InetAddress target)
 {
 assert ttl > 0;
+
 UUID hostId = 
StorageService.instance.getTokenMetadata().getHostId(target);
-if (hostId == null)
+if (hostId != null)
 {
-logger.warn("Missing host Id for {}", target.getHostAddress());
-throw new AssertionError("Missing host Id for " + 
target.getHostAddress());
+HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
Pair.create(target, hostId)).apply();
+StorageMetrics.totalHints.inc();
 }
-HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
hostId).apply();
-StorageMetrics.totalHints.inc();
+else
+logger.debug("Discarding hint for endpoint not part of ring: {}", 
target);
 }
 
 private static void sendMessagesToNonlocalDC(MessageOut message, Collection targets, 
AbstractWriteResponseHandler handler)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e291382f/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java 
b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index c29c08e..ad1e6cf 100644
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@ -35,6 +35,7 @@ import 
org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy;
 import org.apache.cassandra.db.marshal.Int32Type;
 import org.apache.cassandra.db.marshal.UUIDType;
 import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.utils.Pair;
 
 import static

[14/18] cassandra git commit: 10485-3.0 patch

2015-11-13 Thread jmckenzie

10485-3.0 patch


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

Branch: refs/heads/cassandra-3.0
Commit: ed424bdd65ccf11742f2016ae5bc0b3ad5a99571
Parents: 2a12713
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:49:31 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:49:31 2015 -0500

--
 .../apache/cassandra/service/StorageProxy.java  | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed424bdd/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java 
b/src/java/org/apache/cassandra/service/StorageProxy.java
index 6bcc2f8..63fa8cf 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -2476,10 +2476,22 @@ public class StorageProxy implements StorageProxyMBean
 {
 public void runMayThrow()
 {
-logger.trace("Adding hints for {}", targets);
-HintsService.instance.write(Iterables.transform(targets, 
StorageService.instance::getHostIdForEndpoint),
-Hint.create(mutation, 
System.currentTimeMillis()));
-
targets.forEach(HintsService.instance.metrics::incrCreatedHints);
+Set validTargets = new HashSet<>(targets.size());
+Set hostIds = new HashSet<>(targets.size());
+for (InetAddress target : targets)
+{
+UUID hostId = 
StorageService.instance.getHostIdForEndpoint(target);
+if (hostId != null)
+{
+hostIds.add(hostId);
+validTargets.add(target);
+}
+else
+logger.debug("Discarding hint for endpoint not part of 
ring: {}", target);
+}
+logger.trace("Adding hints for {}", validTargets);
+HintsService.instance.write(hostIds, Hint.create(mutation, 
System.currentTimeMillis()));
+
validTargets.forEach(HintsService.instance.metrics::incrCreatedHints);
 // Notify the handler only for CL == ANY
 if (responseHandler != null && 
responseHandler.consistencyLevel == ConsistencyLevel.ANY)
 responseHandler.response(null);

[02/18] cassandra git commit: Fix missing host ID on hinted handoff write

2015-11-13 Thread jmckenzie

Fix missing host ID on hinted handoff write

Patch by pauloricardomg; reviewed by aweisberg for CASSANDRA-10485


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

Branch: refs/heads/cassandra-2.2
Commit: e291382fd00e4c7fc9258116885267515da3c49c
Parents: 582b66f
Author: Paulo Motta 
Authored: Fri Nov 13 09:46:57 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:46:57 2015 -0500

--
 .../org/apache/cassandra/db/HintedHandOffManager.java   | 12 +---
 src/java/org/apache/cassandra/service/StorageProxy.java | 11 ++-
 .../unit/org/apache/cassandra/db/HintedHandOffTest.java |  5 +++--
 3 files changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e291382f/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java 
b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 4fbdd27..0d3ef39 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -130,16 +130,14 @@ public class HintedHandOffManager implements 
HintedHandOffManagerMBean
  * Returns a mutation representing a Hint to be sent to 
targetId
  * as soon as it becomes available again.
  */
-public Mutation hintFor(Mutation mutation, long now, int ttl, UUID 
targetId)
+public Mutation hintFor(Mutation mutation, long now, int ttl, 
Pair target)
 {
 assert ttl > 0;
 
-InetAddress endpoint = 
StorageService.instance.getTokenMetadata().getEndpointForHostId(targetId);
-// during tests we may not have a matching endpoint, but this would be 
unexpected in real clusters
-if (endpoint != null)
-metrics.incrCreatedHints(endpoint);
-else
-logger.warn("Unable to find matching endpoint for target {} when 
storing a hint", targetId);
+InetAddress endpoint = target.left;
+UUID targetId = target.right;
+
+metrics.incrCreatedHints(endpoint);
 
 UUID hintId = UUIDGen.getTimeUUID();
 // serialize the hint with id and version as a composite column name

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e291382f/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java 
b/src/java/org/apache/cassandra/service/StorageProxy.java
index 4f20ef0..b701015 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -983,14 +983,15 @@ public class StorageProxy implements StorageProxyMBean
 public static void writeHintForMutation(Mutation mutation, long now, int 
ttl, InetAddress target)
 {
 assert ttl > 0;
+
 UUID hostId = 
StorageService.instance.getTokenMetadata().getHostId(target);
-if (hostId == null)
+if (hostId != null)
 {
-logger.warn("Missing host Id for {}", target.getHostAddress());
-throw new AssertionError("Missing host Id for " + 
target.getHostAddress());
+HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
Pair.create(target, hostId)).apply();
+StorageMetrics.totalHints.inc();
 }
-HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
hostId).apply();
-StorageMetrics.totalHints.inc();
+else
+logger.debug("Discarding hint for endpoint not part of ring: {}", 
target);
 }
 
 private static void sendMessagesToNonlocalDC(MessageOut message, Collection targets, 
AbstractWriteResponseHandler handler)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e291382f/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java 
b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index c29c08e..ad1e6cf 100644
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@ -35,6 +35,7 @@ import 
org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy;
 import org.apache.cassandra.db.marshal.Int32Type;
 import org.apache.cassandra.db.marshal.UUIDType;
 import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.utils.Pair;
 
 import

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

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:
test/unit/org/apache/cassandra/db/HintedHandOffTest.java


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

Branch: refs/heads/cassandra-2.2
Commit: 9f021823fe0403dd0e34280a08a84389ec981a85
Parents: bfbcca1 e291382
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:48:03 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:48:03 2015 -0500

--
 .../org/apache/cassandra/db/HintedHandOffManager.java   | 12 +---
 src/java/org/apache/cassandra/service/StorageProxy.java | 11 ++-
 .../unit/org/apache/cassandra/db/HintedHandOffTest.java |  5 +++--
 3 files changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f021823/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f021823/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 3a62640,b701015..5e4d912
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -1012,19 -983,18 +1012,20 @@@ public class StorageProxy implements St
  public static void writeHintForMutation(Mutation mutation, long now, int 
ttl, InetAddress target)
  {
  assert ttl > 0;
+ 
  UUID hostId = 
StorageService.instance.getTokenMetadata().getHostId(target);
- if (hostId == null)
+ if (hostId != null)
  {
- logger.warn("Missing host Id for {}", target.getHostAddress());
- throw new AssertionError("Missing host Id for " + 
target.getHostAddress());
+ HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
Pair.create(target, hostId)).apply();
+ StorageMetrics.totalHints.inc();
  }
- HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
hostId).apply();
- StorageMetrics.totalHints.inc();
+ else
+ logger.debug("Discarding hint for endpoint not part of ring: {}", 
target);
  }
  
 -private static void sendMessagesToNonlocalDC(MessageOut message, Collection targets, 
AbstractWriteResponseHandler handler)
 +private static void sendMessagesToNonlocalDC(MessageOut message,
 + Collection 
targets,
 + 
AbstractWriteResponseHandler handler)
  {
  Iterator iter = targets.iterator();
  InetAddress target = iter.next();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f021823/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
--
diff --cc test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index ce14c37,ad1e6cf..6bb6be2
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@@ -36,9 -34,8 +36,10 @@@ import org.apache.cassandra.cql3.Untype
  import org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy;
  import org.apache.cassandra.db.marshal.Int32Type;
  import org.apache.cassandra.db.marshal.UUIDType;
 +import org.apache.cassandra.exceptions.ConfigurationException;
 +import org.apache.cassandra.locator.SimpleStrategy;
  import org.apache.cassandra.utils.ByteBufferUtil;
+ import org.apache.cassandra.utils.Pair;
  
  import static org.junit.Assert.assertEquals;
  import static org.apache.cassandra.cql3.QueryProcessor.executeInternal;
@@@ -79,8 -66,8 +80,8 @@@ public class HintedHandOffTes
  HintedHandOffManager.instance.hintFor(rm,
System.currentTimeMillis(),

HintedHandOffManager.calculateHintTTL(rm),
-   UUID.randomUUID())
+   
Pair.create(InetAddress.getByName("127.0.0.1"), UUID.randomUUID()))
 - .apply();
 + .applyUnsafe();
  
  // flush data to disk
  hintStore.forceBlockingFlush();
@@@ -120,8 -107,8 +121,8 @@@
  HintedHandOffManager.instance.hintFor(rm,
System.currentTimeMillis(),

[13/18] cassandra git commit: 10485-3.0 patch

2015-11-13 Thread jmckenzie

10485-3.0 patch


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

Branch: refs/heads/trunk
Commit: ed424bdd65ccf11742f2016ae5bc0b3ad5a99571
Parents: 2a12713
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:49:31 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:49:31 2015 -0500

--
 .../apache/cassandra/service/StorageProxy.java  | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed424bdd/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java 
b/src/java/org/apache/cassandra/service/StorageProxy.java
index 6bcc2f8..63fa8cf 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -2476,10 +2476,22 @@ public class StorageProxy implements StorageProxyMBean
 {
 public void runMayThrow()
 {
-logger.trace("Adding hints for {}", targets);
-HintsService.instance.write(Iterables.transform(targets, 
StorageService.instance::getHostIdForEndpoint),
-Hint.create(mutation, 
System.currentTimeMillis()));
-
targets.forEach(HintsService.instance.metrics::incrCreatedHints);
+Set validTargets = new HashSet<>(targets.size());
+Set hostIds = new HashSet<>(targets.size());
+for (InetAddress target : targets)
+{
+UUID hostId = 
StorageService.instance.getHostIdForEndpoint(target);
+if (hostId != null)
+{
+hostIds.add(hostId);
+validTargets.add(target);
+}
+else
+logger.debug("Discarding hint for endpoint not part of 
ring: {}", target);
+}
+logger.trace("Adding hints for {}", validTargets);
+HintsService.instance.write(hostIds, Hint.create(mutation, 
System.currentTimeMillis()));
+
validTargets.forEach(HintsService.instance.metrics::incrCreatedHints);
 // Notify the handler only for CL == ANY
 if (responseHandler != null && 
responseHandler.consistencyLevel == ConsistencyLevel.ANY)
 responseHandler.response(null);

[04/18] cassandra git commit: Fix missing host ID on hinted handoff write

2015-11-13 Thread jmckenzie

Fix missing host ID on hinted handoff write

Patch by pauloricardomg; reviewed by aweisberg for CASSANDRA-10485


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

Branch: refs/heads/cassandra-3.1
Commit: e291382fd00e4c7fc9258116885267515da3c49c
Parents: 582b66f
Author: Paulo Motta 
Authored: Fri Nov 13 09:46:57 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:46:57 2015 -0500

--
 .../org/apache/cassandra/db/HintedHandOffManager.java   | 12 +---
 src/java/org/apache/cassandra/service/StorageProxy.java | 11 ++-
 .../unit/org/apache/cassandra/db/HintedHandOffTest.java |  5 +++--
 3 files changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e291382f/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java 
b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 4fbdd27..0d3ef39 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -130,16 +130,14 @@ public class HintedHandOffManager implements 
HintedHandOffManagerMBean
  * Returns a mutation representing a Hint to be sent to 
targetId
  * as soon as it becomes available again.
  */
-public Mutation hintFor(Mutation mutation, long now, int ttl, UUID 
targetId)
+public Mutation hintFor(Mutation mutation, long now, int ttl, 
Pair target)
 {
 assert ttl > 0;
 
-InetAddress endpoint = 
StorageService.instance.getTokenMetadata().getEndpointForHostId(targetId);
-// during tests we may not have a matching endpoint, but this would be 
unexpected in real clusters
-if (endpoint != null)
-metrics.incrCreatedHints(endpoint);
-else
-logger.warn("Unable to find matching endpoint for target {} when 
storing a hint", targetId);
+InetAddress endpoint = target.left;
+UUID targetId = target.right;
+
+metrics.incrCreatedHints(endpoint);
 
 UUID hintId = UUIDGen.getTimeUUID();
 // serialize the hint with id and version as a composite column name

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e291382f/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java 
b/src/java/org/apache/cassandra/service/StorageProxy.java
index 4f20ef0..b701015 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -983,14 +983,15 @@ public class StorageProxy implements StorageProxyMBean
 public static void writeHintForMutation(Mutation mutation, long now, int 
ttl, InetAddress target)
 {
 assert ttl > 0;
+
 UUID hostId = 
StorageService.instance.getTokenMetadata().getHostId(target);
-if (hostId == null)
+if (hostId != null)
 {
-logger.warn("Missing host Id for {}", target.getHostAddress());
-throw new AssertionError("Missing host Id for " + 
target.getHostAddress());
+HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
Pair.create(target, hostId)).apply();
+StorageMetrics.totalHints.inc();
 }
-HintedHandOffManager.instance.hintFor(mutation, now, ttl, 
hostId).apply();
-StorageMetrics.totalHints.inc();
+else
+logger.debug("Discarding hint for endpoint not part of ring: {}", 
target);
 }
 
 private static void sendMessagesToNonlocalDC(MessageOut message, Collection targets, 
AbstractWriteResponseHandler handler)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e291382f/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java 
b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index c29c08e..ad1e6cf 100644
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@ -35,6 +35,7 @@ import 
org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy;
 import org.apache.cassandra.db.marshal.Int32Type;
 import org.apache.cassandra.db.marshal.UUIDType;
 import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.utils.Pair;
 
 import

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

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.1
Commit: 2a1271382a65095941583935a5de3b4d2031b736
Parents: 79bf03d 9f02182
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:48:50 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:48:50 2015 -0500

--

--

[18/18] cassandra git commit: Merge branch 'cassandra-3.1' into trunk

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-3.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/9c5bdb26
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c5bdb26
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c5bdb26

Branch: refs/heads/trunk
Commit: 9c5bdb26126d3965d350e068730a23e6848a18c4
Parents: ee06e78 d404362
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:50:26 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:50:26 2015 -0500

--
 .../apache/cassandra/service/StorageProxy.java  | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c5bdb26/src/java/org/apache/cassandra/service/StorageProxy.java
--

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

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 2a1271382a65095941583935a5de3b4d2031b736
Parents: 79bf03d 9f02182
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:48:50 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:48:50 2015 -0500

--

--

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

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: bfbcca1bf536e4d3eff0ad438e8c3221dc2485d8
Parents: b05fe4f 582b66f
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:17:40 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:17:40 2015 -0500

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfbcca1b/src/java/org/apache/cassandra/gms/Gossiper.java
--

[13/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/cassandra-3.1
Commit: 421c41d576fc1eb94fc5887b684fcff16628641b
Parents: 6688911 79bf03d
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:18:02 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:18:02 2015 -0500

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

[03/15] cassandra git commit: Follow up to 10089 - fix possible NPE in Gossiper.getStateForVersionBiggerThan

2015-11-13 Thread jmckenzie

Follow up to 10089 - fix possible NPE in Gossiper.getStateForVersionBiggerThan


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

Branch: refs/heads/trunk
Commit: 582b66fbdfbedd8eb14b16c9f6522067ea921a13
Parents: ecd66de
Author: Stefania Alborghetti 
Authored: Fri Nov 13 09:13:14 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:13:14 2015 -0500

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/582b66fb/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java 
b/src/java/org/apache/cassandra/gms/Gossiper.java
index e9ebb6f..2f69d66 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -887,7 +887,8 @@ public class Gossiper implements 
IFailureDetectionEventListener, GossiperMBean
 states.put(key, value);
 }
 }
-reqdEndpointState.addApplicationStates(states);
+if (reqdEndpointState != null)
+reqdEndpointState.addApplicationStates(states);
 }
 return reqdEndpointState;
 }

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

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: bfbcca1bf536e4d3eff0ad438e8c3221dc2485d8
Parents: b05fe4f 582b66f
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:17:40 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:17:40 2015 -0500

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfbcca1b/src/java/org/apache/cassandra/gms/Gossiper.java
--

[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: 421c41d576fc1eb94fc5887b684fcff16628641b
Parents: 6688911 79bf03d
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:18:02 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:18:02 2015 -0500

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

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

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.1
Commit: 79bf03d4e3af93b8bef5b2acceedd3da05203fcb
Parents: 464f8f0 bfbcca1
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:17:51 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:17:51 2015 -0500

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/79bf03d4/src/java/org/apache/cassandra/gms/Gossiper.java
--

[02/15] cassandra git commit: Follow up to 10089 - fix possible NPE in Gossiper.getStateForVersionBiggerThan

2015-11-13 Thread jmckenzie

Follow up to 10089 - fix possible NPE in Gossiper.getStateForVersionBiggerThan


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

Branch: refs/heads/cassandra-2.2
Commit: 582b66fbdfbedd8eb14b16c9f6522067ea921a13
Parents: ecd66de
Author: Stefania Alborghetti 
Authored: Fri Nov 13 09:13:14 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:13:14 2015 -0500

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/582b66fb/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java 
b/src/java/org/apache/cassandra/gms/Gossiper.java
index e9ebb6f..2f69d66 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -887,7 +887,8 @@ public class Gossiper implements 
IFailureDetectionEventListener, GossiperMBean
 states.put(key, value);
 }
 }
-reqdEndpointState.addApplicationStates(states);
+if (reqdEndpointState != null)
+reqdEndpointState.addApplicationStates(states);
 }
 return reqdEndpointState;
 }

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

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 79bf03d4e3af93b8bef5b2acceedd3da05203fcb
Parents: 464f8f0 bfbcca1
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:17:51 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:17:51 2015 -0500

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/79bf03d4/src/java/org/apache/cassandra/gms/Gossiper.java
--

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

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 79bf03d4e3af93b8bef5b2acceedd3da05203fcb
Parents: 464f8f0 bfbcca1
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:17:51 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:17:51 2015 -0500

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/79bf03d4/src/java/org/apache/cassandra/gms/Gossiper.java
--

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

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.1
Commit: bfbcca1bf536e4d3eff0ad438e8c3221dc2485d8
Parents: b05fe4f 582b66f
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:17:40 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:17:40 2015 -0500

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfbcca1b/src/java/org/apache/cassandra/gms/Gossiper.java
--

[04/15] cassandra git commit: Follow up to 10089 - fix possible NPE in Gossiper.getStateForVersionBiggerThan

2015-11-13 Thread jmckenzie

Follow up to 10089 - fix possible NPE in Gossiper.getStateForVersionBiggerThan


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

Branch: refs/heads/cassandra-3.0
Commit: 582b66fbdfbedd8eb14b16c9f6522067ea921a13
Parents: ecd66de
Author: Stefania Alborghetti 
Authored: Fri Nov 13 09:13:14 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:13:14 2015 -0500

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/582b66fb/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java 
b/src/java/org/apache/cassandra/gms/Gossiper.java
index e9ebb6f..2f69d66 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -887,7 +887,8 @@ public class Gossiper implements 
IFailureDetectionEventListener, GossiperMBean
 states.put(key, value);
 }
 }
-reqdEndpointState.addApplicationStates(states);
+if (reqdEndpointState != null)
+reqdEndpointState.addApplicationStates(states);
 }
 return reqdEndpointState;
 }

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

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-3.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/ee06e78b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee06e78b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee06e78b

Branch: refs/heads/trunk
Commit: ee06e78bb5fcf18fe21b68f0deccf687e5f86e20
Parents: 0781bcc 421c41d
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:18:11 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:18:11 2015 -0500

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

[01/15] cassandra git commit: Follow up to 10089 - fix possible NPE in Gossiper.getStateForVersionBiggerThan

2015-11-13 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 ecd66de2b -> 582b66fbd
  refs/heads/cassandra-2.2 b05fe4ffe -> bfbcca1bf
  refs/heads/cassandra-3.0 464f8f076 -> 79bf03d4e
  refs/heads/cassandra-3.1 6688911f4 -> 421c41d57
  refs/heads/trunk 0781bccc9 -> ee06e78bb


Follow up to 10089 - fix possible NPE in Gossiper.getStateForVersionBiggerThan


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

Branch: refs/heads/cassandra-2.1
Commit: 582b66fbdfbedd8eb14b16c9f6522067ea921a13
Parents: ecd66de
Author: Stefania Alborghetti 
Authored: Fri Nov 13 09:13:14 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:13:14 2015 -0500

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/582b66fb/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java 
b/src/java/org/apache/cassandra/gms/Gossiper.java
index e9ebb6f..2f69d66 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -887,7 +887,8 @@ public class Gossiper implements 
IFailureDetectionEventListener, GossiperMBean
 states.put(key, value);
 }
 }
-reqdEndpointState.addApplicationStates(states);
+if (reqdEndpointState != null)
+reqdEndpointState.addApplicationStates(states);
 }
 return reqdEndpointState;
 }

[05/15] cassandra git commit: Follow up to 10089 - fix possible NPE in Gossiper.getStateForVersionBiggerThan

2015-11-13 Thread jmckenzie

Follow up to 10089 - fix possible NPE in Gossiper.getStateForVersionBiggerThan


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

Branch: refs/heads/cassandra-3.1
Commit: 582b66fbdfbedd8eb14b16c9f6522067ea921a13
Parents: ecd66de
Author: Stefania Alborghetti 
Authored: Fri Nov 13 09:13:14 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:13:14 2015 -0500

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/582b66fb/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java 
b/src/java/org/apache/cassandra/gms/Gossiper.java
index e9ebb6f..2f69d66 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -887,7 +887,8 @@ public class Gossiper implements 
IFailureDetectionEventListener, GossiperMBean
 states.put(key, value);
 }
 }
-reqdEndpointState.addApplicationStates(states);
+if (reqdEndpointState != null)
+reqdEndpointState.addApplicationStates(states);
 }
 return reqdEndpointState;
 }

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

2015-11-13 Thread jmckenzie

Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: bfbcca1bf536e4d3eff0ad438e8c3221dc2485d8
Parents: b05fe4f 582b66f
Author: Joshua McKenzie 
Authored: Fri Nov 13 09:17:40 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 09:17:40 2015 -0500

--
 src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfbcca1b/src/java/org/apache/cassandra/gms/Gossiper.java
--

[1/2] cassandra git commit: Fix race on StorageService.doAuthSetup

2015-08-26 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/trunk 012de8bed - 7ab241e96


Fix race on StorageService.doAuthSetup

Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10104


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

Branch: refs/heads/trunk
Commit: 88b05ef4b01bda523ea93211e30401df4d040fdd
Parents: bb77e12
Author: Paulo Motta pauloricard...@gmail.com
Authored: Wed Aug 26 17:15:33 2015 -0400
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Wed Aug 26 17:15:33 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b05ef4/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 0346645..a6c2f8b 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1038,7 +1038,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 // Also, the addKeyspace above can be racy if multiple nodes are 
started
 // concurrently - see CASSANDRA-9201
 for (CFMetaData table : AuthKeyspace.metadata().tables)
-if (Schema.instance.getCFMetaData(table.ksName, table.cfName) == 
null)
+if (Schema.instance.getCF(table.cfId) == null)
 maybeAddTable(table);
 
 DatabaseDescriptor.getRoleManager().setup();

cassandra git commit: Fix race on StorageService.doAuthSetup

2015-08-26 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 bb77e12f0 - 88b05ef4b


Fix race on StorageService.doAuthSetup

Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10104


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

Branch: refs/heads/cassandra-3.0
Commit: 88b05ef4b01bda523ea93211e30401df4d040fdd
Parents: bb77e12
Author: Paulo Motta pauloricard...@gmail.com
Authored: Wed Aug 26 17:15:33 2015 -0400
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Wed Aug 26 17:15:33 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b05ef4/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 0346645..a6c2f8b 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1038,7 +1038,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 // Also, the addKeyspace above can be racy if multiple nodes are 
started
 // concurrently - see CASSANDRA-9201
 for (CFMetaData table : AuthKeyspace.metadata().tables)
-if (Schema.instance.getCFMetaData(table.ksName, table.cfName) == 
null)
+if (Schema.instance.getCF(table.cfId) == null)
 maybeAddTable(table);
 
 DatabaseDescriptor.getRoleManager().setup();

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

2015-08-26 Thread jmckenzie

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 7ab241e969dcc0e327e87d4ed0a43bc6af428795
Parents: 012de8b 88b05ef
Author: Joshua McKenzie jmcken...@apache.org
Authored: Wed Aug 26 17:16:22 2015 -0400
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Wed Aug 26 17:16:22 2015 -0400

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

[1/2] cassandra git commit: Ignore FSWriteError in recover() during resetUnsafe() on Windows

2015-08-28 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 196b7ab54 - c73ec67c0


Ignore FSWriteError in recover() during resetUnsafe() on Windows

Patch by jmckenzie; reviewed by pmotta for CASSANDRA-9414


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

Branch: refs/heads/cassandra-3.0
Commit: c5158e53e8ac9386603f607c67ec7fbaa827c5ae
Parents: 5fb4e58
Author: Joshua McKenzie jmcken...@apache.org
Authored: Fri Aug 28 11:02:58 2015 -0400
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Fri Aug 28 11:02:58 2015 -0400

--
 .../apache/cassandra/db/commitlog/CommitLog.java| 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5158e53/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
--
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java 
b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
index 63005d7..0e08efe 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
@@ -444,7 +444,21 @@ public class CommitLog implements CommitLogMBean
 {
 allocator.start();
 executor.restartUnsafe();
-return recover();
+try
+{
+return recover();
+}
+catch (FSWriteError e)
+{
+// Workaround for a class of races that keeps showing up on 
Windows tests.
+// stop/start/reset path on Windows with segment deletion is very 
touchy/brittle
+// and the timing keeps getting screwed up. Rather than chasing 
our tail further
+// or rewriting the CLSM, just report that we didn't recover 
anything back up
+// the chain. This will silence most intermittent test failures on 
Windows
+// and appropriately fail tests that expected segments to be 
recovered that
+// were not.
+return 0;
+}
 }
 
 /**

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

2015-08-28 Thread jmckenzie

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: b9b1ec803dbcd99a72f7502fe1466208061bd8e6
Parents: c9a3241 c73ec67
Author: Joshua McKenzie jmcken...@apache.org
Authored: Fri Aug 28 11:04:10 2015 -0400
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Fri Aug 28 11:04:10 2015 -0400

--
 .../apache/cassandra/db/commitlog/CommitLog.java| 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)
--

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

2015-08-28 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: c73ec67c0555e299e62ccc8a732cd097faa910a7
Parents: 196b7ab c5158e5
Author: Joshua McKenzie jmcken...@apache.org
Authored: Fri Aug 28 11:03:51 2015 -0400
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Fri Aug 28 11:03:51 2015 -0400

--
 .../apache/cassandra/db/commitlog/CommitLog.java| 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c73ec67c/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
--

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

2015-08-28 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: c73ec67c0555e299e62ccc8a732cd097faa910a7
Parents: 196b7ab c5158e5
Author: Joshua McKenzie jmcken...@apache.org
Authored: Fri Aug 28 11:03:51 2015 -0400
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Fri Aug 28 11:03:51 2015 -0400

--
 .../apache/cassandra/db/commitlog/CommitLog.java| 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c73ec67c/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
--

[1/3] cassandra git commit: Ignore FSWriteError in recover() during resetUnsafe() on Windows

2015-08-28 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/trunk c9a324153 - b9b1ec803


Ignore FSWriteError in recover() during resetUnsafe() on Windows

Patch by jmckenzie; reviewed by pmotta for CASSANDRA-9414


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

Branch: refs/heads/trunk
Commit: c5158e53e8ac9386603f607c67ec7fbaa827c5ae
Parents: 5fb4e58
Author: Joshua McKenzie jmcken...@apache.org
Authored: Fri Aug 28 11:02:58 2015 -0400
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Fri Aug 28 11:02:58 2015 -0400

--
 .../apache/cassandra/db/commitlog/CommitLog.java| 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5158e53/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
--
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java 
b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
index 63005d7..0e08efe 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
@@ -444,7 +444,21 @@ public class CommitLog implements CommitLogMBean
 {
 allocator.start();
 executor.restartUnsafe();
-return recover();
+try
+{
+return recover();
+}
+catch (FSWriteError e)
+{
+// Workaround for a class of races that keeps showing up on 
Windows tests.
+// stop/start/reset path on Windows with segment deletion is very 
touchy/brittle
+// and the timing keeps getting screwed up. Rather than chasing 
our tail further
+// or rewriting the CLSM, just report that we didn't recover 
anything back up
+// the chain. This will silence most intermittent test failures on 
Windows
+// and appropriately fail tests that expected segments to be 
recovered that
+// were not.
+return 0;
+}
 }
 
 /**

cassandra git commit: Ignore FSWriteError in recover() during resetUnsafe() on Windows

2015-08-28 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 5fb4e58bc - c5158e53e


Ignore FSWriteError in recover() during resetUnsafe() on Windows

Patch by jmckenzie; reviewed by pmotta for CASSANDRA-9414


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

Branch: refs/heads/cassandra-2.2
Commit: c5158e53e8ac9386603f607c67ec7fbaa827c5ae
Parents: 5fb4e58
Author: Joshua McKenzie jmcken...@apache.org
Authored: Fri Aug 28 11:02:58 2015 -0400
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Fri Aug 28 11:02:58 2015 -0400

--
 .../apache/cassandra/db/commitlog/CommitLog.java| 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5158e53/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
--
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java 
b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
index 63005d7..0e08efe 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
@@ -444,7 +444,21 @@ public class CommitLog implements CommitLogMBean
 {
 allocator.start();
 executor.restartUnsafe();
-return recover();
+try
+{
+return recover();
+}
+catch (FSWriteError e)
+{
+// Workaround for a class of races that keeps showing up on 
Windows tests.
+// stop/start/reset path on Windows with segment deletion is very 
touchy/brittle
+// and the timing keeps getting screwed up. Rather than chasing 
our tail further
+// or rewriting the CLSM, just report that we didn't recover 
anything back up
+// the chain. This will silence most intermittent test failures on 
Windows
+// and appropriately fail tests that expected segments to be 
recovered that
+// were not.
+return 0;
+}
 }
 
 /**

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

2015-09-01 Thread jmckenzie

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 0d2603cf99012171a3f8a0ee3219de88458db5ea
Parents: 17f8788 45eba1a
Author: Joshua McKenzie 
Authored: Tue Sep 1 16:29:56 2015 -0400
Committer: Joshua McKenzie 
Committed: Tue Sep 1 16:29:56 2015 -0400

--
 conf/cassandra-env.ps1 | 4 
 1 file changed, 4 deletions(-)
--

[1/3] cassandra git commit: ninja: remove vestigial log4j from cassandra-env.ps1

2015-09-01 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/trunk 17f8788ef -> 0d2603cf9


ninja: remove vestigial log4j from cassandra-env.ps1


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

Branch: refs/heads/trunk
Commit: 3effec53e3d99e886266cf508ae00db1c869b29e
Parents: 0a4ce44
Author: Joshua McKenzie 
Authored: Tue Sep 1 16:29:03 2015 -0400
Committer: Joshua McKenzie 
Committed: Tue Sep 1 16:29:03 2015 -0400

--
 conf/cassandra-env.ps1 | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3effec53/conf/cassandra-env.ps1
--
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index f6cd6bc..fc0f6fd 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -372,8 +372,6 @@ Function SetCassandraEnvironment
 # store in env to check if it's avail in verification
 $env:JMX_PORT=$JMX_PORT
 
-$env:JVM_OPTS = "$env:JVM_OPTS -Dlog4j.defaultInitOverride=true"
-
 # some JVMs will fill up their heap when accessed via JMX, see 
CASSANDRA-6541
 $env:JVM_OPTS="$env:JVM_OPTS -XX:+CMSClassUnloadingEnabled"
 
@@ -471,7 +469,5 @@ Function SetCassandraEnvironment
 
 $env:JVM_OPTS="$env:JVM_OPTS $env:JVM_EXTRA_OPTS"
 
-$env:JVM_OPTS = "$env:JVM_OPTS 
-Dlog4j.configuration=log4j-server.properties"
-
 #$env:JVM_OPTS="$env:JVM_OPTS -XX:+UnlockCommercialFeatures 
-XX:+FlightRecorder"
 }

[1/2] cassandra git commit: ninja: remove vestigial log4j from cassandra-env.ps1

2015-09-01 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 b58686858 -> 45eba1adb


ninja: remove vestigial log4j from cassandra-env.ps1


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

Branch: refs/heads/cassandra-3.0
Commit: 3effec53e3d99e886266cf508ae00db1c869b29e
Parents: 0a4ce44
Author: Joshua McKenzie 
Authored: Tue Sep 1 16:29:03 2015 -0400
Committer: Joshua McKenzie 
Committed: Tue Sep 1 16:29:03 2015 -0400

--
 conf/cassandra-env.ps1 | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3effec53/conf/cassandra-env.ps1
--
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index f6cd6bc..fc0f6fd 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -372,8 +372,6 @@ Function SetCassandraEnvironment
 # store in env to check if it's avail in verification
 $env:JMX_PORT=$JMX_PORT
 
-$env:JVM_OPTS = "$env:JVM_OPTS -Dlog4j.defaultInitOverride=true"
-
 # some JVMs will fill up their heap when accessed via JMX, see 
CASSANDRA-6541
 $env:JVM_OPTS="$env:JVM_OPTS -XX:+CMSClassUnloadingEnabled"
 
@@ -471,7 +469,5 @@ Function SetCassandraEnvironment
 
 $env:JVM_OPTS="$env:JVM_OPTS $env:JVM_EXTRA_OPTS"
 
-$env:JVM_OPTS = "$env:JVM_OPTS 
-Dlog4j.configuration=log4j-server.properties"
-
 #$env:JVM_OPTS="$env:JVM_OPTS -XX:+UnlockCommercialFeatures 
-XX:+FlightRecorder"
 }

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

2015-09-01 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
conf/cassandra-env.ps1


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

Branch: refs/heads/cassandra-3.0
Commit: 45eba1adbb9f2ec84c05b540bd20d044d046cbc6
Parents: b586868 3effec5
Author: Joshua McKenzie 
Authored: Tue Sep 1 16:29:39 2015 -0400
Committer: Joshua McKenzie 
Committed: Tue Sep 1 16:29:39 2015 -0400

--
 conf/cassandra-env.ps1 | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/45eba1ad/conf/cassandra-env.ps1
--
diff --cc conf/cassandra-env.ps1
index 67767e7,fc0f6fd..f6bc6a7
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@@ -347,8 -372,9 +347,6 @@@ Function SetCassandraEnvironmen
  # store in env to check if it's avail in verification
  $env:JMX_PORT=$JMX_PORT
  
- $env:JVM_OPTS = "$env:JVM_OPTS -Dlog4j.defaultInitOverride=true"
 -# some JVMs will fill up their heap when accessed via JMX, see 
CASSANDRA-6541
 -$env:JVM_OPTS="$env:JVM_OPTS -XX:+CMSClassUnloadingEnabled"
--
  # enable thread priorities, primarily so we can give periodic tasks
  # a lower priority to avoid interfering with client workload
  $env:JVM_OPTS="$env:JVM_OPTS -XX:+UseThreadPriorities"

cassandra git commit: ninja: remove vestigial log4j from cassandra-env.ps1

2015-09-01 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 0a4ce4449 -> 3effec53e


ninja: remove vestigial log4j from cassandra-env.ps1


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

Branch: refs/heads/cassandra-2.2
Commit: 3effec53e3d99e886266cf508ae00db1c869b29e
Parents: 0a4ce44
Author: Joshua McKenzie 
Authored: Tue Sep 1 16:29:03 2015 -0400
Committer: Joshua McKenzie 
Committed: Tue Sep 1 16:29:03 2015 -0400

--
 conf/cassandra-env.ps1 | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3effec53/conf/cassandra-env.ps1
--
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index f6cd6bc..fc0f6fd 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -372,8 +372,6 @@ Function SetCassandraEnvironment
 # store in env to check if it's avail in verification
 $env:JMX_PORT=$JMX_PORT
 
-$env:JVM_OPTS = "$env:JVM_OPTS -Dlog4j.defaultInitOverride=true"
-
 # some JVMs will fill up their heap when accessed via JMX, see 
CASSANDRA-6541
 $env:JVM_OPTS="$env:JVM_OPTS -XX:+CMSClassUnloadingEnabled"
 
@@ -471,7 +469,5 @@ Function SetCassandraEnvironment
 
 $env:JVM_OPTS="$env:JVM_OPTS $env:JVM_EXTRA_OPTS"
 
-$env:JVM_OPTS = "$env:JVM_OPTS 
-Dlog4j.configuration=log4j-server.properties"
-
 #$env:JVM_OPTS="$env:JVM_OPTS -XX:+UnlockCommercialFeatures 
-XX:+FlightRecorder"
 }

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

2015-09-01 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
conf/cassandra-env.ps1


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

Branch: refs/heads/trunk
Commit: 45eba1adbb9f2ec84c05b540bd20d044d046cbc6
Parents: b586868 3effec5
Author: Joshua McKenzie 
Authored: Tue Sep 1 16:29:39 2015 -0400
Committer: Joshua McKenzie 
Committed: Tue Sep 1 16:29:39 2015 -0400

--
 conf/cassandra-env.ps1 | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/45eba1ad/conf/cassandra-env.ps1
--
diff --cc conf/cassandra-env.ps1
index 67767e7,fc0f6fd..f6bc6a7
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@@ -347,8 -372,9 +347,6 @@@ Function SetCassandraEnvironmen
  # store in env to check if it's avail in verification
  $env:JMX_PORT=$JMX_PORT
  
- $env:JVM_OPTS = "$env:JVM_OPTS -Dlog4j.defaultInitOverride=true"
 -# some JVMs will fill up their heap when accessed via JMX, see 
CASSANDRA-6541
 -$env:JVM_OPTS="$env:JVM_OPTS -XX:+CMSClassUnloadingEnabled"
--
  # enable thread priorities, primarily so we can give periodic tasks
  # a lower priority to avoid interfering with client workload
  $env:JVM_OPTS="$env:JVM_OPTS -XX:+UseThreadPriorities"

cassandra git commit: Fix failure to start with space in directory name on Windows

2015-09-03 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 f7644f265 -> e1fc0e067


Fix failure to start with space in directory name on Windows

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10239


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

Branch: refs/heads/cassandra-2.2
Commit: e1fc0e06719a9fd26030ace31e3742da196074d6
Parents: f7644f2
Author: Joshua McKenzie <jmcken...@apache.org>
Authored: Thu Sep 3 12:39:43 2015 -0400
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Thu Sep 3 12:39:43 2015 -0400

--
 CHANGES.txt| 1 +
 bin/cassandra.bat  | 2 +-
 conf/cassandra-env.ps1 | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1fc0e06/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 91ae36c..fcb9ed7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.2
+ * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
  * Fix repair hang when snapshot failed (CASSANDRA-10057)
  * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
(CASSANDRA-10199)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1fc0e06/bin/cassandra.bat
--
diff --git a/bin/cassandra.bat b/bin/cassandra.bat
index 155aaf6..0d207cd 100644
--- a/bin/cassandra.bat
+++ b/bin/cassandra.bat
@@ -66,7 +66,7 @@ set JAVA_OPTS=-ea^
  -XX:CMSInitiatingOccupancyFraction=75^
  -XX:+UseCMSInitiatingOccupancyOnly^
  -Dlogback.configurationFile=logback.xml^
- -Djava.library.path=%CASSANDRA_HOME%\lib\sigar-bin^
+ -Djava.library.path="%CASSANDRA_HOME%\lib\sigar-bin"^
  -Dcassandra.jmx.local.port=7199
 REM  JMX REMOTE ACCESS SETTINGS SEE: 
https://wiki.apache.org/cassandra/JmxSecurity ***
 REM -Dcom.sun.management.jmxremote.port=7199^

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1fc0e06/conf/cassandra-env.ps1
--
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index fc0f6fd..9708964 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -199,7 +199,7 @@ Function CalculateHeapSizes
 #-
 Function SetJsr223Env
 {
-$cp = """$env:CLASSPATH"""
+$cp = $env:CLASSPATH
 foreach ($jsrDir in Get-ChildItem -Path "$env:CASSANDRA_HOME\lib\jsr223")
 {
 foreach ($file in Get-ChildItem -Path 
"$env:CASSANDRA_HOME\lib\jsr223\$jsrDir\*.jar")
@@ -332,7 +332,7 @@ Function SetCassandraEnvironment
 
 ParseJVMInfo
 # Add sigar env - see Cassandra-7838
-$env:JVM_OPTS = "$env:JVM_OPTS 
-Djava.library.path=$env:CASSANDRA_HOME\lib\sigar-bin"
+$env:JVM_OPTS = "$env:JVM_OPTS 
-Djava.library.path=""$env:CASSANDRA_HOME\lib\sigar-bin"""
 
 # Confirm we're on high performance power plan, warn if not
 # Change to $true to suppress this warning

[1/2] cassandra git commit: Fix failure to start with space in directory name on Windows

2015-09-03 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 66b0e1d78 -> e9c0e1787


Fix failure to start with space in directory name on Windows

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10239


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

Branch: refs/heads/cassandra-3.0
Commit: e1fc0e06719a9fd26030ace31e3742da196074d6
Parents: f7644f2
Author: Joshua McKenzie <jmcken...@apache.org>
Authored: Thu Sep 3 12:39:43 2015 -0400
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Thu Sep 3 12:39:43 2015 -0400

--
 CHANGES.txt| 1 +
 bin/cassandra.bat  | 2 +-
 conf/cassandra-env.ps1 | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1fc0e06/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 91ae36c..fcb9ed7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.2
+ * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
  * Fix repair hang when snapshot failed (CASSANDRA-10057)
  * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
(CASSANDRA-10199)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1fc0e06/bin/cassandra.bat
--
diff --git a/bin/cassandra.bat b/bin/cassandra.bat
index 155aaf6..0d207cd 100644
--- a/bin/cassandra.bat
+++ b/bin/cassandra.bat
@@ -66,7 +66,7 @@ set JAVA_OPTS=-ea^
  -XX:CMSInitiatingOccupancyFraction=75^
  -XX:+UseCMSInitiatingOccupancyOnly^
  -Dlogback.configurationFile=logback.xml^
- -Djava.library.path=%CASSANDRA_HOME%\lib\sigar-bin^
+ -Djava.library.path="%CASSANDRA_HOME%\lib\sigar-bin"^
  -Dcassandra.jmx.local.port=7199
 REM  JMX REMOTE ACCESS SETTINGS SEE: 
https://wiki.apache.org/cassandra/JmxSecurity ***
 REM -Dcom.sun.management.jmxremote.port=7199^

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1fc0e06/conf/cassandra-env.ps1
--
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index fc0f6fd..9708964 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -199,7 +199,7 @@ Function CalculateHeapSizes
 #-
 Function SetJsr223Env
 {
-$cp = """$env:CLASSPATH"""
+$cp = $env:CLASSPATH
 foreach ($jsrDir in Get-ChildItem -Path "$env:CASSANDRA_HOME\lib\jsr223")
 {
 foreach ($file in Get-ChildItem -Path 
"$env:CASSANDRA_HOME\lib\jsr223\$jsrDir\*.jar")
@@ -332,7 +332,7 @@ Function SetCassandraEnvironment
 
 ParseJVMInfo
 # Add sigar env - see Cassandra-7838
-$env:JVM_OPTS = "$env:JVM_OPTS 
-Djava.library.path=$env:CASSANDRA_HOME\lib\sigar-bin"
+$env:JVM_OPTS = "$env:JVM_OPTS 
-Djava.library.path=""$env:CASSANDRA_HOME\lib\sigar-bin"""
 
 # Confirm we're on high performance power plan, warn if not
 # Change to $true to suppress this warning

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

2015-09-03 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/cassandra-3.0
Commit: e9c0e1787e44903109ed4520d055e983ca20c16e
Parents: 66b0e1d e1fc0e0
Author: Joshua McKenzie 
Authored: Thu Sep 3 12:42:04 2015 -0400
Committer: Joshua McKenzie 
Committed: Thu Sep 3 12:42:04 2015 -0400

--
 CHANGES.txt| 1 +
 bin/cassandra.bat  | 2 +-
 conf/cassandra-env.ps1 | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9c0e178/CHANGES.txt
--
diff --cc CHANGES.txt
index 751b75d,fcb9ed7..c1f6992
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
 -2.2.2
 +3.0.0-beta2
 + * Improve batchlog write patch (CASSANDRA-9673)
 + * Re-apply MaterializedView updates on commitlog replay (CASSANDRA-10164)
 + * Require AbstractType.isByteOrderComparable declaration in constructor 
(CASSANDRA-9901)
 + * Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554)
 + * Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156)
 + * Choose better poolingOptions for protocol v4 in cassandra-stress 
(CASSANDRA-10182)
 + * Fix LWW bug affecting Materialized Views (CASSANDRA-10197)
 + * Ensures frozen sets and maps are always sorted (CASSANDRA-10162)
 + * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181)
 + * Fix double flushing of secondary index tables (CASSANDRA-10180)
 + * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046)
 + * Only use batchlog when paired materialized view replica is remote 
(CASSANDRA-10061)
 + * Reuse TemporalRow when updating multiple MaterializedViews 
(CASSANDRA-10060)
 + * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
 + * Fix sstablerepairedset (CASSANDRA-10132)
 +Merged from 2.2:
+  * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
   * Fix repair hang when snapshot failed (CASSANDRA-10057)
   * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 (CASSANDRA-10199)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9c0e178/conf/cassandra-env.ps1
--

[3/5] cassandra git commit: Fix failure to start with space in directory name on Windows

2015-09-03 Thread jmckenzie

Fix failure to start with space in directory name on Windows

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10239


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

Branch: refs/heads/trunk
Commit: e1fc0e06719a9fd26030ace31e3742da196074d6
Parents: f7644f2
Author: Joshua McKenzie <jmcken...@apache.org>
Authored: Thu Sep 3 12:39:43 2015 -0400
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Thu Sep 3 12:39:43 2015 -0400

--
 CHANGES.txt| 1 +
 bin/cassandra.bat  | 2 +-
 conf/cassandra-env.ps1 | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1fc0e06/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 91ae36c..fcb9ed7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.2
+ * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
  * Fix repair hang when snapshot failed (CASSANDRA-10057)
  * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
(CASSANDRA-10199)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1fc0e06/bin/cassandra.bat
--
diff --git a/bin/cassandra.bat b/bin/cassandra.bat
index 155aaf6..0d207cd 100644
--- a/bin/cassandra.bat
+++ b/bin/cassandra.bat
@@ -66,7 +66,7 @@ set JAVA_OPTS=-ea^
  -XX:CMSInitiatingOccupancyFraction=75^
  -XX:+UseCMSInitiatingOccupancyOnly^
  -Dlogback.configurationFile=logback.xml^
- -Djava.library.path=%CASSANDRA_HOME%\lib\sigar-bin^
+ -Djava.library.path="%CASSANDRA_HOME%\lib\sigar-bin"^
  -Dcassandra.jmx.local.port=7199
 REM  JMX REMOTE ACCESS SETTINGS SEE: 
https://wiki.apache.org/cassandra/JmxSecurity ***
 REM -Dcom.sun.management.jmxremote.port=7199^

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1fc0e06/conf/cassandra-env.ps1
--
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index fc0f6fd..9708964 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -199,7 +199,7 @@ Function CalculateHeapSizes
 #-
 Function SetJsr223Env
 {
-$cp = """$env:CLASSPATH"""
+$cp = $env:CLASSPATH
 foreach ($jsrDir in Get-ChildItem -Path "$env:CASSANDRA_HOME\lib\jsr223")
 {
 foreach ($file in Get-ChildItem -Path 
"$env:CASSANDRA_HOME\lib\jsr223\$jsrDir\*.jar")
@@ -332,7 +332,7 @@ Function SetCassandraEnvironment
 
 ParseJVMInfo
 # Add sigar env - see Cassandra-7838
-$env:JVM_OPTS = "$env:JVM_OPTS 
-Djava.library.path=$env:CASSANDRA_HOME\lib\sigar-bin"
+$env:JVM_OPTS = "$env:JVM_OPTS 
-Djava.library.path=""$env:CASSANDRA_HOME\lib\sigar-bin"""
 
 # Confirm we're on high performance power plan, warn if not
 # Change to $true to suppress this warning

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

2015-09-03 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: e9c0e1787e44903109ed4520d055e983ca20c16e
Parents: 66b0e1d e1fc0e0
Author: Joshua McKenzie 
Authored: Thu Sep 3 12:42:04 2015 -0400
Committer: Joshua McKenzie 
Committed: Thu Sep 3 12:42:04 2015 -0400

--
 CHANGES.txt| 1 +
 bin/cassandra.bat  | 2 +-
 conf/cassandra-env.ps1 | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9c0e178/CHANGES.txt
--
diff --cc CHANGES.txt
index 751b75d,fcb9ed7..c1f6992
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
 -2.2.2
 +3.0.0-beta2
 + * Improve batchlog write patch (CASSANDRA-9673)
 + * Re-apply MaterializedView updates on commitlog replay (CASSANDRA-10164)
 + * Require AbstractType.isByteOrderComparable declaration in constructor 
(CASSANDRA-9901)
 + * Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554)
 + * Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156)
 + * Choose better poolingOptions for protocol v4 in cassandra-stress 
(CASSANDRA-10182)
 + * Fix LWW bug affecting Materialized Views (CASSANDRA-10197)
 + * Ensures frozen sets and maps are always sorted (CASSANDRA-10162)
 + * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181)
 + * Fix double flushing of secondary index tables (CASSANDRA-10180)
 + * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046)
 + * Only use batchlog when paired materialized view replica is remote 
(CASSANDRA-10061)
 + * Reuse TemporalRow when updating multiple MaterializedViews 
(CASSANDRA-10060)
 + * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
 + * Fix sstablerepairedset (CASSANDRA-10132)
 +Merged from 2.2:
+  * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
   * Fix repair hang when snapshot failed (CASSANDRA-10057)
   * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 (CASSANDRA-10199)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9c0e178/conf/cassandra-env.ps1
--

[2/5] cassandra git commit: Fix SSTableLoaderTest on Windows

2015-09-03 Thread jmckenzie

Fix SSTableLoaderTest on Windows

Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10210


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

Branch: refs/heads/trunk
Commit: 66b0e1d7889d0858753c6e364e77d86fe278eee4
Parents: 6a86d22
Author: Paulo Motta <pauloricard...@gmail.com>
Authored: Wed Sep 2 14:20:00 2015 -0400
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Wed Sep 2 14:20:00 2015 -0400

--
 .../cassandra/io/sstable/SSTableLoaderTest.java   | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66b0e1d7/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java
--
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java 
b/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java
index 3370e56..4eebdeb 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java
@@ -38,6 +38,7 @@ import org.apache.cassandra.db.partitions.*;
 import org.apache.cassandra.db.marshal.AsciiType;
 import org.apache.cassandra.dht.Range;
 import org.apache.cassandra.dht.Token;
+import org.apache.cassandra.io.FSWriteError;
 import org.apache.cassandra.io.util.FileUtils;
 import org.apache.cassandra.schema.KeyspaceParams;
 import org.apache.cassandra.service.StorageService;
@@ -80,7 +81,18 @@ public class SSTableLoaderTest
 @After
 public void cleanup()
 {
-FileUtils.deleteRecursive(tmpdir);
+try {
+FileUtils.deleteRecursive(tmpdir);
+} catch (FSWriteError e) {
+/**
+ * Windows does not allow a mapped file to be deleted, so we 
probably forgot to clean the buffers somewhere.
+ * We force a GC here to force buffer deallocation, and then try 
deleting the directory again.
+ * For more information, see: 
http://bugs.java.com/bugdatabase/view_bug.do?bug_id=4715154
+ * If this is not the problem, the exception will be rethrown 
anyway.
+ */
+System.gc();
+FileUtils.deleteRecursive(tmpdir);
+}
 }
 
 private static final class TestClient extends SSTableLoader.Client

[1/5] cassandra git commit: Remove dead code

2015-09-03 Thread jmckenzie

Repository: cassandra
Updated Branches:
  refs/heads/trunk 966bea74b -> 829b9b78c


Remove dead code


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

Branch: refs/heads/trunk
Commit: 6a86d221a5b4dc11784a022917d0e4c6845e03aa
Parents: 796b0f2
Author: Sylvain Lebresne 
Authored: Wed Sep 2 17:22:53 2015 +0200
Committer: Sylvain Lebresne 
Committed: Wed Sep 2 17:22:53 2015 +0200

--
 src/java/org/apache/cassandra/db/ReadCommand.java | 9 -
 1 file changed, 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a86d221/src/java/org/apache/cassandra/db/ReadCommand.java
--
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java 
b/src/java/org/apache/cassandra/db/ReadCommand.java
index 0bc8cea..0ccd229 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -971,21 +971,12 @@ public abstract class ReadCommand implements ReadQuery
 LegacyLayout.LegacyBound startBound = 
LegacyLayout.decodeBound(metadata, ByteBufferUtil.readWithShortLength(in), 
true);
 ByteBufferUtil.readWithShortLength(in);  // the composite "stop", 
which isn't actually needed
 
-// pre-3.0 nodes will sometimes use a clustering prefix for the 
Command-level start and stop, but in all
-// cases this should also be represented by the 
ClusteringIndexFilter, so we can ignore them
-Clustering startClustering;
-if (startBound == LegacyLayout.LegacyBound.BOTTOM || 
startBound.bound.size() < metadata.comparator.size())
-startClustering = Clustering.EMPTY;
-else
-startClustering = startBound.getAsClustering(metadata);
-
 ColumnFilter selection = 
LegacyRangeSliceCommandSerializer.getColumnSelectionForSlice(filter, 
compositesToGroup, metadata);
 
 RowFilter rowFilter = 
LegacyRangeSliceCommandSerializer.deserializeRowFilter(in, metadata);
 int maxResults = in.readInt();
 in.readBoolean(); // countCQL3Rows
 
-
 boolean selectsStatics = 
(!selection.fetchedColumns().statics.isEmpty() || 
filter.selects(Clustering.STATIC_CLUSTERING));
 boolean isDistinct = compositesToGroup == -2 || (perPartitionLimit 
== 1 && selectsStatics);
 DataLimits limits;

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

2015-09-03 Thread jmckenzie

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 829b9b78c04d0645b1f3e842de68ca598c5e1250
Parents: 966bea7 e9c0e17
Author: Joshua McKenzie 
Authored: Thu Sep 3 12:42:30 2015 -0400
Committer: Joshua McKenzie 
Committed: Thu Sep 3 12:42:30 2015 -0400

--
 CHANGES.txt   | 1 +
 bin/cassandra.bat | 2 +-
 conf/cassandra-env.ps1| 4 ++--
 src/java/org/apache/cassandra/db/ReadCommand.java | 9 -
 4 files changed, 4 insertions(+), 12 deletions(-)
--


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

[3/3] cassandra git commit: 3.0 patch for CASSANDRA-10222

2015-09-03 Thread jmckenzie

3.0 patch for CASSANDRA-10222


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

Branch: refs/heads/cassandra-3.0
Commit: 8ebd5904734d102e580c95dd2cdeba22de332991
Parents: f2923d4
Author: Joshua McKenzie 
Authored: Thu Sep 3 13:52:29 2015 -0400
Committer: Joshua McKenzie 
Committed: Thu Sep 3 13:52:29 2015 -0400

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/db/Directories.java|   7 +-
 .../db/WindowsFailedSnapshotTracker.java|   2 +-
 .../db/compaction/CompactionManager.java|   5 +
 .../cassandra/db/lifecycle/TransactionLog.java  |   4 +
 .../io/sstable/SnapshotDeletingTask.java|  83 +++
 .../db/commitlog/SnapshotDeletingTest.java  | 106 +++
 .../db/compaction/CompactionsTest.java  |   3 +-
 8 files changed, 203 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ebd5904/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index c1f6992..fccaf11 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,7 @@
  * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
  * Fix sstablerepairedset (CASSANDRA-10132)
 Merged from 2.2:
+ * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222)
  * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
  * Fix repair hang when snapshot failed (CASSANDRA-10057)
  * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ebd5904/src/java/org/apache/cassandra/db/Directories.java
--
diff --git a/src/java/org/apache/cassandra/db/Directories.java 
b/src/java/org/apache/cassandra/db/Directories.java
index 90d2085..c17b1fd 100644
--- a/src/java/org/apache/cassandra/db/Directories.java
+++ b/src/java/org/apache/cassandra/db/Directories.java
@@ -800,14 +800,9 @@ public class Directories
 catch (FSWriteError e)
 {
 if (FBUtilities.isWindows())
-{
-logger.warn("Failed to delete snapshot directory [{}]. 
Folder will be deleted on JVM shutdown or next node restart on crash. You can 
safely attempt to delete this folder but it will fail so long as readers are 
open on the files.", snapshotDir);
-
WindowsFailedSnapshotTracker.handleFailedSnapshot(snapshotDir);
-}
+SnapshotDeletingTask.addFailedSnapshot(snapshotDir);
 else
-{
 throw e;
-}
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ebd5904/src/java/org/apache/cassandra/db/WindowsFailedSnapshotTracker.java
--
diff --git a/src/java/org/apache/cassandra/db/WindowsFailedSnapshotTracker.java 
b/src/java/org/apache/cassandra/db/WindowsFailedSnapshotTracker.java
index ce89823..9e6bb47 100644
--- a/src/java/org/apache/cassandra/db/WindowsFailedSnapshotTracker.java
+++ b/src/java/org/apache/cassandra/db/WindowsFailedSnapshotTracker.java
@@ -101,7 +101,7 @@ public class WindowsFailedSnapshotTracker
 
 public static synchronized void handleFailedSnapshot(File dir)
 {
-assert(_failedSnapshotFile != null);
+assert _failedSnapshotFile != null : "_failedSnapshotFile not 
initialized within WindowsFailedSnapshotTracker";
 FileUtils.deleteRecursiveOnExit(dir);
 _failedSnapshotFile.println(dir.toString());
 _failedSnapshotFile.flush();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ebd5904/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 0890341..07678b5 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -54,6 +54,7 @@ import org.apache.cassandra.index.SecondaryIndexBuilder;
 import org.apache.cassandra.io.sstable.Descriptor;
 import org.apache.cassandra.io.sstable.ISSTableScanner;
 import org.apache.cassandra.io.sstable.SSTableRewriter;
+import

[3/4] cassandra git commit: 3.0 patch for CASSANDRA-10222

2015-09-03 Thread jmckenzie

3.0 patch for CASSANDRA-10222


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

Branch: refs/heads/trunk
Commit: 8ebd5904734d102e580c95dd2cdeba22de332991
Parents: f2923d4
Author: Joshua McKenzie 
Authored: Thu Sep 3 13:52:29 2015 -0400
Committer: Joshua McKenzie 
Committed: Thu Sep 3 13:52:29 2015 -0400

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/db/Directories.java|   7 +-
 .../db/WindowsFailedSnapshotTracker.java|   2 +-
 .../db/compaction/CompactionManager.java|   5 +
 .../cassandra/db/lifecycle/TransactionLog.java  |   4 +
 .../io/sstable/SnapshotDeletingTask.java|  83 +++
 .../db/commitlog/SnapshotDeletingTest.java  | 106 +++
 .../db/compaction/CompactionsTest.java  |   3 +-
 8 files changed, 203 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ebd5904/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index c1f6992..fccaf11 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,7 @@
  * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
  * Fix sstablerepairedset (CASSANDRA-10132)
 Merged from 2.2:
+ * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222)
  * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
  * Fix repair hang when snapshot failed (CASSANDRA-10057)
  * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ebd5904/src/java/org/apache/cassandra/db/Directories.java
--
diff --git a/src/java/org/apache/cassandra/db/Directories.java 
b/src/java/org/apache/cassandra/db/Directories.java
index 90d2085..c17b1fd 100644
--- a/src/java/org/apache/cassandra/db/Directories.java
+++ b/src/java/org/apache/cassandra/db/Directories.java
@@ -800,14 +800,9 @@ public class Directories
 catch (FSWriteError e)
 {
 if (FBUtilities.isWindows())
-{
-logger.warn("Failed to delete snapshot directory [{}]. 
Folder will be deleted on JVM shutdown or next node restart on crash. You can 
safely attempt to delete this folder but it will fail so long as readers are 
open on the files.", snapshotDir);
-
WindowsFailedSnapshotTracker.handleFailedSnapshot(snapshotDir);
-}
+SnapshotDeletingTask.addFailedSnapshot(snapshotDir);
 else
-{
 throw e;
-}
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ebd5904/src/java/org/apache/cassandra/db/WindowsFailedSnapshotTracker.java
--
diff --git a/src/java/org/apache/cassandra/db/WindowsFailedSnapshotTracker.java 
b/src/java/org/apache/cassandra/db/WindowsFailedSnapshotTracker.java
index ce89823..9e6bb47 100644
--- a/src/java/org/apache/cassandra/db/WindowsFailedSnapshotTracker.java
+++ b/src/java/org/apache/cassandra/db/WindowsFailedSnapshotTracker.java
@@ -101,7 +101,7 @@ public class WindowsFailedSnapshotTracker
 
 public static synchronized void handleFailedSnapshot(File dir)
 {
-assert(_failedSnapshotFile != null);
+assert _failedSnapshotFile != null : "_failedSnapshotFile not 
initialized within WindowsFailedSnapshotTracker";
 FileUtils.deleteRecursiveOnExit(dir);
 _failedSnapshotFile.println(dir.toString());
 _failedSnapshotFile.flush();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ebd5904/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java 
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 0890341..07678b5 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -54,6 +54,7 @@ import org.apache.cassandra.index.SecondaryIndexBuilder;
 import org.apache.cassandra.io.sstable.Descriptor;
 import org.apache.cassandra.io.sstable.ISSTableScanner;
 import org.apache.cassandra.io.sstable.SSTableRewriter;
+import

< 1 2 3 4 5 6 7 8 9 10 >

501 - 600 of 1153 matches

Mail list logo