Author: junping_du
Date: Sat May 17 02:04:12 2014
New Revision: 1595418
URL: http://svn.apache.org/r1595418
Log:
Merge r1595416 from branch-2: Wrong field is referenced in
GetApplicationsRequestPBImpl#mergeLocalToBuilder (Contributed by Hong Zhiguo)
Modified:
hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationsRequestPBImpl.java
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestGetApplicationsRequest.java
Modified: hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt?rev=1595418&r1=1595417&r2=1595418&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt Sat May
17 02:04:12 2014
@@ -114,6 +114,9 @@ Release 2.4.1 - UNRELEASED
YARN-2053. Fixed a bug in AMS to not add null NMToken into NMTokens list
from
previous attempts for work-preserving AM restart. (Wangda Tan via jianhe)
+ YARN-2066. Wrong field is referenced in
GetApplicationsRequestPBImpl#mergeLocalToBuilder()
+ (Hong Zhiguo via junping_du)
+
Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationsRequestPBImpl.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationsRequestPBImpl.java?rev=1595418&r1=1595417&r2=1595418&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationsRequestPBImpl.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationsRequestPBImpl.java
Sat May 17 02:04:12 2014
@@ -127,8 +127,8 @@ public class GetApplicationsRequestPBImp
}
if (this.finish != null) {
- builder.setFinishBegin(start.getMinimumLong());
- builder.setFinishEnd(start.getMaximumLong());
+ builder.setFinishBegin(finish.getMinimumLong());
+ builder.setFinishEnd(finish.getMaximumLong());
}
builder.setLimit(limit);
Modified:
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestGetApplicationsRequest.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestGetApplicationsRequest.java?rev=1595418&r1=1595417&r2=1595418&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestGetApplicationsRequest.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestGetApplicationsRequest.java
Sat May 17 02:04:12 2014
@@ -47,10 +47,12 @@ public class TestGetApplicationsRequest
types.add("type1");
request.setApplicationTypes(types);
- long begin = System.currentTimeMillis();
- long end = System.currentTimeMillis() + 1;
- request.setStartRange(begin, end);
- request.setFinishRange(begin, end);
+ long startBegin = System.currentTimeMillis();
+ long startEnd = System.currentTimeMillis() + 1;
+ request.setStartRange(startBegin, startEnd);
+ long finishBegin = System.currentTimeMillis() + 2;
+ long finishEnd = System.currentTimeMillis() + 3;
+ request.setFinishRange(finishBegin, finishEnd);
long limit = 100L;
request.setLimit(limit);
@@ -85,11 +87,11 @@ public class TestGetApplicationsRequest
Assert.assertEquals(
"StartRange from proto is not the same with original request",
- requestFromProto.getStartRange(), new LongRange(begin, end));
+ requestFromProto.getStartRange(), new LongRange(startBegin, startEnd));
Assert.assertEquals(
"FinishRange from proto is not the same with original request",
- requestFromProto.getFinishRange(), new LongRange(begin, end));
+ requestFromProto.getFinishRange(), new LongRange(finishBegin,
finishEnd));
Assert.assertEquals(
"Limit from proto is not the same with original request",
