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 ju...@apache.org on 2014/12/01 14:30:58 UTC
hadoop git commit: YARN-2907. SchedulerNode#toString should print all
resource detail instead of only memory. (Contributed by Rohith)
Repository: hadoop
Updated Branches:
refs/heads/trunk 1556f86a3 -> c732ed760
YARN-2907. SchedulerNode#toString should print all resource detail instead of only memory. (Contributed by Rohith)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c732ed76
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c732ed76
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c732ed76
Branch: refs/heads/trunk
Commit: c732ed760e115192652280cd4b5799d49e62db7e
Parents: 1556f86
Author: Junping Du <ju...@apache.org>
Authored: Mon Dec 1 05:38:22 2014 -0800
Committer: Junping Du <ju...@apache.org>
Committed: Mon Dec 1 05:38:22 2014 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../yarn/server/resourcemanager/scheduler/SchedulerNode.java | 5 ++---
.../server/resourcemanager/TestWorkPreservingRMRestart.java | 8 ++++++++
3 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c732ed76/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index e8b82a0..22de88b 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -101,6 +101,9 @@ Release 2.7.0 - UNRELEASED
YARN-2165. Added the sanity check for the numeric configuration values of
the timeline service. (Vasanth kumar RJ via zjshen)
+ YARN-2907. SchedulerNode#toString should print all resource detail instead
+ of only memory. (Rohith via junping_du)
+
OPTIMIZATIONS
BUG FIXES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c732ed76/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.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/SchedulerNode.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java
index f4d8731..b115fc8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java
@@ -242,9 +242,8 @@ public abstract class SchedulerNode {
@Override
public String toString() {
return "host: " + rmNode.getNodeAddress() + " #containers="
- + getNumContainers() + " available="
- + getAvailableResource().getMemory() + " used="
- + getUsedResource().getMemory();
+ + getNumContainers() + " available=" + getAvailableResource()
+ + " used=" + getUsedResource();
}
/**
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c732ed76/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java
index 1cefcf8..853e0a5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java
@@ -214,6 +214,14 @@ public class TestWorkPreservingRMRestart {
AbstractYarnScheduler scheduler =
(AbstractYarnScheduler) rm2.getResourceScheduler();
SchedulerNode schedulerNode1 = scheduler.getSchedulerNode(nm1.getNodeId());
+ assertTrue(
+ "SchedulerNode#toString is not in expected format",
+ schedulerNode1
+ .toString().contains(schedulerNode1.getAvailableResource().toString()));
+ assertTrue(
+ "SchedulerNode#toString is not in expected format",
+ schedulerNode1
+ .toString().contains(schedulerNode1.getUsedResource().toString()));
// ********* check scheduler node state.*******
// 2 running containers.