Skip to content

HDDS-9235. ReplicationManager metrics not collected after restart. #6280

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 3 commits into from
Feb 28, 2024
Merged

HDDS-9235. ReplicationManager metrics not collected after restart. #6280

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91f6b51
HDDS-9235. ReplicationManager metrics not collected after restart
aswinshakil Feb 26, 2024
b1e9eb0
HDDS-9235. fix findbugs
aswinshakil Feb 27, 2024
ee58275
HDDS-9235. Fix Unit Tests.
aswinshakil Feb 27, 2024
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
5 changes: 5 additions & 0 deletions hadoop-hdds/server-scm/dev-support/findbugsExcludeFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,9 @@
<Class name="org.apache.hadoop.hdds.scm.metadata.TestSCMTransactionInfoCodec"/>
<Bug pattern="NP_NULL_PARAM_DEREF_ALL_TARGETS_DANGEROUS" />
</Match>
<Match>
<Class name="org.apache.hadoop.hdds.scm.container.replication.ReplicationManager"/>
<Field name="metrics" />
<Bug pattern="IS2_INCONSISTENT_SYNC" />
</Match>
</FindBugsFilter>
1 change: 1 addition & 0 deletions ...cm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ public synchronized void start() {
if (!isRunning()) {
LOG.info("Starting Replication Monitor Thread.");
running = true;
metrics = ReplicationManagerMetrics.create(this);
if (rmConf.isLegacyEnabled()) {
legacyReplicationManager.setMetrics(metrics);
}
Expand Down
13 changes: 9 additions & 4 deletions ...main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManagerMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,15 @@ public ReplicationManagerMetrics(ReplicationManager manager) {
}

public static ReplicationManagerMetrics create(ReplicationManager manager) {
return DefaultMetricsSystem.instance().register(METRICS_SOURCE_NAME,
"SCM Replication manager (closed container replication) related "
+ "metrics",
new ReplicationManagerMetrics(manager));
ReplicationManagerMetrics replicationManagerMetrics = (ReplicationManagerMetrics)
DefaultMetricsSystem.instance().getSource(METRICS_SOURCE_NAME);
if (replicationManagerMetrics == null) {
return DefaultMetricsSystem.instance().register(METRICS_SOURCE_NAME,
"SCM Replication manager (closed container replication) related "
+ "metrics",
new ReplicationManagerMetrics(manager));
}
return replicationManagerMetrics;
}

@Override
Expand Down