big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-6377. NMTimelinePublisher#serviceStop does not stop timeline clients (Haibo Chen via Varun Saxena)

Browse Source
This commit is contained in:
Varun Saxena 2017-04-02 04:54:12 +05:30
parent b8838578ce
commit a4b5aa8493
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java
View File

@ -101,6 +101,14 @@ protected void serviceStart() throws Exception {
this.nodeId = context.getNodeId(); this.nodeId = context.getNodeId();
} }
@Override
protected void serviceStop() throws Exception {
for(ApplicationId app : appToClientMap.keySet()) {
stopTimelineClient(app);
}
super.serviceStop();
}
@VisibleForTesting @VisibleForTesting
Map<ApplicationId, TimelineV2Client> getAppToClientMap() { Map<ApplicationId, TimelineV2Client> getAppToClientMap() {
return appToClientMap; return appToClientMap;

10
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/TestNMTimelinePublisher.java
View File

@ -35,6 +35,7 @@
import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntity; import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntity;
import org.apache.hadoop.yarn.api.records.timelineservice.TimelineMetric; import org.apache.hadoop.yarn.api.records.timelineservice.TimelineMetric;
import org.apache.hadoop.yarn.client.api.impl.TimelineV2ClientImpl; import org.apache.hadoop.yarn.client.api.impl.TimelineV2ClientImpl;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.hadoop.yarn.server.nodemanager.Context; import org.apache.hadoop.yarn.server.nodemanager.Context;
import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.Container; import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.Container;
@ -53,14 +54,21 @@ public void testContainerResourceUsage() {
final DummyTimelineClient timelineClient = new DummyTimelineClient(null); final DummyTimelineClient timelineClient = new DummyTimelineClient(null);
when(context.getNodeId()).thenReturn(NodeId.newInstance("localhost", 0)); when(context.getNodeId()).thenReturn(NodeId.newInstance("localhost", 0));
when(context.getHttpPort()).thenReturn(0); when(context.getHttpPort()).thenReturn(0);
Configuration conf = new Configuration();
conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
conf.setFloat(YarnConfiguration.TIMELINE_SERVICE_VERSION, 2.0f);
NMTimelinePublisher publisher = new NMTimelinePublisher(context) { NMTimelinePublisher publisher = new NMTimelinePublisher(context) {
public void createTimelineClient(ApplicationId appId) { public void createTimelineClient(ApplicationId appId) {
if (!getAppToClientMap().containsKey(appId)) { if (!getAppToClientMap().containsKey(appId)) {
timelineClient.init(getConfig());
timelineClient.start();
getAppToClientMap().put(appId, timelineClient); getAppToClientMap().put(appId, timelineClient);
} }
} }
}; };
publisher.init(new Configuration()); publisher.init(conf);
publisher.start(); publisher.start();
ApplicationId appId = ApplicationId.newInstance(0, 1); ApplicationId appId = ApplicationId.newInstance(0, 1);
publisher.createTimelineClient(appId); publisher.createTimelineClient(appId);