Index: hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java =================================================================== --- hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java +++ hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java @@ -70,7 +70,7 @@ @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 @@ @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; } Index: hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResources.java =================================================================== --- hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResources.java +++ 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); + } + +}