You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zj...@apache.org on 2014/10/29 06:44:47 UTC
git commit: YARN-2747. Fixed the test failure of
TestAggregatedLogFormat when native I/O is enabled. Contributed by Xuan Gong.
Repository: hadoop
Updated Branches:
refs/heads/trunk 3c5f5af11 -> ec63a3ffb
YARN-2747. Fixed the test failure of TestAggregatedLogFormat when native I/O is enabled. Contributed by Xuan Gong.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ec63a3ff
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ec63a3ff
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ec63a3ff
Branch: refs/heads/trunk
Commit: ec63a3ffbd9413e7434594682fdbbd36eef7413c
Parents: 3c5f5af
Author: Zhijie Shen <zj...@apache.org>
Authored: Tue Oct 28 22:43:40 2014 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Tue Oct 28 22:43:40 2014 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../yarn/logaggregation/TestAggregatedLogFormat.java | 12 +++++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec63a3ff/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index fe829a4..ce56f0d 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -789,6 +789,9 @@ Release 2.6.0 - UNRELEASED
YARN-2741. Made NM web UI serve logs on the drive other than C: on Windows. (Craig
Welch via zjshen)
+ YARN-2747. Fixed the test failure of TestAggregatedLogFormat when native I/O is
+ enabled. (Xuan Gong via zjshen)
+
Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec63a3ff/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java
index 1d607b1..bc0485e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java
@@ -305,6 +305,8 @@ public class TestAggregatedLogFormat {
// It is trying simulate a situation where first log file is owned by
// different user (probably symlink) and second one by the user itself.
+ // The first file should not be aggregated. Because this log file has the invalid
+ // user name.
when(logValue.getUser()).thenReturn(randomUser).thenReturn(
ugi.getShortUserName());
logWriter.append(logKey, logValue);
@@ -329,6 +331,9 @@ public class TestAggregatedLogFormat {
expectedOwner = adminsGroupString;
}
}
+
+ // This file: stderr should not be aggregated.
+ // And we will not aggregate the log message.
String stdoutFile1 =
StringUtils.join(
File.separator,
@@ -336,10 +341,8 @@ public class TestAggregatedLogFormat {
workDir.getAbsolutePath(), "srcFiles",
testContainerId1.getApplicationAttemptId().getApplicationId()
.toString(), testContainerId1.toString(), stderr }));
- String message1 =
- "Owner '" + expectedOwner + "' for path " + stdoutFile1
- + " did not match expected owner '" + randomUser + "'";
-
+
+ // The file: stdout is expected to be aggregated.
String stdoutFile2 =
StringUtils.join(
File.separator,
@@ -352,7 +355,6 @@ public class TestAggregatedLogFormat {
+ stdoutFile2 + " did not match expected owner '"
+ ugi.getShortUserName() + "'";
- Assert.assertTrue(line.contains(message1));
Assert.assertFalse(line.contains(message2));
Assert.assertFalse(line.contains(data + testContainerId1.toString()
+ stderr));