Skip to content

Commit 7f738e8

Browse files
authored
Minor logging improvements (#38084)
Fixes some log messages that caused some minor confusion when digging through a log generated by a failing test.
1 parent e066a59 commit 7f738e8

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,13 @@ void becomeFollower(String method, DiscoveryNode leaderNode) {
557557
assert Thread.holdsLock(mutex) : "Coordinator mutex not held";
558558
assert leaderNode.isMasterNode() : leaderNode + " became a leader but is not master-eligible";
559559

560-
logger.debug("{}: coordinator becoming FOLLOWER of [{}] in term {} (was {}, lastKnownLeader was [{}])",
561-
method, leaderNode, getCurrentTerm(), mode, lastKnownLeader);
560+
if (mode == Mode.FOLLOWER && Optional.of(leaderNode).equals(lastKnownLeader)) {
561+
logger.trace("{}: coordinator remaining FOLLOWER of [{}] in term {}",
562+
method, leaderNode, getCurrentTerm());
563+
} else {
564+
logger.debug("{}: coordinator becoming FOLLOWER of [{}] in term {} (was {}, lastKnownLeader was [{}])",
565+
method, leaderNode, getCurrentTerm(), mode, lastKnownLeader);
566+
}
562567

563568
final boolean restartLeaderChecker = (mode == Mode.FOLLOWER && Optional.of(leaderNode).equals(lastKnownLeader)) == false;
564569

server/src/main/java/org/elasticsearch/cluster/coordination/FollowersChecker.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,9 +374,10 @@ void failNode(String reason) {
374374
public void run() {
375375
synchronized (mutex) {
376376
if (running() == false) {
377-
logger.debug("{} condition no longer applies, not marking faulty", discoveryNode);
377+
logger.trace("{} no longer running, not marking faulty", FollowerChecker.this);
378378
return;
379379
}
380+
logger.debug("{} marking node as faulty", FollowerChecker.this);
380381
faultyNodes.add(discoveryNode);
381382
followerCheckers.remove(discoveryNode);
382383
}

0 commit comments

Comments
 (0)