diff --git hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java index 108c2bc..6848b22 100644 --- hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java +++ hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java @@ -323,25 +323,6 @@ private void updateQueueWithAllocateRequest(Allocation allocation, queueName); } - private void initQueueMetrics(CSQueue queue) { - if (queue instanceof LeafQueue) { - schedulerMetrics.initQueueMetric(queue.getQueueName()); - return; - } - - for (CSQueue child : queue.getChildQueues()) { - initQueueMetrics(child); - } - } - @Override - public void serviceInit(Configuration configuration) throws Exception { - super.serviceInit(configuration); - - if (metricsON) { - initQueueMetrics(getRootQueue()); - } - } - @Override public void serviceStop() throws Exception { try { diff --git hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java index 81f6648..8e49c51 100644 --- hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java +++ hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java @@ -306,25 +306,6 @@ private void updateQueueWithAllocateRequest(Allocation allocation, queueName); } - private void initQueueMetrics(FSQueue queue) { - if (queue instanceof FSLeafQueue) { - schedulerMetrics.initQueueMetric(queue.getQueueName()); - return; - } - - for (FSQueue child : queue.getChildQueues()) { - initQueueMetrics(child); - } - } - - @Override - public void serviceInit(Configuration conf) throws Exception { - super.serviceInit(conf); - if (metricsON) { - initQueueMetrics(getQueueManager().getRootQueue()); - } - } - @Override public void serviceStop() throws Exception { try { diff --git hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerMetrics.java hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerMetrics.java index a8792e8..2f63ace 100644 --- hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerMetrics.java +++ hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerMetrics.java @@ -556,20 +556,6 @@ private void traceQueueIfNotTraced(String queue) { } } - void initQueueMetric(String queueName){ - SortedMap counterMap = metrics.getCounters(); - - for (QueueMetric queueMetric : QueueMetric.values()) { - String metricName = getQueueMetricName(queueName, queueMetric); - if (!counterMap.containsKey(metricName)) { - metrics.counter(metricName); - counterMap = metrics.getCounters(); - } - } - - traceQueueIfNotTraced(queueName); - } - void updateQueueMetrics(Resource pendingResource, Resource allocatedResource, String queueName) { SortedMap counterMap = metrics.getCounters();