Skip to content

HDDS-8009. OM HA metrics should be unregistered if leader is not known #4300

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
adoroszlai merged 2 commits into from
Feb 23, 2023
Merged

HDDS-8009. OM HA metrics should be unregistered if leader is not known #4300

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dc455f
OM HA metrics should be unregistered if leader is not known
xBis7 Feb 22, 2023
a970695
convert omRatisServer.getLeader() to local var to avoid dupl
xBis7 Feb 22, 2023
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
18 changes: 7 additions & 11 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
import java.util.stream.Collectors;

import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Lists;
import org.apache.hadoop.conf.Configuration;
Expand Down Expand Up @@ -1899,17 +1898,14 @@ public void updatePeerList(List<String> newPeers) {
}
RaftPeer leader = omRatisServer.getLeader();
if (Objects.nonNull(leader)) {
// If we have any leader information, its id cannot be null.
String leaderId = leader.getId().toString();

// If leaderId is empty, then leader is undefined
// and current OM is neither leader nor follower.
// OMHAMetrics shouldn't be registered in that case.
if (!Strings.isNullOrEmpty(leaderId)) {
omHAMetricsInit(leaderId);
} else {
// unregister, to get rid of stale metrics
OMHAMetrics.unRegister();
}
omHAMetricsInit(leaderId);
} else {
LOG.error("OzoneManagerRatisServer leader is null, " +
"unregistering OMHAMetrics.");
// Unregister, to get rid of stale metrics
OMHAMetrics.unRegister();
}
}

Expand Down