Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-5271. ATS client doesn't work with Jersey 2 on the classpath. Contributed by Weiwei Yang. 

(cherry picked from commit 09520cb439)
(cherry picked from commit c5a3ec493b)
This commit is contained in:
Wei-Chiu Chuang 2016-11-17 22:17:23 -06:00
parent 416f6f3605
commit 20c90e13b8
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java
View File

@ -174,11 +174,24 @@ public class YarnClientImpl extends YarnClient {
if (conf.getBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED,
YarnConfiguration.DEFAULT_TIMELINE_SERVICE_ENABLED)) {
timelineServiceEnabled = true;
timelineClient = createTimelineClient();
timelineClient.init(conf);
timelineDTRenewer = getTimelineDelegationTokenRenewer(conf);
timelineService = TimelineUtils.buildTimelineTokenService(conf);
try {
timelineServiceEnabled = true;
timelineClient = createTimelineClient();
timelineClient.init(conf);
timelineDTRenewer = getTimelineDelegationTokenRenewer(conf);
timelineService = TimelineUtils.buildTimelineTokenService(conf);
} catch (NoClassDefFoundError error) {
// When attempt to initiate the timeline client with
// different set of dependencies, it may fail with
// NoClassDefFoundError. When some of them are not compatible
// with timeline server. This is not necessarily a fatal error
// to the client.
LOG.warn("Timeline client could not be initialized "
+ "because dependency missing or incompatible,"
+ " disabling timeline client.",
error);
timelineServiceEnabled = false;
}
}
timelineServiceBestEffort = conf.getBoolean(

21
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
View File

@ -18,6 +18,7 @@
package org.apache.hadoop.yarn.client.api.impl;
import static org.junit.Assert.assertFalse;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@ -155,6 +156,26 @@ public class TestYarnClient {
rm.stop();
}
@Test
public void testTimelineClientInitFailure() throws Exception{
Configuration conf = new Configuration();
conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
YarnClient client = YarnClient.createYarnClient();
if(client instanceof YarnClientImpl) {
YarnClientImpl impl = (YarnClientImpl) client;
YarnClientImpl spyClient = spy(impl);
when(spyClient.createTimelineClient()).thenThrow(
new NoClassDefFoundError(
"Mock a failure when init timeline instance"));
spyClient.init(conf);
spyClient.start();
assertFalse("Timeline client should be disabled when"
+ "it is failed to init",
spyClient.timelineServiceEnabled);
spyClient.stop();
}
}
@SuppressWarnings("deprecation")
@Test (timeout = 30000)
public void testSubmitApplication() throws Exception {