Gossiper logs DOWN for symmetry with UP patch by rcoli; reviewed by jbellis for CASSANDRA-5187
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d51a546 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d51a546 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d51a546 Branch: refs/heads/trunk Commit: 0d51a5464c8e57a6ecf7b8593035786fcf53b52d Parents: 54cc503 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sat Mar 23 18:07:49 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sat Mar 23 18:07:49 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 4 ++-- .../org/apache/cassandra/tools/NodeToolHelp.yaml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d51a546/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index f34f7bb..c9bc5d7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.2.4 + * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187) * Fix mixing prepared statements between keyspaces (CASSANDRA-5352) * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354) * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d51a546/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 60ca850..e8a5699 100644 --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@ -761,11 +761,11 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean private void markDead(InetAddress addr, EndpointState localState) { if (logger.isTraceEnabled()) - logger.trace("marking as dead {}", addr); + logger.trace("marking as down {}", addr); localState.markDead(); liveEndpoints.remove(addr); unreachableEndpoints.put(addr, System.currentTimeMillis()); - logger.info("InetAddress {} is now dead.", addr); + logger.info("InetAddress {} is now DOWN", addr); for (IEndpointStateChangeSubscriber subscriber : subscribers) subscriber.onDead(addr, localState); if (logger.isTraceEnabled()) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d51a546/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml ---------------------------------------------------------------------- diff --git a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml index f40f2c2..a67e1a3 100644 --- a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml +++ b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml @@ -63,7 +63,7 @@ commands: Pause hints delivery process - name: disablegossip help: | - Disable gossip (effectively marking the node dead) + Disable gossip (effectively marking the node down) - name: enablegossip help: | Reenable gossip
