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

YARN-6170. TimelineReaderServer should wait to join with HttpServer2 (Sangjin Lee via Varun Saxena)

Browse Source
This commit is contained in:
Varun Saxena 2017-02-11 19:21:45 +05:30
parent 0aacd8fd25
commit 649deb72fb
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderServer.java
View File

@ -110,6 +110,16 @@ protected void serviceStart() throws Exception {
startTimelineReaderWebApp(); startTimelineReaderWebApp();
} }
private void join() {
// keep the main thread that started the server up until it receives a stop
// signal
if (readerWebServer != null) {
try {
readerWebServer.join();
} catch (InterruptedException ignore) {}
}
}
@Override @Override
protected void serviceStop() throws Exception { protected void serviceStop() throws Exception {
if (readerWebServer != null) { if (readerWebServer != null) {
@ -194,6 +204,7 @@ public static void main(String[] args) {
Configuration conf = new YarnConfiguration(); Configuration conf = new YarnConfiguration();
conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true); conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
conf.setFloat(YarnConfiguration.TIMELINE_SERVICE_VERSION, 2.0f); conf.setFloat(YarnConfiguration.TIMELINE_SERVICE_VERSION, 2.0f);
startTimelineReaderServer(args, conf); TimelineReaderServer server = startTimelineReaderServer(args, conf);
server.join();
} }
} }