From 57d9a972cbd62aae0ab010d38a0973619972edd6 Mon Sep 17 00:00:00 2001
From: Junping Du <junping_du@apache.org>
Date: Sat, 2 May 2015 10:18:44 -0700
Subject: [PATCH] YARN-2454. Fix compareTo of variable UNBOUNDED in
 o.a.h.y.util.resource.Resources. Contributed by Xu Yang.

---
 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(-)
 create mode 100644 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/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index c110f88b28..899310e3ea 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -290,6 +290,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
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 bcb0421d0a..472811a72a 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 int getMemory() {
 
     @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 int getVirtualCores() {
 
     @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;
     }
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 0000000000..d38ffdc5a5
--- /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);
+  }
+  
+}