浏览代码

Revert "YARN-6298. Metric preemptCall is not used in new preemption. (Yufei Gu via kasha)"

This reverts commit dcfce5fcddcfdd23392586c87adf7c14e8ef265e.
Karthik Kambatla 8 年之前
父节点
当前提交
e0b143e51a

+ 8 - 0
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSOpDurations.java

@@ -53,6 +53,9 @@ public class FSOpDurations implements MetricsSource {
   @Metric("Duration for an update call")
   @Metric("Duration for an update call")
   MutableRate updateCall;
   MutableRate updateCall;
 
 
+  @Metric("Duration for a preempt call")
+  MutableRate preemptCall;
+
   private static final MetricsInfo RECORD_INFO =
   private static final MetricsInfo RECORD_INFO =
       info("FSOpDurations", "Durations of FairScheduler calls or thread-runs");
       info("FSOpDurations", "Durations of FairScheduler calls or thread-runs");
 
 
@@ -85,6 +88,7 @@ public class FSOpDurations implements MetricsSource {
     nodeUpdateCall.setExtended(isExtended);
     nodeUpdateCall.setExtended(isExtended);
     updateThreadRun.setExtended(isExtended);
     updateThreadRun.setExtended(isExtended);
     updateCall.setExtended(isExtended);
     updateCall.setExtended(isExtended);
+    preemptCall.setExtended(isExtended);
 
 
     INSTANCE.isExtended = isExtended;
     INSTANCE.isExtended = isExtended;
   }
   }
@@ -110,6 +114,10 @@ public class FSOpDurations implements MetricsSource {
     updateCall.add(value);
     updateCall.add(value);
   }
   }
 
 
+  public void addPreemptCallDuration(long value) {
+    preemptCall.add(value);
+  }
+
   @VisibleForTesting
   @VisibleForTesting
   public boolean hasUpdateThreadRunChanged() {
   public boolean hasUpdateThreadRunChanged() {
     return updateThreadRun.changed();
     return updateThreadRun.changed();