You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by de...@apache.org on 2014/06/24 15:57:31 UTC
svn commit: r1605083 - in /hadoop/common/trunk/hadoop-yarn-project:
CHANGES.txt
hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceRequest.java
Author: devaraj
Date: Tue Jun 24 13:57:31 2014
New Revision: 1605083
URL: http://svn.apache.org/r1605083
Log:
YARN-2195. Clean a piece of code in ResourceRequest. Contributed by Wei Yan.
Modified:
hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceRequest.java
Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1605083&r1=1605082&r2=1605083&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Tue Jun 24 13:57:31 2014
@@ -173,6 +173,8 @@ Release 2.5.0 - UNRELEASED
YARN-2191. Added a new test to ensure NM will clean up completed applications
in the case of RM restart. (Wangda Tan via jianhe)
+ YARN-2195. Clean a piece of code in ResourceRequest. (Wei Yan via devaraj)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceRequest.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceRequest.java?rev=1605083&r1=1605082&r2=1605083&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceRequest.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ResourceRequest.java Tue Jun 24 13:57:31 2014
@@ -296,13 +296,7 @@ public abstract class ResourceRequest im
int capabilityComparison =
this.getCapability().compareTo(other.getCapability());
if (capabilityComparison == 0) {
- int numContainersComparison =
- this.getNumContainers() - other.getNumContainers();
- if (numContainersComparison == 0) {
- return 0;
- } else {
- return numContainersComparison;
- }
+ return this.getNumContainers() - other.getNumContainers();
} else {
return capabilityComparison;
}