YARN-7270. Fix unsafe casting from long to int for class Resource and its sub-classes. (Yufei)
(cherry picked from commit 7a27c2c367
)
This commit is contained in:
parent
24ac7c6e79
commit
dbf6c48af9
|
@ -61,7 +61,7 @@ public abstract class Resource implements Comparable<Resource> {
|
|||
}
|
||||
@Override
|
||||
public int getMemory() {
|
||||
return (int)memory;
|
||||
return castToIntSafely(memory);
|
||||
}
|
||||
@Override
|
||||
public void setMemory(int memory) {
|
||||
|
@ -77,7 +77,7 @@ public abstract class Resource implements Comparable<Resource> {
|
|||
}
|
||||
@Override
|
||||
public int getVirtualCores() {
|
||||
return (int)vcores;
|
||||
return castToIntSafely(vcores);
|
||||
}
|
||||
@Override
|
||||
public void setVirtualCores(int vcores) {
|
||||
|
@ -206,4 +206,18 @@ public abstract class Resource implements Comparable<Resource> {
|
|||
public String toString() {
|
||||
return "<memory:" + getMemorySize() + ", vCores:" + getVirtualCores() + ">";
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert long to int for a resource value safely. This method assumes
|
||||
* resource value is positive.
|
||||
*
|
||||
* @param value long resource value
|
||||
* @return int resource value
|
||||
*/
|
||||
protected static int castToIntSafely(long value) {
|
||||
if (value > Integer.MAX_VALUE) {
|
||||
return Integer.MAX_VALUE;
|
||||
}
|
||||
return Long.valueOf(value).intValue();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,43 @@
|
|||
/**
|
||||
* 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.api.records;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
/**
|
||||
* The class to test {@link Resource}.
|
||||
*/
|
||||
public class TestResource {
|
||||
|
||||
@Test
|
||||
public void testCastToIntSafely() {
|
||||
assertEquals(0, Resource.castToIntSafely(0));
|
||||
assertEquals(1, Resource.castToIntSafely(1));
|
||||
assertEquals(Integer.MAX_VALUE,
|
||||
Resource.castToIntSafely(Integer.MAX_VALUE));
|
||||
|
||||
assertEquals("Cast to Integer.MAX_VALUE if the long is greater than "
|
||||
+ "Integer.MAX_VALUE", Integer.MAX_VALUE,
|
||||
Resource.castToIntSafely(Integer.MAX_VALUE + 1L));
|
||||
assertEquals("Cast to Integer.MAX_VALUE if the long is greater than "
|
||||
+ "Integer.MAX_VALUE", Integer.MAX_VALUE,
|
||||
Resource.castToIntSafely(Long.MAX_VALUE));
|
||||
}
|
||||
}
|
|
@ -70,7 +70,7 @@ public class ResourcePBImpl extends Resource {
|
|||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public int getMemory() {
|
||||
return (int) getMemorySize();
|
||||
return castToIntSafely(this.getMemorySize());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Reference in New Issue