hadoop git commit: YARN-6112. UpdateCallDuration is calculated only when debug logging is enabled. (Yufei Gu via kasha)

2017-02-09 Thread kasha 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 d008b5515 -> 41361ec39


YARN-6112. UpdateCallDuration is calculated only when debug logging is enabled. 
(Yufei Gu via kasha)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/41361ec3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/41361ec3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/41361ec3

Branch: refs/heads/branch-2
Commit: 41361ec39e84ec9949285b86ed97888ed4871bc4
Parents: d008b55
Author: Karthik Kambatla 
Authored: Thu Feb 9 13:12:21 2017 -0800
Committer: Karthik Kambatla 
Committed: Thu Feb 9 13:12:21 2017 -0800

--
 .../server/resourcemanager/scheduler/fair/FairScheduler.java  | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/41361ec3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
index 9694d62..f75f2dd 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
@@ -312,6 +312,9 @@ public class FairScheduler extends
   long start = getClock().getTime();
   update();
   long duration = getClock().getTime() - start;
+  // UpdateCall duration and ThreadRun Duration are the same after
+  // YARN-4752 (preemption overhaul), we keep both for compatibility.
+  fsOpDurations.addUpdateCallDuration(duration);
   fsOpDurations.addUpdateThreadRunDuration(duration);
 } catch (InterruptedException ie) {
   LOG.warn("Update thread interrupted. Exiting.");
@@ -351,7 +354,6 @@ public class FairScheduler extends
   protected void update() {
 try {
   writeLock.lock();
-  long start = getClock().getTime();
 
   FSQueue rootQueue = queueMgr.getRootQueue();
 
@@ -374,9 +376,6 @@ public class FairScheduler extends
   rootMetrics.getAvailableVirtualCores()) +
   "  Demand: " + rootQueue.getDemand());
 }
-
-long duration = getClock().getTime() - start;
-fsOpDurations.addUpdateCallDuration(duration);
   }
 } finally {
   writeLock.unlock();


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: YARN-6112. UpdateCallDuration is calculated only when debug logging is enabled. (Yufei Gu via kasha)

2017-02-09 Thread kasha 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 5fb723bb7 -> 9b8505358


YARN-6112. UpdateCallDuration is calculated only when debug logging is enabled. 
(Yufei Gu via kasha)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9b850535
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9b850535
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9b850535

Branch: refs/heads/trunk
Commit: 9b85053583a3560f93062b656061d11b1b9c664f
Parents: 5fb723b
Author: Karthik Kambatla 
Authored: Thu Feb 9 13:09:32 2017 -0800
Committer: Karthik Kambatla 
Committed: Thu Feb 9 13:09:32 2017 -0800

--
 .../server/resourcemanager/scheduler/fair/FSOpDurations.java | 8 
 .../server/resourcemanager/scheduler/fair/FairScheduler.java | 4 
 2 files changed, 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/9b850535/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
--
diff --git 
a/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
 
b/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
index 20d2af9..f6d843a 100644
--- 
a/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
+++ 
b/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
@@ -50,9 +50,6 @@ public class FSOpDurations implements MetricsSource {
   @Metric("Duration for a update thread run")
   MutableRate updateThreadRun;
 
-  @Metric("Duration for an update call")
-  MutableRate updateCall;
-
   @Metric("Duration for a preempt call")
   MutableRate preemptCall;
 
@@ -87,7 +84,6 @@ public class FSOpDurations implements MetricsSource {
 continuousSchedulingRun.setExtended(isExtended);
 nodeUpdateCall.setExtended(isExtended);
 updateThreadRun.setExtended(isExtended);
-updateCall.setExtended(isExtended);
 preemptCall.setExtended(isExtended);
 
 INSTANCE.isExtended = isExtended;
@@ -110,10 +106,6 @@ public class FSOpDurations implements MetricsSource {
 updateThreadRun.add(value);
   }
 
-  public void addUpdateCallDuration(long value) {
-updateCall.add(value);
-  }
-
   public void addPreemptCallDuration(long value) {
 preemptCall.add(value);
   }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9b850535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
index 97871e7..134efff 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
@@ -350,7 +350,6 @@ public class FairScheduler extends
   protected void update() {
 try {
   writeLock.lock();
-  long start = getClock().getTime();
 
   FSQueue rootQueue = queueMgr.getRootQueue();
 
@@ -373,9 +372,6 @@ public class FairScheduler extends
   rootMetrics.getAvailableVirtualCores()) +
   "  Demand: " + rootQueue.getDemand());
 }
-
-long duration = getClock().getTime() - start;
-fsOpDurations.addUpdateCallDuration(duration);
   }
 } finally {
   writeLock.unlock();


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org