You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by bi...@apache.org on 2019/08/21 08:30:25 UTC
[hadoop] branch branch-3.1 updated: YARN-9765. SLS runner crashes
when run with metrics turned off. Contributed by Abhishek Modi.
This is an automated email from the ASF dual-hosted git repository.
bibinchundatt pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 3547261 YARN-9765. SLS runner crashes when run with metrics turned off. Contributed by Abhishek Modi.
3547261 is described below
commit 35472617498c98c822d6693c32db691983a70e18
Author: bibinchundatt <bi...@apache.org>
AuthorDate: Wed Aug 21 13:48:21 2019 +0530
YARN-9765. SLS runner crashes when run with metrics turned off. Contributed by Abhishek Modi.
(cherry picked from commit 10ec31d20ee1b6a0b1da915acb6b6ec33f2cd415)
---
.../src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
index 44aaf74..70676a9 100644
--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
+++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
@@ -76,6 +76,7 @@ import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
import org.apache.hadoop.yarn.sls.nodemanager.NMSimulator;
import org.apache.hadoop.yarn.sls.resourcemanager.MockAMLauncher;
import org.apache.hadoop.yarn.sls.scheduler.SLSCapacityScheduler;
+import org.apache.hadoop.yarn.sls.scheduler.SchedulerMetrics;
import org.apache.hadoop.yarn.sls.scheduler.TaskRunner;
import org.apache.hadoop.yarn.sls.scheduler.SLSFairScheduler;
import org.apache.hadoop.yarn.sls.scheduler.ContainerSimulator;
@@ -732,7 +733,10 @@ public class SLSRunner extends Configured implements Tool {
}
queueAppNumMap.put(queueName, appNum);
- wrapper.getSchedulerMetrics().trackQueue(queueName);
+ SchedulerMetrics metrics = wrapper.getSchedulerMetrics();
+ if (metrics != null) {
+ metrics.trackQueue(queueName);
+ }
}
private void runNewAM(String jobType, String user,
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org