YARN-7152. [ATSv2] Registering timeline client before AMRMClient service init throw exception (Rohith Sharma K S via Varun Saxena)
(cherry picked from commit ef87d34a0e96f6b6390b7086c4ea2d5b7a4c2754) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3d3286fc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3d3286fc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3d3286fc Branch: refs/heads/YARN-5355_branch2 Commit: 3d3286fcb52df7c1c7189d562331c535904cc53a Parents: 5a8d326 Author: Varun Saxena <varunsax...@apache.org> Authored: Mon Sep 4 20:11:02 2017 +0530 Committer: Varun Saxena <varunsax...@apache.org> Committed: Sat Oct 14 15:12:20 2017 +0530 ---------------------------------------------------------------------- .../hadoop/yarn/client/api/AMRMClient.java | 22 ++------------------ 1 file changed, 2 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3d3286fc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java ---------------------------------------------------------------------- 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 70f19ba..b8eb58c 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; 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.Priority; 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 com.google.common.base.Preconditions; @@ -57,7 +55,6 @@ public abstract class AMRMClient<T extends AMRMClient.ContainerRequest> extends private static final Log LOG = LogFactory.getLog(AMRMClient.class); private TimelineV2Client timelineV2Client; - private boolean timelineServiceV2Enabled; /** * Create a new instance of AMRMClient. @@ -82,12 +79,6 @@ public abstract class AMRMClient<T extends AMRMClient.ContainerRequest> extends nmTokenCache = NMTokenCache.getSingleton(); } - @Override - protected void serviceInit(Configuration conf) throws Exception { - super.serviceInit(conf); - timelineServiceV2Enabled = YarnConfiguration.timelineServiceV2Enabled(conf); - } - /** * Object to represent a single container request for resources. Scheduler * documentation should be consulted for the specifics of how the parameters @@ -696,18 +687,9 @@ public abstract class AMRMClient<T extends AMRMClient.ContainerRequest> extends * 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; } /** --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
