Skip to content

HDDS-4508. Add total container count to SCMContainerMetrics #1623

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 8 commits into from
Dec 16, 2020
Merged

HDDS-4508. Add total container count to SCMContainerMetrics #1623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cf2de44
HDDS-4508. Add total container count to SCMContainerMetrics
Nov 25, 2020
383b0e4
Trigger new CI check
Nov 25, 2020
9a68ce5
Modify format
Nov 25, 2020
34a75c1
Modify format
Nov 25, 2020
a38c4f1
Modify format
Nov 26, 2020
0c2310c
Trigger new CI check
Nov 26, 2020
00ce444
Modify the total method
Dec 16, 2020
d91af7f
Checkstyle
Dec 16, 2020
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
11 changes: 10 additions & 1 deletion ...-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMContainerMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.util.Map;

import org.apache.hadoop.hdds.annotation.InterfaceAudience;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsSource;
import org.apache.hadoop.metrics2.MetricsSystem;
Expand Down Expand Up @@ -66,6 +67,11 @@ public void unRegister() {
public void getMetrics(MetricsCollector collector, boolean all) {
Map<String, Integer> stateCount = scmmxBean.getContainerStateCount();

int totalContainers = 0;
for (HddsProtos.LifeCycleState state : HddsProtos.LifeCycleState.values()) {
totalContainers = totalContainers + stateCount.get(state.toString());
}

collector.addRecord(SOURCE)
.addGauge(Interns.info("OpenContainers",
"Number of open containers"),
Expand All @@ -84,6 +90,9 @@ public void getMetrics(MetricsCollector collector, boolean all) {
stateCount.get(DELETING.toString()))
.addGauge(Interns.info("DeletedContainers",
"Number of containers in deleted state"),
stateCount.get(DELETED.toString()));
stateCount.get(DELETED.toString()))
.addGauge(Interns.info("TotalContainers",
"Number of all containers"),
totalContainers);
}
}
2 changes: 2 additions & 0 deletions ...s/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMContainerMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,7 @@ public void testSCMContainerMetrics() {
"Number of containers in deleting state"), 6);
verify(mb, times(1)).addGauge(Interns.info("DeletedContainers",
"Number of containers in deleted state"), 7);
verify(mb, times(1)).addGauge(Interns.info("TotalContainers",
"Number of all containers"), 27);
}
}