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 st...@apache.org on 2017/03/13 13:56:35 UTC
[23/50] [abbrv] hadoop git commit: YARN-6297.
TestAppLogAggregatorImp.verifyFilesUploaded() should check # of filed
uploaded with that of files expected (haibochen via rkanter)
YARN-6297. TestAppLogAggregatorImp.verifyFilesUploaded() should check # of filed uploaded with that of files expected (haibochen via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/287ba4ff
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/287ba4ff
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/287ba4ff
Branch: refs/heads/HADOOP-13345
Commit: 287ba4ffa66212c02e1b1edc8fca53f6368a9efc
Parents: 98142d2
Author: Robert Kanter <rk...@apache.org>
Authored: Wed Mar 8 10:45:33 2017 -0800
Committer: Robert Kanter <rk...@apache.org>
Committed: Wed Mar 8 10:45:33 2017 -0800
----------------------------------------------------------------------
.../logaggregation/TestAppLogAggregatorImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/287ba4ff/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestAppLogAggregatorImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestAppLogAggregatorImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestAppLogAggregatorImpl.java
index 2602d55..17d527a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestAppLogAggregatorImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestAppLogAggregatorImpl.java
@@ -146,7 +146,7 @@ public class TestAppLogAggregatorImpl {
verifyLogAggregationWithExpectedFiles2DeleteAndUpload(applicationId,
containerId, logRententionSec, recoveredLogInitedTimeMillis,
- logFiles, new HashSet<File>());
+ logFiles, logFiles);
}
@Test
@@ -170,7 +170,7 @@ public class TestAppLogAggregatorImpl {
final long week = 7 * 24 * 60 * 60;
final long recoveredLogInitedTimeMillis = System.currentTimeMillis() -
- 2*week;
+ 2 * week * 1000;
verifyLogAggregationWithExpectedFiles2DeleteAndUpload(
applicationId, containerId, week, recoveredLogInitedTimeMillis,
logFiles, new HashSet<File>());
@@ -257,7 +257,7 @@ public class TestAppLogAggregatorImpl {
Set<String> filesExpected) {
final String errMsgPrefix = "The set of files uploaded are not the same " +
"as expected";
- if(filesUploaded.size() != filesUploaded.size()) {
+ if(filesUploaded.size() != filesExpected.size()) {
fail(errMsgPrefix + ": actual size: " + filesUploaded.size() + " vs " +
"expected size: " + filesExpected.size());
}
@@ -413,7 +413,7 @@ public class TestAppLogAggregatorImpl {
FileContext lfs, long recoveredLogInitedTime) throws IOException {
super(dispatcher, deletionService, conf, appId, ugi, nodeId,
dirsHandler, remoteNodeLogFileForApp, appAcls,
- logAggregationContext, context, lfs, recoveredLogInitedTime);
+ logAggregationContext, context, lfs, -1, recoveredLogInitedTime);
this.applicationId = appId;
this.deletionService = deletionService;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org