diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java index 60e305f..b11c094 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java @@ -28,7 +28,6 @@ import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.service.AbstractService; import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse; import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse; @@ -42,7 +41,6 @@ import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.UpdateContainerRequest; import org.apache.hadoop.yarn.client.api.impl.AMRMClientImpl; -import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.util.resource.Resources; @@ -57,7 +55,6 @@ private static final Log LOG = LogFactory.getLog(AMRMClient.class); private TimelineV2Client timelineV2Client; - private boolean timelineServiceV2Enabled; /** * Create a new instance of AMRMClient. @@ -80,12 +77,6 @@ protected AMRMClient(String name) { super(name); nmTokenCache = NMTokenCache.getSingleton(); - } - - @Override - protected void serviceInit(Configuration conf) throws Exception { - super.serviceInit(conf); - timelineServiceV2Enabled = YarnConfiguration.timelineServiceV2Enabled(conf); } /** @@ -696,18 +687,9 @@ * V2 client will be updated dynamically if registered. * * @param client the timeline v2 client to register - * @throws YarnException when this method is invoked even when ATS V2 is not - * configured. */ - public void registerTimelineV2Client(TimelineV2Client client) - throws YarnException { - if (timelineServiceV2Enabled) { - timelineV2Client = client; - } else { - LOG.error("Trying to register timeline v2 client when not configured."); - throw new YarnException( - "register timeline v2 client when not configured."); - } + public void registerTimelineV2Client(TimelineV2Client client) { + timelineV2Client = client; } /**