You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/05/26 22:40:26 UTC
[1/2] git commit: don't NPE shutting down, due to gossip failure
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 39c295d80 -> 7f930e027
don't NPE shutting down, due to gossip failure
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea5b6246
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea5b6246
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea5b6246
Branch: refs/heads/cassandra-2.1
Commit: ea5b6246d24c6092cda17c28610f76b17b0be25c
Parents: 6faf80c
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Mon May 26 16:39:10 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Mon May 26 16:39:10 2014 -0400
----------------------------------------------------------------------
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/ea5b6246/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 f014ac0..c04a87d 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -1267,7 +1267,8 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
public void stop()
{
- scheduledGossipTask.cancel(false);
+ if (scheduledGossipTask != null)
+ scheduledGossipTask.cancel(false);
logger.info("Announcing shutdown");
Uninterruptibles.sleepUninterruptibly(intervalInMillis * 2, TimeUnit.MILLISECONDS);
MessageOut message = new MessageOut(MessagingService.Verb.GOSSIP_SHUTDOWN);
[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by db...@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/7f930e02
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f930e02
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f930e02
Branch: refs/heads/cassandra-2.1
Commit: 7f930e02798af1ba2eb57124f606c0d904396736
Parents: 39c295d ea5b624
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Mon May 26 16:39:50 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Mon May 26 16:39:50 2014 -0400
----------------------------------------------------------------------
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/7f930e02/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------