Skip to content

YARN-10502. Add backlogs metric for CapacityScheduler #2496

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

Closed
wants to merge 1 commit into from
Closed

YARN-10502. Add backlogs metric for CapacityScheduler #2496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions ...a/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,8 +676,8 @@ public void suspendSchedule() {

static class ResourceCommitterService extends Thread {
private final CapacityScheduler cs;
private BlockingQueue<ResourceCommitRequest<FiCaSchedulerApp, FiCaSchedulerNode>>
backlogs = new LinkedBlockingQueue<>();
private final BlockingQueue<ResourceCommitRequest<FiCaSchedulerApp,
FiCaSchedulerNode>> backlogs = new LinkedBlockingQueue<>();

public ResourceCommitterService(CapacityScheduler cs) {
this.cs = cs;
Expand All @@ -690,6 +690,7 @@ public void run() {
try {
ResourceCommitRequest<FiCaSchedulerApp, FiCaSchedulerNode> request =
backlogs.take();
CapacitySchedulerMetrics.getMetrics().decrBacklogs();
cs.writeLock.lock();
try {
cs.tryCommit(cs.getClusterResource(), request, true);
Expand All @@ -708,6 +709,7 @@ public void run() {
public void addNewCommitRequest(
ResourceCommitRequest<FiCaSchedulerApp, FiCaSchedulerNode> proposal) {
backlogs.add(proposal);
CapacitySchedulerMetrics.getMetrics().incrBacklogs();
}

public int getPendingBacklogs() {
Expand Down
15 changes: 15 additions & 0 deletions ...pache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity;

import org.apache.hadoop.metrics2.lib.MutableGaugeLong;
import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.metrics2.MetricsInfo;
Expand Down Expand Up @@ -47,6 +48,7 @@ public class CapacitySchedulerMetrics {
"Metrics for the Yarn Capacity Scheduler");

@Metric("Scheduler allocate containers") MutableRate allocate;
@Metric("Scheduler commit backlogs") MutableGaugeLong backlogs;
@Metric("Scheduler commit success") MutableRate commitSuccess;
@Metric("Scheduler commit failure") MutableRate commitFailure;
@Metric("Scheduler node update") MutableRate nodeUpdate;
Expand Down Expand Up @@ -93,6 +95,14 @@ public void addAllocate(long latency) {
this.allocate.add(latency);
}

public void incrBacklogs() {
this.backlogs.incr();
}

public void decrBacklogs() {
this.backlogs.decr();
}

public void addCommitSuccess(long latency) {
this.commitSuccess.add(latency);
}
Expand Down Expand Up @@ -128,4 +138,9 @@ public void addSchedulerNodeHBInterval(long heartbeatInterval) {
public long getNumOfSchedulerNodeHBInterval() {
return this.schedulerNodeHBInterval.getEstimator().getCount();
}

@VisibleForTesting
public long getSizeOfBacklogs() {
return backlogs.value();
}
}
1 change: 1 addition & 0 deletions ...test/java/org/apache/hadoop/yarn/server/resourcemanager/TestCapacitySchedulerMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public RMNodeLabelsManager createNodeLabelManager() {
}

Assert.assertEquals(0, csMetrics.getNumOfAllocates());
Assert.assertEquals(0, csMetrics.getSizeOfBacklogs());
Assert.assertEquals(0, csMetrics.getNumOfCommitSuccess());

RMApp rmApp = MockRMAppSubmitter.submit(rm,
Expand Down