Skip to content

[Zen2] Minor logging improvements #36818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 20, 2018
Merged

[Zen2] Minor logging improvements #36818

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c82c70c
[Zen2] Minor logging improvements
DaveCTurner Dec 19, 2018
a02075d
Add term and version to MasterService node diff message too
DaveCTurner Dec 19, 2018
540445e
Merge branch 'master' into 2018-12-19-logging-improvements
DaveCTurner Dec 19, 2018
66a0c3f
Merge branch 'master' into 2018-12-19-logging-improvements
DaveCTurner Dec 20, 2018
e5296a5
Merge branch 'master' into 2018-12-19-logging-improvements
DaveCTurner Dec 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,8 @@ private void handleJoinRequest(JoinRequest joinRequest, JoinHelper.JoinCallback

void becomeCandidate(String method) {
assert Thread.holdsLock(mutex) : "Coordinator mutex not held";
logger.debug("{}: becoming CANDIDATE (was {}, lastKnownLeader was [{}])", method, mode, lastKnownLeader);
logger.debug("{}: coordinator becoming CANDIDATE in term {} (was {}, lastKnownLeader was [{}])",
method, getCurrentTerm(), mode, lastKnownLeader);

if (mode != Mode.CANDIDATE) {
mode = Mode.CANDIDATE;
Expand Down Expand Up @@ -440,7 +441,8 @@ void becomeLeader(String method) {
assert mode == Mode.CANDIDATE : "expected candidate but was " + mode;
assert getLocalNode().isMasterNode() : getLocalNode() + " became a leader but is not master-eligible";

logger.debug("{}: becoming LEADER (was {}, lastKnownLeader was [{}])", method, mode, lastKnownLeader);
logger.debug("{}: coordinator becoming LEADER in term {} (was {}, lastKnownLeader was [{}])",
method, getCurrentTerm(), mode, lastKnownLeader);

mode = Mode.LEADER;
joinAccumulator.close(mode);
Expand All @@ -461,7 +463,8 @@ 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("{}: becoming FOLLOWER of [{}] (was {}, lastKnownLeader was [{}])", method, leaderNode, mode, lastKnownLeader);
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;

Expand Down
6 changes: 3 additions & 3 deletions server/src/main/java/org/elasticsearch/cluster/coordination/LeaderChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,15 +203,15 @@ private class CheckScheduler implements Releasable {
@Override
public void close() {
if (isClosed.compareAndSet(false, true) == false) {
logger.debug("already closed");
logger.trace("already closed, doing nothing");
} else {
logger.debug("closed");
}
}

void handleWakeUp() {
if (isClosed.get()) {
logger.debug("closed check scheduler woken up, doing nothing");
logger.trace("closed check scheduler woken up, doing nothing");
return;
}

Expand Down Expand Up @@ -289,7 +289,7 @@ void leaderFailed() {
if (isClosed.compareAndSet(false, true)) {
transportService.getThreadPool().generic().execute(onLeaderFailure);
} else {
logger.debug("already closed, not failing leader");
logger.trace("already closed, not failing leader");
}
}

Expand Down
3 changes: 2 additions & 1 deletion server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,8 @@ private void applyChanges(UpdateTask task, ClusterState previousClusterState, Cl
if (nodesDelta.hasChanges() && logger.isInfoEnabled()) {
String summary = nodesDelta.shortSummary();
if (summary.length() > 0) {
logger.info("{}, reason: {}", summary, task.source);
logger.info("{}, term: {}, version: {}, reason: {}",
Copy link
Contributor

@ywelsch ywelsch Dec 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we update the same message in MasterService?

Copy link
Contributor Author

@DaveCTurner DaveCTurner Dec 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the ClusterApplierService one is more useful since it logs on all nodes and also when adding a no-master block, but it could be useful in the MasterService too so I pushed a02075d.

summary, newClusterState.term(), newClusterState.version(), task.source);
}
}

Expand Down