You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/09/17 23:07:48 UTC
[1/6] git commit: Prevent NPE on FD conviction race
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 f19b4cb80 -> 05920cb38
refs/heads/cassandra-2.1 7c34d8bb7 -> 83d15631f
refs/heads/trunk 134c2e969 -> 47cda388f
Prevent NPE on FD conviction race
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7940
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05920cb3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05920cb3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05920cb3
Branch: refs/heads/cassandra-2.0
Commit: 05920cb38bc8559704450965ce4bb326a917c86a
Parents: f19b4cb
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 17 14:06:10 2014 +0000
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 17 14:06:10 2014 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/05920cb3/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 01299ea..4514da7 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -298,6 +298,8 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
public void convict(InetAddress endpoint, double phi)
{
EndpointState epState = endpointStateMap.get(endpoint);
+ if (epState == null)
+ return;
if (epState.isAlive() && !isDeadState(epState))
{
markDead(endpoint, epState);
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47cda388
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47cda388
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47cda388
Branch: refs/heads/trunk
Commit: 47cda388f57531c3f9801ff22f8541ee64ce6bb5
Parents: 134c2e9 83d1563
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 17 14:07:25 2014 +0000
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 17 14:07:25 2014 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/47cda388/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
[3/6] git commit: Prevent NPE on FD conviction race
Posted by br...@apache.org.
Prevent NPE on FD conviction race
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7940
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05920cb3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05920cb3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05920cb3
Branch: refs/heads/trunk
Commit: 05920cb38bc8559704450965ce4bb326a917c86a
Parents: f19b4cb
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 17 14:06:10 2014 +0000
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 17 14:06:10 2014 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/05920cb3/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 01299ea..4514da7 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -298,6 +298,8 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
public void convict(InetAddress endpoint, double phi)
{
EndpointState epState = endpointStateMap.get(endpoint);
+ if (epState == null)
+ return;
if (epState.isAlive() && !isDeadState(epState))
{
markDead(endpoint, epState);
[2/6] git commit: Prevent NPE on FD conviction race
Posted by br...@apache.org.
Prevent NPE on FD conviction race
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7940
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05920cb3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05920cb3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05920cb3
Branch: refs/heads/cassandra-2.1
Commit: 05920cb38bc8559704450965ce4bb326a917c86a
Parents: f19b4cb
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 17 14:06:10 2014 +0000
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 17 14:06:10 2014 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/05920cb3/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 01299ea..4514da7 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -298,6 +298,8 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
public void convict(InetAddress endpoint, double phi)
{
EndpointState epState = endpointStateMap.get(endpoint);
+ if (epState == null)
+ return;
if (epState.isAlive() && !isDeadState(epState))
{
markDead(endpoint, epState);
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83d15631
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83d15631
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83d15631
Branch: refs/heads/cassandra-2.1
Commit: 83d15631f09da9cdd8d57b422ee9842ad9e5ba74
Parents: 7c34d8b 05920cb
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 17 14:07:18 2014 +0000
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 17 14:07:18 2014 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83d15631/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83d15631
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83d15631
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83d15631
Branch: refs/heads/trunk
Commit: 83d15631f09da9cdd8d57b422ee9842ad9e5ba74
Parents: 7c34d8b 05920cb
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 17 14:07:18 2014 +0000
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 17 14:07:18 2014 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83d15631/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------