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 2015/05/02 19:01:35 UTC
hadoop git commit: YARN-2454. Fix compareTo of variable UNBOUNDED in
o.a.h.y.util.resource.Resources. Contributed by Xu Yang. (cherry picked from
commit 57d9a972cbd62aae0ab010d38a0973619972edd6)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 ff6492d60 -> 8068e7998
YARN-2454. Fix compareTo of variable UNBOUNDED in o.a.h.y.util.resource.Resources. Contributed by Xu Yang.
(cherry picked from commit 57d9a972cbd62aae0ab010d38a0973619972edd6)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8068e799
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8068e799
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8068e799
Branch: refs/heads/branch-2
Commit: 8068e79989d3e8cba3dab7d3acc5d5eb1012b735
Parents: ff6492d
Author: Junping Du <ju...@apache.org>
Authored: Sat May 2 10:18:44 2015 -0700
Committer: Junping Du <ju...@apache.org>
Committed: Sat May 2 10:20:30 2015 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 ++
.../hadoop/yarn/util/resource/Resources.java | 8 ++--
.../yarn/util/resource/TestResources.java | 50 ++++++++++++++++++++
3 files changed, 57 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8068e799/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 4f0b769..4893c1c 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -242,6 +242,9 @@ Release 2.8.0 - UNRELEASED
YARN-2893. AMLaucher: sporadic job failures due to EOFException in
readTokenStorageStream. (Zhihai Xu via gera)
+ YARN-2454. Fix compareTo of variable UNBOUNDED in o.a.h.y.util.resource.Resources.
+ (Xu Yang via junping_du)
+
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8068e799/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java
index bcb0421..472811a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java
@@ -70,7 +70,7 @@ public class Resources {
@Override
public void setMemory(int memory) {
- throw new RuntimeException("NONE cannot be modified!");
+ throw new RuntimeException("UNBOUNDED cannot be modified!");
}
@Override
@@ -80,14 +80,14 @@ public class Resources {
@Override
public void setVirtualCores(int cores) {
- throw new RuntimeException("NONE cannot be modified!");
+ throw new RuntimeException("UNBOUNDED cannot be modified!");
}
@Override
public int compareTo(Resource o) {
- int diff = 0 - o.getMemory();
+ int diff = Integer.MAX_VALUE - o.getMemory();
if (diff == 0) {
- diff = 0 - o.getVirtualCores();
+ diff = Integer.MAX_VALUE - o.getVirtualCores();
}
return diff;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8068e799/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResources.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResources.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResources.java
new file mode 100644
index 0000000..d38ffdc
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResources.java
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.util.resource;
+
+import org.apache.hadoop.yarn.api.records.Resource;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
+public class TestResources {
+
+ public Resource createResource(int memory, int vCores) {
+ return Resource.newInstance(memory, vCores);
+ }
+
+ @Test(timeout=1000)
+ public void testCompareToWithUnboundedResource() {
+ assertTrue(Resources.unbounded().compareTo(
+ createResource(Integer.MAX_VALUE, Integer.MAX_VALUE)) == 0);
+ assertTrue(Resources.unbounded().compareTo(
+ createResource(Integer.MAX_VALUE, 0)) > 0);
+ assertTrue(Resources.unbounded().compareTo(
+ createResource(0, Integer.MAX_VALUE)) > 0);
+ }
+
+ @Test(timeout=1000)
+ public void testCompareToWithNoneResource() {
+ assertTrue(Resources.none().compareTo(createResource(0, 0)) == 0);
+ assertTrue(Resources.none().compareTo(
+ createResource(1, 0)) < 0);
+ assertTrue(Resources.none().compareTo(
+ createResource(0, 1)) < 0);
+ }
+
+}