http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionDestroyArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionDestroyArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionDestroyArgs.java deleted file mode 100644 index 4a129ab..0000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionDestroyArgs.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.slider.common.params; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; - -@Parameters(commandNames = {SliderActions.ACTION_DESTROY}, - commandDescription = SliderActions.DESCRIBE_ACTION_DESTROY) - -public class ActionDestroyArgs extends AbstractActionArgs { - - @Override - public String getActionName() { - return SliderActions.ACTION_DESTROY; - } - - @Parameter(names = {ARG_FORCE}, - description = "force the operation") - public boolean force; -}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java index c891873..cb36961 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java @@ -19,9 +19,11 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import org.apache.hadoop.yarn.service.client.params.AbstractActionArgs; +import org.apache.hadoop.yarn.service.client.params.SliderActions; @Parameters( - commandNames = {SliderActions.ACTION_DIAGNOSTICS}, + commandNames = { SliderActions.ACTION_DIAGNOSTICS}, commandDescription = SliderActions.DESCRIBE_ACTION_DIAGNOSTIC) public class ActionDiagnosticArgs extends AbstractActionArgs { http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionExistsArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionExistsArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionExistsArgs.java index dd1c04b..b075ce0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionExistsArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionExistsArgs.java @@ -20,10 +20,12 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import org.apache.hadoop.yarn.service.client.params.AbstractActionArgs; +import org.apache.hadoop.yarn.service.client.params.SliderActions; import java.io.File; -@Parameters(commandNames = {SliderActions.ACTION_EXISTS}, +@Parameters(commandNames = { SliderActions.ACTION_EXISTS}, commandDescription = SliderActions.DESCRIBE_ACTION_EXISTS) public class ActionExistsArgs extends AbstractActionArgs { http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionFlexArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionFlexArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionFlexArgs.java deleted file mode 100644 index 21cb609..0000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionFlexArgs.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.slider.common.params; - -import com.beust.jcommander.Parameters; -import com.beust.jcommander.ParametersDelegate; -import org.apache.slider.core.exceptions.BadCommandArgumentsException; - -import java.util.List; -import java.util.Map; - -@Parameters(commandNames = {SliderActions.ACTION_FLEX}, - commandDescription = SliderActions.DESCRIBE_ACTION_FLEX) - -public class ActionFlexArgs extends AbstractActionArgs { - - @Override - public String getActionName() { - return SliderActions.ACTION_FLEX; - } - - @ParametersDelegate - public ComponentArgsDelegate componentDelegate = new ComponentArgsDelegate(); - - /** - * Get the component mapping (may be empty, but never null) - * @return mapping - * @throws BadCommandArgumentsException parse problem - */ - public Map<String, String> getComponentMap() throws - BadCommandArgumentsException { - return componentDelegate.getComponentMap(); - } - - public List<String> getComponentTuples() { - return componentDelegate.getComponentTuples(); - } - -} http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionFreezeArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionFreezeArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionFreezeArgs.java index f3cc6ef..b08e1cf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionFreezeArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionFreezeArgs.java @@ -21,8 +21,10 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.beust.jcommander.ParametersDelegate; +import org.apache.hadoop.yarn.service.client.params.AbstractActionArgs; +import org.apache.hadoop.yarn.service.client.params.SliderActions; -@Parameters(commandNames = {SliderActions.ACTION_STOP }, +@Parameters(commandNames = { SliderActions.ACTION_STOP }, commandDescription = SliderActions.DESCRIBE_ACTION_FREEZE) public class ActionFreezeArgs extends AbstractActionArgs implements http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionHelpArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionHelpArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionHelpArgs.java index 62773c4..fc6eb4f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionHelpArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionHelpArgs.java @@ -19,11 +19,13 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameters; +import org.apache.hadoop.yarn.service.client.params.AbstractActionArgs; +import org.apache.hadoop.yarn.service.client.params.SliderActions; /** * The Help command */ -@Parameters(commandNames = {SliderActions.ACTION_HELP}, +@Parameters(commandNames = { SliderActions.ACTION_HELP}, commandDescription = SliderActions.DESCRIBE_ACTION_HELP) public class ActionHelpArgs extends AbstractActionArgs { @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionKDiagArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionKDiagArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionKDiagArgs.java index 9fc9d2e..be370bb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionKDiagArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionKDiagArgs.java @@ -20,6 +20,8 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import org.apache.hadoop.yarn.service.client.params.AbstractActionArgs; +import org.apache.hadoop.yarn.service.client.params.SliderActions; import org.apache.slider.common.tools.SliderUtils; import org.apache.slider.core.exceptions.BadCommandArgumentsException; import org.apache.slider.core.exceptions.UsageException; @@ -28,7 +30,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -@Parameters(commandNames = {SliderActions.ACTION_KDIAG}, +@Parameters(commandNames = { SliderActions.ACTION_KDIAG}, commandDescription = SliderActions.DESCRIBE_ACTION_KDIAG) public class ActionKDiagArgs extends AbstractActionArgs { http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionKeytabArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionKeytabArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionKeytabArgs.java index 9a708ba..7a46c66 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionKeytabArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionKeytabArgs.java @@ -20,8 +20,10 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import org.apache.hadoop.yarn.service.client.params.AbstractActionArgs; +import org.apache.hadoop.yarn.service.client.params.SliderActions; -@Parameters(commandNames = {SliderActions.ACTION_KEYTAB}, +@Parameters(commandNames = { SliderActions.ACTION_KEYTAB}, commandDescription = SliderActions.DESCRIBE_ACTION_KEYTAB) public class ActionKeytabArgs extends AbstractActionArgs { http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionKillContainerArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionKillContainerArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionKillContainerArgs.java index 8c18ad8..e1e94bd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionKillContainerArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionKillContainerArgs.java @@ -20,8 +20,10 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import org.apache.hadoop.yarn.service.client.params.AbstractActionArgs; +import org.apache.hadoop.yarn.service.client.params.SliderActions; -@Parameters(commandNames = {SliderActions.ACTION_KILL_CONTAINER}, +@Parameters(commandNames = { SliderActions.ACTION_KILL_CONTAINER}, commandDescription = SliderActions.DESCRIBE_ACTION_KILL_CONTAINER) public class ActionKillContainerArgs extends AbstractActionArgs { http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionListArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionListArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionListArgs.java index 739b5fc..51bde7b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionListArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionListArgs.java @@ -23,8 +23,10 @@ import java.util.Set; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import org.apache.hadoop.yarn.service.client.params.AbstractActionArgs; +import org.apache.hadoop.yarn.service.client.params.SliderActions; -@Parameters(commandNames = {SliderActions.ACTION_LIST}, +@Parameters(commandNames = { SliderActions.ACTION_LIST}, commandDescription = SliderActions.DESCRIBE_ACTION_LIST) public class ActionListArgs extends AbstractActionArgs { http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionLookupArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionLookupArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionLookupArgs.java index 1b73522..0888812 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionLookupArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionLookupArgs.java @@ -21,12 +21,14 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import org.apache.commons.lang.StringUtils; +import org.apache.hadoop.yarn.service.client.params.AbstractActionArgs; +import org.apache.hadoop.yarn.service.client.params.SliderActions; import org.apache.slider.core.exceptions.BadCommandArgumentsException; import org.apache.slider.core.exceptions.UsageException; import java.io.File; -@Parameters(commandNames = {SliderActions.ACTION_LOOKUP}, +@Parameters(commandNames = { SliderActions.ACTION_LOOKUP}, commandDescription = SliderActions.DESCRIBE_ACTION_LOOKUP) public class ActionLookupArgs extends AbstractActionArgs { http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionNodesArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionNodesArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionNodesArgs.java index ec38c80..5a0b019 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionNodesArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionNodesArgs.java @@ -20,10 +20,12 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import org.apache.hadoop.yarn.service.client.params.AbstractActionArgs; +import org.apache.hadoop.yarn.service.client.params.SliderActions; import java.io.File; -@Parameters(commandNames = {SliderActions.ACTION_NODES}, +@Parameters(commandNames = { SliderActions.ACTION_NODES}, commandDescription = SliderActions.DESCRIBE_ACTION_NODES) public class ActionNodesArgs extends AbstractActionArgs { http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java index da1b0e5..fb76451 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java @@ -20,13 +20,16 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; -import org.apache.slider.common.SliderKeys; +import org.apache.hadoop.yarn.service.client.params.AbstractActionArgs; +import org.apache.hadoop.yarn.service.client.params.Arguments; +import org.apache.hadoop.yarn.service.client.params.SliderActions; +import org.apache.hadoop.yarn.service.conf.SliderKeys; import org.apache.slider.core.exceptions.BadCommandArgumentsException; import org.apache.slider.core.exceptions.UsageException; import org.apache.slider.core.registry.docstore.ConfigFormat; -import static org.apache.slider.common.params.SliderActions.ACTION_REGISTRY; -import static org.apache.slider.common.params.SliderActions.DESCRIBE_ACTION_REGISTRY; +import static org.apache.hadoop.yarn.service.client.params.SliderActions.ACTION_REGISTRY; +import static org.apache.hadoop.yarn.service.client.params.SliderActions.DESCRIBE_ACTION_REGISTRY; import java.io.File; /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionResolveArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionResolveArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionResolveArgs.java index 2ee075a..a953bc7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionResolveArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionResolveArgs.java @@ -21,13 +21,15 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import org.apache.commons.lang.StringUtils; +import org.apache.hadoop.yarn.service.client.params.AbstractActionArgs; +import org.apache.hadoop.yarn.service.client.params.SliderActions; import org.apache.slider.core.exceptions.BadCommandArgumentsException; import org.apache.slider.core.exceptions.UsageException; import java.io.File; -import static org.apache.slider.common.params.SliderActions.ACTION_RESOLVE; -import static org.apache.slider.common.params.SliderActions.DESCRIBE_ACTION_REGISTRY; +import static org.apache.hadoop.yarn.service.client.params.SliderActions.ACTION_RESOLVE; +import static org.apache.hadoop.yarn.service.client.params.SliderActions.DESCRIBE_ACTION_REGISTRY; /** * Resolve registry entries http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionResourceArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionResourceArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionResourceArgs.java index 60fcc87..6d60ca7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionResourceArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionResourceArgs.java @@ -19,8 +19,10 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import org.apache.hadoop.yarn.service.client.params.AbstractActionArgs; +import org.apache.hadoop.yarn.service.client.params.SliderActions; -@Parameters(commandNames = {SliderActions.ACTION_RESOURCE}, +@Parameters(commandNames = { SliderActions.ACTION_RESOURCE}, commandDescription = SliderActions.DESCRIBE_ACTION_RESOURCE) public class ActionResourceArgs extends AbstractActionArgs { http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionStatusArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionStatusArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionStatusArgs.java index 6fbd96d..5285f7b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionStatusArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionStatusArgs.java @@ -20,8 +20,10 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import org.apache.hadoop.yarn.service.client.params.AbstractActionArgs; +import org.apache.hadoop.yarn.service.client.params.SliderActions; -@Parameters(commandNames = {SliderActions.ACTION_STATUS}, +@Parameters(commandNames = { SliderActions.ACTION_STATUS}, commandDescription = SliderActions.DESCRIBE_ACTION_STATUS) public class ActionStatusArgs extends AbstractActionArgs { http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionThawArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionThawArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionThawArgs.java index 04988c9..e8bdcad 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionThawArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionThawArgs.java @@ -21,10 +21,12 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.beust.jcommander.ParametersDelegate; +import org.apache.hadoop.yarn.service.client.params.AbstractActionArgs; +import org.apache.hadoop.yarn.service.client.params.SliderActions; import java.io.File; -@Parameters(commandNames = {SliderActions.ACTION_START }, +@Parameters(commandNames = { SliderActions.ACTION_START }, commandDescription = SliderActions.DESCRIBE_ACTION_THAW) public class ActionThawArgs extends AbstractActionArgs implements WaitTimeAccessor, http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionTokensArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionTokensArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionTokensArgs.java index 9f93c4e..f1f0125 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionTokensArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionTokensArgs.java @@ -20,12 +20,14 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; +import org.apache.hadoop.yarn.service.client.params.AbstractActionArgs; +import org.apache.hadoop.yarn.service.client.params.SliderActions; import org.apache.slider.core.exceptions.BadCommandArgumentsException; import org.apache.slider.core.exceptions.UsageException; import java.io.File; -@Parameters(commandNames = {SliderActions.ACTION_TOKENS}, +@Parameters(commandNames = { SliderActions.ACTION_TOKENS}, commandDescription = "save tokens to a file or list tokens in a file") public class ActionTokensArgs extends AbstractActionArgs { http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionUpdateArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionUpdateArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionUpdateArgs.java index 9d76bd8..830e4ee 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionUpdateArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionUpdateArgs.java @@ -19,8 +19,9 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameters; +import org.apache.hadoop.yarn.service.client.params.SliderActions; -@Parameters(commandNames = {SliderActions.ACTION_UPDATE}, +@Parameters(commandNames = { SliderActions.ACTION_UPDATE}, commandDescription = SliderActions.DESCRIBE_ACTION_UPDATE) public class ActionUpdateArgs extends AbstractClusterBuildingActionArgs { http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionUpgradeArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionUpgradeArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionUpgradeArgs.java index eb87108..b909cdd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionUpgradeArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionUpgradeArgs.java @@ -18,11 +18,8 @@ package org.apache.slider.common.params; -import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - -import java.util.ArrayList; -import java.util.List; +import org.apache.hadoop.yarn.service.client.params.SliderActions; @Parameters(commandNames = { SliderActions.ACTION_UPGRADE }, commandDescription = SliderActions.DESCRIBE_ACTION_UPGRADE) http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionVersionArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionVersionArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionVersionArgs.java index b9d212b..b0f17d0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionVersionArgs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ActionVersionArgs.java @@ -19,11 +19,13 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameters; +import org.apache.hadoop.yarn.service.client.params.AbstractActionArgs; +import org.apache.hadoop.yarn.service.client.params.SliderActions; /** * The version command */ -@Parameters(commandNames = {SliderActions.ACTION_VERSION}, +@Parameters(commandNames = { SliderActions.ACTION_VERSION}, commandDescription = SliderActions.DESCRIBE_ACTION_VERSION) public class ActionVersionArgs extends AbstractActionArgs { @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java deleted file mode 100644 index 12a2032..0000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.slider.common.params; - -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.FileSystem; -import org.apache.slider.core.exceptions.BadCommandArgumentsException; -import org.apache.slider.core.exceptions.ErrorStrings; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.net.URI; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Static argument manipulation operations - */ -public class ArgOps { - - private static final Logger - log = LoggerFactory.getLogger(ArgOps.class); - - /** - * create a 3-tuple - */ - public static List<Object> triple(String msg, int min, int max) { - List<Object> l = new ArrayList<>(3); - l.add(msg); - l.add(min); - l.add(max); - return l; - } - - public static void applyFileSystemBinding(String filesystemBinding, - Configuration conf) { - if (filesystemBinding != null) { - //filesystem argument was set -this overwrites any defaults in the - //configuration - FileSystem.setDefaultUri(conf, filesystemBinding); - } - } - - public static void splitPairs(Collection<String> pairs, - Map<String, String> dest) { - for (String prop : pairs) { - String[] keyval = prop.split("=", 2); - if (keyval.length == 2) { - dest.put(keyval[0], keyval[1]); - } - } - } - - - public static void applyDefinitions(Map<String, String> definitionMap, - Configuration conf) { - for (Map.Entry<String, String> entry : definitionMap.entrySet()) { - String key = entry.getKey(); - String val = entry.getValue(); - log.debug("configuration[{}]<=\"{}\"", key, val); - conf.set(key, val, "command line"); - } - } - - /** - * Create a map from a tuple list like ['worker','2','master','1] into a map - * ['worker':'2',"master":'1']; - * Duplicate entries also trigger errors - * @param description description for errors - * @param list list to conver to tuples - * @return the map of key value pairs -unordered. - * @throws BadCommandArgumentsException odd #of arguments received - */ - public static Map<String, String> convertTupleListToMap(String description, - List<String> list) throws - BadCommandArgumentsException { - Map<String, String> results = new HashMap<>(); - if (list != null && !list.isEmpty()) { - int size = list.size(); - if (size % 2 != 0) { - //odd number of elements, not permitted - throw new BadCommandArgumentsException( - ErrorStrings.ERROR_PARSE_FAILURE + description); - } - for (int count = 0; count < size; count += 2) { - String key = list.get(count); - String val = list.get(count + 1); - if (results.get(key) != null) { - throw new BadCommandArgumentsException( - ErrorStrings.ERROR_DUPLICATE_ENTRY + description - + ": " + key); - } - results.put(key, val); - } - } - return results; - } - - /** - * Create a map from a tuple list like - * ['worker','heapsize','5G','master','heapsize','2M'] into a map - * ['worker':'2',"master":'1']; - * Duplicate entries also trigger errors - - * @throws BadCommandArgumentsException odd #of arguments received - */ - public static Map<String, Map<String, String>> convertTripleListToMaps(String description, - List<String> list) throws BadCommandArgumentsException { - - Map<String, Map<String, String>> results = new HashMap<>(); - if (list != null && !list.isEmpty()) { - int size = list.size(); - if (size % 3 != 0) { - //wrong number of elements, not permitted - throw new BadCommandArgumentsException( - ErrorStrings.ERROR_PARSE_FAILURE + description); - } - for (int count = 0; count < size; count += 3) { - String role = list.get(count); - String key = list.get(count + 1); - String val = list.get(count + 2); - Map<String, String> roleMap = results.get(role); - if (roleMap == null) { - //demand create new role map - roleMap = new HashMap<>(); - results.put(role, roleMap); - } - if (roleMap.get(key) != null) { - throw new BadCommandArgumentsException( - ErrorStrings.ERROR_DUPLICATE_ENTRY + description - + ": for key " + key + " under " + role); - } - roleMap.put(key, val); - } - } - return results; - } -} http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/Arguments.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/Arguments.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/Arguments.java deleted file mode 100644 index e978957..0000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/Arguments.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.slider.common.params; - -/** - * Here are all the arguments that may be parsed by the client or server - * command lines. - * - * Important: Please keep the main list in alphabetical order - * so it is easier to see what arguments are there - */ -public interface Arguments { - String ARG_ADDON = "--addon"; - String ARG_ALL = "--all"; - String ARG_ALIAS = "--alias"; - String ARG_APPLICATION = "--application"; - String ARG_APPDEF = "--appdef"; - String ARG_APP_HOME = "--apphome"; - String ARG_BASE_PATH = "--basepath"; - String ARG_CLIENT = "--client"; - String ARG_CONFDIR = "--appconf"; - String ARG_COMPONENT = "--component"; - String ARG_COUNT = "--count"; - String ARG_COMPONENT_SHORT = "--comp"; - String ARG_COMPONENTS = "--components"; - String ARG_COMP_OPT= "--compopt"; - String ARG_COMP_OPT_SHORT = "--co"; - String ARG_CONFIG = "--config"; - String ARG_CONTAINERS = "--containers"; - String ARG_CREDENTIALS = "--credentials"; - String ARG_DEBUG = "--debug"; - String ARG_DEFINE = "-D"; - String ARG_DELETE = "--delete"; - String ARG_DEST = "--dest"; - String ARG_DESTDIR = "--destdir"; - String ARG_DESTFILE = "--destfile"; - String ARG_EXITCODE = "--exitcode"; - String ARG_FAIL = "--fail"; - /** - filesystem-uri: {@value} - */ - String ARG_FILESYSTEM = "--fs"; - String ARG_FILESYSTEM_LONG = "--filesystem"; - String ARG_FOLDER = "--folder"; - String ARG_FORCE = "--force"; - String ARG_FORMAT = "--format"; - String ARG_GETCERTSTORE = "--getcertstore"; - String ARG_GETCONF = "--getconf"; - String ARG_GETEXP = "--getexp"; - String ARG_GETFILES = "--getfiles"; - String ARG_HEALTHY= "--healthy"; - String ARG_HELP = "--help"; - String ARG_HOSTNAME = "--hostname"; - String ARG_ID = "--id"; - String ARG_IMAGE = "--image"; - String ARG_INSTALL = "--install"; - String ARG_INTERNAL = "--internal"; - String ARG_KEYLEN = "--keylen"; - String ARG_KEYTAB = "--keytab"; - String ARG_KEYSTORE = "--keystore"; - String ARG_KEYTABINSTALL = ARG_INSTALL; - String ARG_KEYTABDELETE = ARG_DELETE; - String ARG_KEYTABLIST = "--list"; - String ARG_LABEL = "--label"; - String ARG_LEVEL = "--level"; - String ARG_LIST = "--list"; - String ARG_LISTCONF = "--listconf"; - String ARG_LISTEXP = "--listexp"; - String ARG_LISTFILES = "--listfiles"; - String ARG_LIVE = "--live"; - String ARG_MANAGER = "--manager"; - String ARG_MANAGER_SHORT = "--m"; - String ARG_MESSAGE = "--message"; - String ARG_METAINFO = "--metainfo"; - String ARG_METAINFO_JSON = "--metainfojson"; - String ARG_NAME = "--name"; - String ARG_OPTION = "--option"; - String ARG_OPTION_SHORT = "-O"; - String ARG_OUTPUT = "--out"; - String ARG_OUTPUT_SHORT = "-o"; - String ARG_OVERWRITE = "--overwrite"; - String ARG_PACKAGE = "--package"; - String ARG_PASSWORD = "--password"; - String ARG_PATH = "--path"; - String ARG_PKGDELETE = ARG_DELETE; - String ARG_PKGINSTANCES = "--instances"; - String ARG_PKGLIST = ARG_LIST; - String ARG_PRINCIPAL = "--principal"; - String ARG_PROVIDER = "--provider"; - String ARG_QUEUE = "--queue"; - String ARG_LIFETIME = "--lifetime"; - String ARG_REPLACE_PKG = "--replacepkg"; - String ARG_RESOURCE = "--resource"; - String ARG_RESOURCE_MANAGER = "--rm"; - String ARG_SECURE = "--secure"; - String ARG_SERVICETYPE = "--servicetype"; - String ARG_SERVICES = "--services"; - String ARG_SLIDER = "--slider"; - String ARG_SOURCE = "--source"; - String ARG_STATE = "--state"; - String ARG_SYSPROP = "-S"; - String ARG_TRUSTSTORE = "--truststore"; - String ARG_USER = "--user"; - String ARG_UPLOAD = "--upload"; - String ARG_VERBOSE = "--verbose"; - String ARG_VERSION = "--version"; - String ARG_WAIT = "--wait"; - String ARG_YARN = "--yarn"; - String ARG_ZKHOSTS = "--zkhosts"; - String ARG_ZKPATH = "--zkpath"; - String ARG_ZKPORT = "--zkport"; -/* - STOP: DO NOT ADD YOUR ARGUMENTS HERE. GO BACK AND INSERT THEM IN THE - RIGHT PLACE IN THE LIST - */ - - /** - * server: URI for the cluster - */ - String ARG_CLUSTER_URI = "-cluster-uri"; - -} http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ClientArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ClientArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ClientArgs.java deleted file mode 100644 index dbb5a16..0000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ClientArgs.java +++ /dev/null @@ -1,361 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.slider.common.params; - -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.apache.slider.common.SliderXmlConfKeys; -import org.apache.slider.common.tools.SliderUtils; -import org.apache.slider.core.exceptions.BadCommandArgumentsException; -import org.apache.slider.core.exceptions.ErrorStrings; -import org.apache.slider.core.exceptions.SliderException; - -import java.util.Collection; - -/** - * Slider Client CLI Args - */ - -public class ClientArgs extends CommonArgs { - - /* - - All the arguments for specific actions - - */ - /** - * This is not bonded to jcommander, it is set up - * after the construction to point to the relevant - * entry - * - * KEEP IN ALPHABETICAL ORDER - */ - private AbstractClusterBuildingActionArgs buildingActionArgs; - - // ========================================================= - // Keep all of these in alphabetical order. Thanks. - // ========================================================= - - private final ActionAMSuicideArgs actionAMSuicideArgs = new ActionAMSuicideArgs(); - private final ActionBuildArgs actionBuildArgs = new ActionBuildArgs(); - private final ActionClientArgs actionClientArgs = new ActionClientArgs(); - private final ActionCreateArgs actionCreateArgs = new ActionCreateArgs(); - private final ActionDependencyArgs actionDependencyArgs = new ActionDependencyArgs(); - private final ActionDestroyArgs actionDestroyArgs = new ActionDestroyArgs(); - private final ActionDiagnosticArgs actionDiagnosticArgs = new ActionDiagnosticArgs(); - private final ActionExistsArgs actionExistsArgs = new ActionExistsArgs(); - private final ActionFlexArgs actionFlexArgs = new ActionFlexArgs(); - private final ActionFreezeArgs actionFreezeArgs = new ActionFreezeArgs(); - private final ActionHelpArgs actionHelpArgs = new ActionHelpArgs(); - private final ActionKDiagArgs actionKDiagArgs = new ActionKDiagArgs(); - private final ActionKeytabArgs actionKeytabArgs = new ActionKeytabArgs(); - private final ActionKillContainerArgs actionKillContainerArgs = - new ActionKillContainerArgs(); - private final ActionListArgs actionListArgs = new ActionListArgs(); - private final ActionLookupArgs actionLookupArgs = new ActionLookupArgs(); - private final ActionNodesArgs actionNodesArgs = new ActionNodesArgs(); - private final ActionRegistryArgs actionRegistryArgs = new ActionRegistryArgs(); - private final ActionResolveArgs actionResolveArgs = new ActionResolveArgs(); - private final ActionResourceArgs actionResourceArgs = new ActionResourceArgs(); - private final ActionStatusArgs actionStatusArgs = new ActionStatusArgs(); - private final ActionThawArgs actionThawArgs = new ActionThawArgs(); - private final ActionTokensArgs actionTokenArgs = new ActionTokensArgs(); - private final ActionUpdateArgs actionUpdateArgs = new ActionUpdateArgs(); - private final ActionUpgradeArgs actionUpgradeArgs = new ActionUpgradeArgs(); - private final ActionVersionArgs actionVersionArgs = new ActionVersionArgs(); - - public ClientArgs(String[] args) { - super(args); - } - - public ClientArgs(Collection args) { - super(args); - } - - @Override - protected void addActionArguments() { - - addActions( - actionAMSuicideArgs, - actionBuildArgs, - actionClientArgs, - actionCreateArgs, - actionDependencyArgs, - actionDestroyArgs, - actionDiagnosticArgs, - actionExistsArgs, - actionFlexArgs, - actionFreezeArgs, - actionHelpArgs, - actionKDiagArgs, - actionKeytabArgs, - actionKillContainerArgs, - actionListArgs, - actionLookupArgs, - actionNodesArgs, - actionRegistryArgs, - actionResolveArgs, - actionResourceArgs, - actionStatusArgs, - actionThawArgs, - actionTokenArgs, - actionUpdateArgs, - actionUpgradeArgs, - actionVersionArgs - ); - } - - @Override - public void applyDefinitions(Configuration conf) throws - BadCommandArgumentsException { - super.applyDefinitions(conf); - //RM - if (getManager() != null) { - log.debug("Setting RM to {}", getManager()); - conf.set(YarnConfiguration.RM_ADDRESS, getManager()); - } - if (getBasePath() != null) { - log.debug("Setting basePath to {}", getBasePath()); - conf.set(SliderXmlConfKeys.KEY_SLIDER_BASE_PATH, - getBasePath().toString()); - } - } - - public ActionDiagnosticArgs getActionDiagnosticArgs() { - return actionDiagnosticArgs; - } - - public AbstractClusterBuildingActionArgs getBuildingActionArgs() { - return buildingActionArgs; - } - - public ActionAMSuicideArgs getActionAMSuicideArgs() { - return actionAMSuicideArgs; - } - - public ActionBuildArgs getActionBuildArgs() { - return actionBuildArgs; - } - - public ActionClientArgs getActionClientArgs() { return actionClientArgs; } - - public ActionKDiagArgs getActionKDiagArgs() { - return actionKDiagArgs; - } - - public ActionKeytabArgs getActionKeytabArgs() { return actionKeytabArgs; } - - public ActionUpdateArgs getActionUpdateArgs() { - return actionUpdateArgs; - } - - public ActionUpgradeArgs getActionUpgradeArgs() { - return actionUpgradeArgs; - } - - public ActionCreateArgs getActionCreateArgs() { - return actionCreateArgs; - } - - public ActionDependencyArgs getActionDependencyArgs() { - return actionDependencyArgs; - } - - public ActionDestroyArgs getActionDestroyArgs() { - return actionDestroyArgs; - } - - public ActionExistsArgs getActionExistsArgs() { - return actionExistsArgs; - } - - public ActionFlexArgs getActionFlexArgs() { - return actionFlexArgs; - } - - public ActionFreezeArgs getActionFreezeArgs() { - return actionFreezeArgs; - } - - public ActionKillContainerArgs getActionKillContainerArgs() { - return actionKillContainerArgs; - } - - public ActionListArgs getActionListArgs() { - return actionListArgs; - } - - public ActionNodesArgs getActionNodesArgs() { - return actionNodesArgs; - } - - public ActionLookupArgs getActionLookupArgs() { - return actionLookupArgs; - } - - public ActionRegistryArgs getActionRegistryArgs() { - return actionRegistryArgs; - } - - public ActionResolveArgs getActionResolveArgs() { - return actionResolveArgs; - } - - public ActionResourceArgs getActionResourceArgs() { - return actionResourceArgs; - } - - public ActionStatusArgs getActionStatusArgs() { - return actionStatusArgs; - } - - public ActionThawArgs getActionThawArgs() { - return actionThawArgs; - } - - public ActionTokensArgs getActionTokenArgs() { - return actionTokenArgs; - } - - /** - * Look at the chosen action and bind it as the core action for the operation. - * @throws SliderException bad argument or similar - */ - @Override - public void applyAction() throws SliderException { - String action = getAction(); - if (SliderUtils.isUnset(action)) { - action = ACTION_HELP; - } - switch (action) { - case ACTION_BUILD: - bindCoreAction(actionBuildArgs); - //its a builder, so set those actions too - buildingActionArgs = actionBuildArgs; - break; - - case ACTION_CREATE: - bindCoreAction(actionCreateArgs); - //its a builder, so set those actions too - buildingActionArgs = actionCreateArgs; - break; - - case ACTION_STOP: - bindCoreAction(actionFreezeArgs); - break; - - case ACTION_START: - bindCoreAction(actionThawArgs); - break; - - case ACTION_AM_SUICIDE: - bindCoreAction(actionAMSuicideArgs); - break; - - case ACTION_CLIENT: - bindCoreAction(actionClientArgs); - break; - - case ACTION_DEPENDENCY: - bindCoreAction(actionDependencyArgs); - break; - - case ACTION_DESTROY: - bindCoreAction(actionDestroyArgs); - break; - - case ACTION_DIAGNOSTICS: - bindCoreAction(actionDiagnosticArgs); - break; - - case ACTION_EXISTS: - bindCoreAction(actionExistsArgs); - break; - - case ACTION_FLEX: - bindCoreAction(actionFlexArgs); - break; - - case ACTION_HELP: - bindCoreAction(actionHelpArgs); - break; - - case ACTION_KDIAG: - bindCoreAction(actionKDiagArgs); - break; - - case ACTION_KEYTAB: - bindCoreAction(actionKeytabArgs); - break; - - case ACTION_KILL_CONTAINER: - bindCoreAction(actionKillContainerArgs); - break; - - case ACTION_LIST: - bindCoreAction(actionListArgs); - break; - - case ACTION_LOOKUP: - bindCoreAction(actionLookupArgs); - break; - - case ACTION_NODES: - bindCoreAction(actionNodesArgs); - break; - - case ACTION_REGISTRY: - bindCoreAction(actionRegistryArgs); - break; - - case ACTION_RESOLVE: - bindCoreAction(actionResolveArgs); - break; - - case ACTION_RESOURCE: - bindCoreAction(actionResourceArgs); - break; - - case ACTION_STATUS: - bindCoreAction(actionStatusArgs); - break; - - case ACTION_TOKENS: - bindCoreAction(actionTokenArgs); - break; - - case ACTION_UPDATE: - bindCoreAction(actionUpdateArgs); - break; - - case ACTION_UPGRADE: - bindCoreAction(actionUpgradeArgs); - break; - - case ACTION_VERSION: - bindCoreAction(actionVersionArgs); - break; - - default: - throw new BadCommandArgumentsException(ErrorStrings.ERROR_UNKNOWN_ACTION - + " " + action); - } - } - -} http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java deleted file mode 100644 index 9c8e65d..0000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java +++ /dev/null @@ -1,300 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.slider.common.params; - -import com.beust.jcommander.JCommander; -import com.beust.jcommander.Parameter; -import com.beust.jcommander.ParameterDescription; -import com.beust.jcommander.ParameterException; - -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.Path; -import org.apache.slider.common.tools.SliderUtils; -import org.apache.slider.core.exceptions.BadCommandArgumentsException; -import org.apache.slider.core.exceptions.ErrorStrings; -import org.apache.slider.core.exceptions.SliderException; -import org.apache.slider.core.exceptions.UsageException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * This class contains the common argument set for all tne entry points, - * and the core parsing logic to verify that the action is on the list - * of allowed actions -and that the remaining number of arguments is - * in the range allowed - */ - -public abstract class CommonArgs extends ArgOps implements SliderActions, - Arguments { - - protected static final Logger log = LoggerFactory.getLogger(CommonArgs.class); - - - private static final int DIFF_BETWEEN_DESCIPTION_AND_COMMAND_NAME = 30; - - - @Parameter(names = ARG_HELP, help = true) - public boolean help; - - - /** - -D name=value - - Define an HBase configuration option which overrides any options in - the configuration XML files of the image or in the image configuration - directory. The values will be persisted. - Configuration options are only passed to the cluster when creating or reconfiguring a cluster. - - */ - - public Map<String, String> definitionMap = new HashMap<String, String>(); - /** - * System properties - */ - public Map<String, String> syspropsMap = new HashMap<String, String>(); - - - /** - * fields - */ - public final JCommander commander; - private final String[] args; - - private AbstractActionArgs coreAction; - - /** - * get the name: relies on arg 1 being the cluster name in all operations - * @return the name argument, null if there is none - */ - public String getClusterName() { - return coreAction.getClusterName(); - } - - protected CommonArgs(String[] args) { - this.args = args; - commander = new JCommander(this); - } - - protected CommonArgs(Collection args) { - List<String> argsAsStrings = SliderUtils.collectionToStringList(args); - this.args = argsAsStrings.toArray(new String[argsAsStrings.size()]); - commander = new JCommander(this); - } - - public String usage() { - return usage(this, null); - } - - public static String usage(CommonArgs serviceArgs, String commandOfInterest) { - String result = null; - StringBuilder helperMessage = new StringBuilder(); - if (commandOfInterest == null) { - // JCommander.usage is too verbose for a command with many options like - // slider no short version of that is found Instead, we compose our msg by - helperMessage.append("\nUsage: slider COMMAND [options]\n"); - helperMessage.append("where COMMAND is one of\n"); - for (String jcommand : serviceArgs.commander.getCommands().keySet()) { - helperMessage.append(String.format("\t%-" - + DIFF_BETWEEN_DESCIPTION_AND_COMMAND_NAME + "s%s", jcommand, - serviceArgs.commander.getCommandDescription(jcommand) + "\n")); - } - helperMessage - .append("Most commands print help when invoked without parameters or with --help"); - result = helperMessage.toString(); - } else { - helperMessage.append("\nUsage: slider ").append(commandOfInterest); - helperMessage.append(serviceArgs.coreAction.getMinParams() > 0 ? " <application>" : ""); - helperMessage.append("\n"); - for (ParameterDescription paramDesc : serviceArgs.commander.getCommands() - .get(commandOfInterest).getParameters()) { - String optional = paramDesc.getParameter().required() ? " (required)" - : " (optional)"; - String paramName = paramDesc.getParameterized().getType() == Boolean.TYPE ? paramDesc - .getLongestName() : paramDesc.getLongestName() + " <" - + paramDesc.getParameterized().getName() + ">"; - helperMessage.append(String.format("\t%-" - + DIFF_BETWEEN_DESCIPTION_AND_COMMAND_NAME + "s%s", paramName, - paramDesc.getDescription() + optional + "\n")); - result = helperMessage.toString(); - } - } - return result; - } - - public static String usage(CommonArgs serviceArgs) { - return usage(serviceArgs, null); - } - - /** - * Parse routine -includes registering the action-specific argument classes - * and postprocess it - * @throws SliderException on any problem - */ - public void parse() throws SliderException { - addActionArguments(); - try { - commander.parse(args); - } catch (ParameterException e) { - throw new BadCommandArgumentsException(e, "%s in %s", - e.toString(), - (args != null - ? (SliderUtils.join(args, - " ", false)) - : "[]")); - } - //now copy back to this class some of the attributes that are common to all - //actions - postProcess(); - } - - /** - * Add a command - * @param name action - * @param arg value - */ - protected void addAction(String name, Object arg) { - commander.addCommand(name, arg); - } - - protected void addActions(Object... actions) { - for (Object action : actions) { - commander.addCommand(action); - } - } - - /** - * Override point to add a set of actions - */ - protected void addActionArguments() { - - } - - /** - * validate args via {@link #validate()} - * then postprocess the arguments - */ - public void postProcess() throws SliderException { - applyAction(); - validate(); - - //apply entry set - for (Map.Entry<String, String> entry : syspropsMap.entrySet()) { - System.setProperty(entry.getKey(), entry.getValue()); - } - } - - - /** - * Implementors must implement their action apply routine here - */ - public abstract void applyAction() throws SliderException; - - - /** - * Bind the core action; this extracts any attributes that are used - * across routines - * @param action action to bind - */ - protected void bindCoreAction(AbstractActionArgs action) { - coreAction = action; - - splitPairs(coreAction.definitions, definitionMap); - splitPairs(coreAction.sysprops, syspropsMap); - } - - /** - * Get the core action -type depends on the action - * @return the action class - */ - public AbstractActionArgs getCoreAction() { - return coreAction; - } - - /** - * Validate the arguments against the action requested - */ - public void validate() throws BadCommandArgumentsException, UsageException { - if (coreAction == null) { - throw new UsageException(ErrorStrings.ERROR_NO_ACTION + usage()); - } - log.debug("action={}", getAction()); - // let the action validate itself - try { - coreAction.validate(); - } catch (BadCommandArgumentsException e) { - StringBuilder badArgMsgBuilder = new StringBuilder(); - badArgMsgBuilder.append(e.toString()).append("\n"); - badArgMsgBuilder.append(usage(this, coreAction.getActionName())); - throw new BadCommandArgumentsException(badArgMsgBuilder.toString()); - } catch (UsageException e) { - StringBuilder badArgMsgBuilder = new StringBuilder(); - badArgMsgBuilder.append(e.toString()).append("\n"); - badArgMsgBuilder.append(usage(this, coreAction.getActionName())); - throw new UsageException(badArgMsgBuilder.toString()); - } - } - - /** - * Apply all the definitions on the command line to the configuration - * @param conf config - */ - public void applyDefinitions(Configuration conf) throws - BadCommandArgumentsException { - applyDefinitions(definitionMap, conf); - } - - - /** - * If the Filesystem binding was provided, it overrides anything in - * the configuration - * @param conf configuration - */ - public void applyFileSystemBinding(Configuration conf) { - ArgOps.applyFileSystemBinding(getFilesystemBinding(), conf); - } - - public boolean isDebug() { - return coreAction.debug; - } - - - public String getFilesystemBinding() { - return coreAction.filesystemBinding; - } - - public Path getBasePath() { return coreAction.basePath; } - - public String getManager() { - return coreAction.manager; - } - - public String getAction() { - return commander.getParsedCommand(); - } - - public List<String> getActionArgs() { - return coreAction.parameters; - } - -} http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ComponentArgsDelegate.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ComponentArgsDelegate.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ComponentArgsDelegate.java deleted file mode 100644 index c819b37..0000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/ComponentArgsDelegate.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.slider.common.params; - -import com.beust.jcommander.Parameter; -import org.apache.slider.core.exceptions.BadCommandArgumentsException; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -public class ComponentArgsDelegate extends AbstractArgsDelegate { - - /** - * This is a listing of the roles to create - */ - @Parameter(names = {ARG_COMPONENT, ARG_COMPONENT_SHORT}, - arity = 2, - description = "--component <name> <count> e.g. +1 incr by 1, -2 decr by 2, and 3 makes final count 3", - splitter = DontSplitArguments.class) - public List<String> componentTuples = new ArrayList<>(0); - - - /** - * Get the role mapping (may be empty, but never null) - * @return role mapping - * @throws BadCommandArgumentsException parse problem - */ - public Map<String, String> getComponentMap() throws BadCommandArgumentsException { - return convertTupleListToMap("component", componentTuples); - } - - public List<String> getComponentTuples() { - return componentTuples; - } -} http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/SliderAMArgs.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/SliderAMArgs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/SliderAMArgs.java deleted file mode 100644 index de65954..0000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/SliderAMArgs.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.apache.slider.common.params; - -/** - * Parameters sent by the Client to the AM - */ -public class SliderAMArgs extends CommonArgs { - - SliderAMCreateAction createAction = new SliderAMCreateAction(); - - public SliderAMArgs(String[] args) { - super(args); - } - - @Override - protected void addActionArguments() { - addActions(createAction); - } - - public String getImage() { - return createAction.image; - } - - /** - * This is the URI in the FS to the Slider cluster; the conf file (and any - * other cluster-specifics) can be picked up here - */ - public String getAppDefDir() { - return createAction.sliderClusterURI; - } - - /** - * Am binding is simple: there is only one action - */ - @Override - public void applyAction() { - bindCoreAction(createAction); - } -} http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/SliderAMCreateAction.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/SliderAMCreateAction.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/SliderAMCreateAction.java deleted file mode 100644 index 197c22b..0000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/SliderAMCreateAction.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.slider.common.params; - -import com.beust.jcommander.Parameter; -import com.beust.jcommander.Parameters; -import com.beust.jcommander.ParametersDelegate; - -import java.io.File; - - -@Parameters(commandNames = {SliderActions.ACTION_CREATE}, - commandDescription = SliderActions.DESCRIBE_ACTION_CREATE) - -public class SliderAMCreateAction extends AbstractActionArgs implements - LaunchArgsAccessor { - - - @Override - public String getActionName() { - return SliderActions.ACTION_CREATE; - } - - @Parameter(names = ARG_IMAGE, description = "image", required = false) - public String image; - - /** - * This is the URI in the FS to the Slider cluster; the conf file (and any - * other cluster-specifics) can be picked up here - */ - @Parameter(names = ARG_CLUSTER_URI, - description = "URI to the Slider cluster", required = true) - public String sliderClusterURI; - - @ParametersDelegate - LaunchArgsDelegate launchArgs = new LaunchArgsDelegate(); - - @Override - public String getRmAddress() { - return launchArgs.getRmAddress(); - } - - @Override - public int getWaittime() { - return launchArgs.getWaittime(); - } - - @Override - public void setWaittime(int waittime) { - launchArgs.setWaittime(waittime); - } - - @Override - public File getOutputFile() { - return launchArgs.getOutputFile(); - } - -} http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java deleted file mode 100644 index df1a5fe..0000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.slider.common.params; - -/** - * Actions. - * Only some of these are supported by specific Slider Services; they - * are listed here to ensure the names are consistent - */ -public interface SliderActions { - String ACTION_AM_SUICIDE = "am-suicide"; - String ACTION_BUILD = "build"; - String ACTION_CLIENT = "client"; - String ACTION_CREATE = "create"; - String ACTION_DIAGNOSTICS = "diagnostics"; - String ACTION_DEPENDENCY = "dependency"; - String ACTION_UPDATE = "update"; - String ACTION_UPGRADE = "upgrade"; - String ACTION_DESTROY = "destroy"; - String ACTION_ECHO = "echo"; - String ACTION_EXISTS = "exists"; - String ACTION_FLEX = "flex"; - String ACTION_STOP = "stop"; - String ACTION_HELP = "help"; - String ACTION_INSTALL_KEYTAB = "install-keytab"; - String ACTION_KDIAG = "kdiag"; - String ACTION_KEYTAB = "keytab"; - String ACTION_KILL_CONTAINER = "kill-container"; - String ACTION_LIST = "list"; - String ACTION_LOOKUP = "lookup"; - String ACTION_NODES = "nodes"; - String ACTION_PREFLIGHT = "preflight"; - String ACTION_RECONFIGURE = "reconfigure"; - String ACTION_REGISTRY = "registry"; - String ACTION_RESOLVE = "resolve"; - String ACTION_RESOURCE = "resource"; - String ACTION_STATUS = "status"; - String ACTION_START = "start"; - String ACTION_TOKENS = "tokens"; - - String ACTION_VERSION = "version"; - String DESCRIBE_ACTION_AM_SUICIDE = - "Tell the Slider Application Master to simulate a process failure by terminating itself"; - String DESCRIBE_ACTION_BUILD = - "Build a Slider cluster specification, but do not start it"; - String DESCRIBE_ACTION_CREATE = - "Create a live Slider application"; - String DESCRIBE_ACTION_DEPENDENCY = - "Slider AM and agent dependency (libraries) management"; - String DESCRIBE_ACTION_UPDATE = - "Update template for a Slider application"; - String DESCRIBE_ACTION_UPGRADE = - "Rolling upgrade/downgrade the component/containerto a newer/previous version"; - String DESCRIBE_ACTION_DESTROY = - "Destroy a stopped Slider application"; - String DESCRIBE_ACTION_EXISTS = - "Probe for an application running"; - String DESCRIBE_ACTION_FLEX = "Flex a Slider application"; - String DESCRIBE_ACTION_FREEZE = - "Stop a running application"; - String DESCRIBE_ACTION_GETCONF = - "Get the configuration of an application"; - String DESCRIBE_ACTION_KDIAG = "Diagnose Kerberos problems"; - String DESCRIBE_ACTION_KILL_CONTAINER = - "Kill a container in the application"; - String DESCRIBE_ACTION_HELP = "Print help information"; - String DESCRIBE_ACTION_LIST = - "List running Slider applications"; - String DESCRIBE_ACTION_LOOKUP = - "look up a YARN application"; - String DESCRIBE_ACTION_NODES = "List the node information for the YARN cluster or a running application"; - String DESCRIBE_ACTION_MONITOR = - "Monitor a running application"; - String DESCRIBE_ACTION_REGISTRY = - "Query the registry of a YARN application"; - String DESCRIBE_ACTION_RESOLVE = - "Resolve or list records in the YARN registry"; - String DESCRIBE_ACTION_STATUS = - "Get the status of an application"; - String DESCRIBE_ACTION_THAW = - "Start a stopped application"; - String DESCRIBE_ACTION_VERSION = - "Print the Slider version information"; - String DESCRIBE_ACTION_CLIENT = "Install the application client in the specified directory or obtain a client keystore or truststore"; - String DESCRIBE_ACTION_KEYTAB = "Manage a Kerberos keytab file (install, delete, list) in the sub-folder 'keytabs' of the user's Slider base directory"; - String DESCRIBE_ACTION_DIAGNOSTIC = "Diagnose the configuration of the running slider application and slider client"; - String DESCRIBE_ACTION_RESOURCE = "Manage a file (install, delete, list) in the 'resources' sub-folder of the user's Slider base directory"; - -} - http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java index 25debdc..64fd8ae 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java @@ -25,8 +25,8 @@ import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.IOUtils; -import org.apache.slider.common.SliderKeys; -import org.apache.slider.common.SliderXmlConfKeys; +import org.apache.hadoop.yarn.service.conf.SliderKeys; +import org.apache.hadoop.yarn.service.conf.SliderXmlConfKeys; import org.apache.slider.core.exceptions.BadConfigException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/hadoop/blob/164c0c4c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/CoreFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/CoreFileSystem.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/CoreFileSystem.java index 588d330..43eb270 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/CoreFileSystem.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/CoreFileSystem.java @@ -34,9 +34,9 @@ import org.apache.hadoop.yarn.api.records.LocalResourceType; import org.apache.hadoop.yarn.api.records.LocalResourceVisibility; import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.hadoop.yarn.util.Records; -import org.apache.slider.common.SliderExitCodes; -import org.apache.slider.common.SliderKeys; -import org.apache.slider.common.SliderXmlConfKeys; +import org.apache.hadoop.yarn.service.conf.SliderExitCodes; +import org.apache.hadoop.yarn.service.conf.SliderKeys; +import org.apache.hadoop.yarn.service.conf.SliderXmlConfKeys; import org.apache.slider.core.exceptions.BadClusterStateException; import org.apache.slider.core.exceptions.ErrorStrings; import org.apache.slider.core.exceptions.SliderException; @@ -52,8 +52,8 @@ import java.nio.charset.Charset; import java.util.HashMap; import java.util.Map; -import static org.apache.slider.common.SliderXmlConfKeys.CLUSTER_DIRECTORY_PERMISSIONS; -import static org.apache.slider.common.SliderXmlConfKeys.DEFAULT_CLUSTER_DIRECTORY_PERMISSIONS; +import static org.apache.hadoop.yarn.service.conf.SliderXmlConfKeys.CLUSTER_DIRECTORY_PERMISSIONS; +import static org.apache.hadoop.yarn.service.conf.SliderXmlConfKeys.DEFAULT_CLUSTER_DIRECTORY_PERMISSIONS; public class CoreFileSystem { private static final Logger @@ -77,7 +77,7 @@ public class CoreFileSystem { Preconditions.checkNotNull(configuration, "Cannot create a CoreFileSystem with a null Configuration"); this.fileSystem = FileSystem.get(configuration); - this.configuration = fileSystem.getConf(); + this.configuration = configuration; } /** --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org