From c86c435fd6cdcbde99e020c94654e3441dfceade Mon Sep 17 00:00:00 2001 From: David Turner Date: Thu, 31 Jan 2019 11:16:33 +0000 Subject: [PATCH] Minor logging improvements Fixes some log messages that caused some minor confusion when digging through a log generated by a failing test. --- .../elasticsearch/cluster/coordination/Coordinator.java | 9 +++++++-- .../cluster/coordination/FollowersChecker.java | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java b/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java index dff9cdcb8a2a5..60b38861a3ad5 100644 --- a/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java +++ b/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java @@ -557,8 +557,13 @@ void becomeFollower(String method, DiscoveryNode leaderNode) { assert Thread.holdsLock(mutex) : "Coordinator mutex not held"; assert leaderNode.isMasterNode() : leaderNode + " became a leader but is not master-eligible"; - logger.debug("{}: coordinator becoming FOLLOWER of [{}] in term {} (was {}, lastKnownLeader was [{}])", - method, leaderNode, getCurrentTerm(), mode, lastKnownLeader); + if (mode == Mode.FOLLOWER && Optional.of(leaderNode).equals(lastKnownLeader)) { + logger.trace("{}: coordinator remaining FOLLOWER of [{}] in term {}", + method, leaderNode, getCurrentTerm()); + } else { + logger.debug("{}: coordinator becoming FOLLOWER of [{}] in term {} (was {}, lastKnownLeader was [{}])", + method, leaderNode, getCurrentTerm(), mode, lastKnownLeader); + } final boolean restartLeaderChecker = (mode == Mode.FOLLOWER && Optional.of(leaderNode).equals(lastKnownLeader)) == false; diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/FollowersChecker.java b/server/src/main/java/org/elasticsearch/cluster/coordination/FollowersChecker.java index 641f3941cb3bd..cd40e8e0f1f66 100644 --- a/server/src/main/java/org/elasticsearch/cluster/coordination/FollowersChecker.java +++ b/server/src/main/java/org/elasticsearch/cluster/coordination/FollowersChecker.java @@ -374,9 +374,10 @@ void failNode(String reason) { public void run() { synchronized (mutex) { if (running() == false) { - logger.debug("{} condition no longer applies, not marking faulty", discoveryNode); + logger.trace("{} no longer running, not marking faulty", FollowerChecker.this); return; } + logger.debug("{} marking node as faulty", FollowerChecker.this); faultyNodes.add(discoveryNode); followerCheckers.remove(discoveryNode); }