Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-3384. TestLogAggregationService.verifyContainerLogs fails after YARN-2777. Contributed by Naganarasimha G R.

This commit is contained in:
Tsuyoshi Ozawa 2015-03-24 00:25:30 +09:00
parent 0b9f12c847
commit 82eda771e0
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -816,6 +816,9 @@ Release 2.7.0 - UNRELEASED
YARN-3369. Missing NullPointer check in AppSchedulingInfo causes RM to die. YARN-3369. Missing NullPointer check in AppSchedulingInfo causes RM to die.
(Brahma Reddy Battula via wangda) (Brahma Reddy Battula via wangda)
YARN-3384. TestLogAggregationService.verifyContainerLogs fails after
YARN-2777. (Naganarasimha G R via ozawa)
Release 2.6.0 - 2014-11-18 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java
View File

@ -804,7 +804,9 @@ public class TestLogAggregationService extends BaseContainerManagerTest {
Map<String, String> thisContainerMap = logMap.remove(containerStr); Map<String, String> thisContainerMap = logMap.remove(containerStr);
Assert.assertEquals(numOfContainerLogs, thisContainerMap.size()); Assert.assertEquals(numOfContainerLogs, thisContainerMap.size());
for (String fileType : logFiles) { for (String fileType : logFiles) {
String expectedValue = containerStr + " Hello " + fileType + "!"; String expectedValue =
containerStr + " Hello " + fileType + "!End of LogType:"
+ fileType;
LOG.info("Expected log-content : " + new String(expectedValue)); LOG.info("Expected log-content : " + new String(expectedValue));
String foundValue = thisContainerMap.remove(fileType); String foundValue = thisContainerMap.remove(fileType);
Assert.assertNotNull(cId + " " + fileType Assert.assertNotNull(cId + " " + fileType