YARN-4622. TestDistributedShell fails for v2 test cases after modifications for 1.5. (Naganarasimha G R via Varun Saxena)

This commit is contained in:
Varun Saxena 2016-01-22 01:41:25 +05:30 committed by Sangjin Lee
parent 34f02f07d5
commit f5380d850e

View File

@ -70,6 +70,7 @@
import org.apache.hadoop.yarn.security.client.TimelineDelegationTokenIdentifier;
import org.apache.hadoop.yarn.webapp.YarnJacksonJaxbJsonProvider;
import org.codehaus.jackson.map.ObjectMapper;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
@ -334,9 +335,10 @@ protected void serviceInit(Configuration conf) throws Exception {
@Override
protected void serviceStart() throws Exception {
timelineWriter = createTimelineWriter(
configuration, authUgi, client,
constructResURI(getConfig(), timelineServiceAddress, false));
if (!timelineServiceV2) {
timelineWriter = createTimelineWriter(configuration, authUgi, client,
constructResURI(getConfig(), timelineServiceAddress, false));
}
}
protected TimelineWriter createTimelineWriter(Configuration conf,