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 2015/02/25 18:23:55 UTC
[12/50] [abbrv] hadoop git commit: YARN-2799. Cleanup
TestLogAggregationService based on the change in YARN-90. Contributed by
Zhihai Xu
YARN-2799. Cleanup TestLogAggregationService based on the change in YARN-90. Contributed by Zhihai Xu
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c33ae271
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c33ae271
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c33ae271
Branch: refs/heads/YARN-2928
Commit: c33ae271c24f0770c9735ccd2086cafda4f4e0b2
Parents: a64dd3d
Author: Junping Du <ju...@apache.org>
Authored: Fri Feb 20 09:43:39 2015 -0800
Committer: Junping Du <ju...@apache.org>
Committed: Fri Feb 20 09:43:39 2015 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../TestLogAggregationService.java | 25 +++-----------------
2 files changed, 6 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c33ae271/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 8ec2409..e71da2d 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -307,6 +307,9 @@ Release 2.7.0 - UNRELEASED
YARN-3076. Add API/Implementation to YarnClient to retrieve label-to-node
mapping. (Varun Saxena via wangda)
+ YARN-2799. Cleanup TestLogAggregationService based on the change in YARN-90.
+ (Zhihai Xu via junping_du)
+
OPTIMIZATIONS
YARN-2990. FairScheduler's delay-scheduling always waits for node-local and
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c33ae271/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
----------------------------------------------------------------------
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/TestLogAggregationService.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/TestLogAggregationService.java
index 7d911e9..901e45a 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/TestLogAggregationService.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/TestLogAggregationService.java
@@ -248,7 +248,6 @@ public class TestLogAggregationService extends BaseContainerManagerTest {
};
checkEvents(appEventHandler, expectedEvents, true, "getType", "getApplicationID");
- dispatcher.stop();
}
@Test
@@ -295,7 +294,6 @@ public class TestLogAggregationService extends BaseContainerManagerTest {
ApplicationEventType.APPLICATION_LOG_HANDLING_FINISHED)
};
checkEvents(appEventHandler, expectedEvents, true, "getType", "getApplicationID");
- dispatcher.stop();
logAggregationService.close();
}
@@ -308,10 +306,7 @@ public class TestLogAggregationService extends BaseContainerManagerTest {
this.remoteRootLogDir.getAbsolutePath());
String[] fileNames = new String[] { "stdout", "stderr", "syslog" };
- DrainDispatcher dispatcher = createDispatcher();
- EventHandler<ApplicationEvent> appEventHandler = mock(EventHandler.class);
- dispatcher.register(ApplicationEventType.class, appEventHandler);
-
+
LogAggregationService logAggregationService =
new LogAggregationService(dispatcher, this.context, this.delSrvc,
super.dirsHandler);
@@ -441,7 +436,6 @@ public class TestLogAggregationService extends BaseContainerManagerTest {
ApplicationEventType.APPLICATION_LOG_HANDLING_FINISHED)
};
checkEvents(appEventHandler, expectedFinishedEvents, false, "getType", "getApplicationID");
- dispatcher.stop();
}
@Test
@@ -518,8 +512,7 @@ public class TestLogAggregationService extends BaseContainerManagerTest {
File aNewFile = new File(String.valueOf("tmp"+System.currentTimeMillis()));
this.conf.set(YarnConfiguration.NM_REMOTE_APP_LOG_DIR,
aNewFile.getAbsolutePath());
-
- DrainDispatcher dispatcher = createDispatcher();
+
LogAggregationService logAggregationService = spy(
new LogAggregationService(dispatcher, this.context, this.delSrvc,
super.dirsHandler));
@@ -590,6 +583,7 @@ public class TestLogAggregationService extends BaseContainerManagerTest {
verify(spyFs, never()).mkdirs(eq(appDir3), isA(FsPermission.class));
aggSvc.stop();
aggSvc.close();
+ dispatcher.stop();
}
@Test
@@ -1122,10 +1116,6 @@ public class TestLogAggregationService extends BaseContainerManagerTest {
this.conf.set(YarnConfiguration.NM_REMOTE_APP_LOG_DIR,
this.remoteRootLogDir.getAbsolutePath());
- DrainDispatcher dispatcher = createDispatcher();
- EventHandler<ApplicationEvent> appEventHandler = mock(EventHandler.class);
- dispatcher.register(ApplicationEventType.class, appEventHandler);
-
ApplicationId application1 = BuilderUtils.newApplicationId(1234, 1);
ApplicationId application2 = BuilderUtils.newApplicationId(1234, 2);
ApplicationId application3 = BuilderUtils.newApplicationId(1234, 3);
@@ -1282,7 +1272,6 @@ public class TestLogAggregationService extends BaseContainerManagerTest {
ApplicationEventType.APPLICATION_LOG_HANDLING_FINISHED) };
checkEvents(appEventHandler, expectedFinishedEvents, false, "getType",
"getApplicationID");
- dispatcher.stop();
}
@Test (timeout = 50000)
@@ -1319,10 +1308,6 @@ public class TestLogAggregationService extends BaseContainerManagerTest {
// again in next cycle.
this.conf.setLong(YarnConfiguration.DEBUG_NM_DELETE_DELAY_SEC, 3600);
- DrainDispatcher dispatcher = createDispatcher();
- EventHandler<ApplicationEvent> appEventHandler = mock(EventHandler.class);
- dispatcher.register(ApplicationEventType.class, appEventHandler);
-
ApplicationId application = BuilderUtils.newApplicationId(123456, 1);
ApplicationAttemptId appAttemptId =
BuilderUtils.newApplicationAttemptId(application, 1);
@@ -1426,7 +1411,6 @@ public class TestLogAggregationService extends BaseContainerManagerTest {
new ContainerId[] { container }, logFiles3, 3, true);
logAggregationService.stop();
assertEquals(0, logAggregationService.getNumAggregators());
- dispatcher.stop();
}
@@ -1436,8 +1420,6 @@ public class TestLogAggregationService extends BaseContainerManagerTest {
conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
"kerberos");
UserGroupInformation.setConfiguration(conf);
- DrainDispatcher dispatcher = createDispatcher();
- dispatcher.register(ApplicationEventType.class, appEventHandler);
ApplicationId application1 = BuilderUtils.newApplicationId(1234, 1);
Application mockApp = mock(Application.class);
@@ -1484,7 +1466,6 @@ public class TestLogAggregationService extends BaseContainerManagerTest {
}
}, 1000, 20000);
logAggregationService.stop();
- dispatcher.stop();
}
private int numOfLogsAvailable(LogAggregationService logAggregationService,