Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry
(patch SLIDER-408)
Conflicts:
slider-core/src/main/java/org/apache/slider/client/SliderClient.java
slider-core/src/main/java/org/apache/slider/common/params/ClientArgs.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/02623b1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/02623b1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/02623b1d
Branch: refs/heads/develop
Commit: 02623b1d73058cfb081098f712d699a1d57bc519
Parents: cc2a975 e375726
Author: Steve Loughran <ste...@apache.org>
Authored: Wed Oct 8 11:45:43 2014 -0700
Committer: Steve Loughran <ste...@apache.org>
Committed: Wed Oct 8 11:45:43 2014 -0700
----------------------------------------------------------------------
.../org/apache/slider/client/SliderClient.java | 97 --------------------
.../slider/common/params/ActionGetConfArgs.java | 51 ----------
.../apache/slider/common/params/ClientArgs.java | 9 --
.../slider/common/params/SliderActions.java | 1 -
.../slider/client/TestCommonArgParsing.groovy | 31 -------
.../funtest/framework/CommandTestBase.groovy | 13 ---
.../commands/UnknownClusterOperationsIT.groovy | 6 --
.../lifecycle/AgentClusterLifecycleIT.groovy | 2 -
.../funtest/HBaseClusterLifecycleIT.groovy | 5 +-
9 files changed, 4 insertions(+), 211 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/02623b1d/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --cc slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index c5022ee,8d2bcfd..6613117
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@@ -70,10 -58,8 +70,9 @@@ import org.apache.slider.common.params.
import org.apache.slider.common.params.ActionEchoArgs;
import org.apache.slider.common.params.ActionFlexArgs;
import org.apache.slider.common.params.ActionFreezeArgs;
- import org.apache.slider.common.params.ActionGetConfArgs;
import org.apache.slider.common.params.ActionKillContainerArgs;
import org.apache.slider.common.params.ActionRegistryArgs;
+import org.apache.slider.common.params.ActionResolveArgs;
import org.apache.slider.common.params.ActionStatusArgs;
import org.apache.slider.common.params.ActionThawArgs;
import org.apache.slider.common.params.Arguments;
@@@ -339,15 -319,11 +338,13 @@@ public class SliderClient extends Abstr
exitCode = actionThaw(clusterName, serviceArgs.getActionThawArgs());
} else if (ACTION_DESTROY.equals(action)) {
exitCode = actionDestroy(clusterName);
+ } else if (ACTION_DIAGNOSTIC.equals(action)) {
+ exitCode = actionDiagnostic(serviceArgs.getActionDiagnosticArgs());
} else if (ACTION_EXISTS.equals(action)) {
exitCode = actionExists(clusterName,
- serviceArgs.getActionExistsArgs().live);
+ serviceArgs.getActionExistsArgs().live);
} else if (ACTION_FLEX.equals(action)) {
exitCode = actionFlex(clusterName, serviceArgs.getActionFlexArgs());
- } else if (ACTION_GETCONF.equals(action)) {
- exitCode = actionGetConf(clusterName,
serviceArgs.getActionGetConfArgs());
} else if (ACTION_HELP.equals(action) ||
ACTION_USAGE.equals(action)) {
log.info(serviceArgs.usage());
@@@ -1891,101 -1925,10 +1888,7 @@@
return EXIT_SUCCESS;
}
- /*
- * Creates a site conf with entries from clientProperties of ClusterStatus
- * @param desc ClusterDescription, can be null
- * @param clustername, can be null
- * @return site conf
- */
- public Configuration getSiteConf(ClusterDescription desc, String
clustername)
- throws YarnException, IOException {
- if (desc == null) {
- desc = getClusterDescription();
- }
- if (clustername == null) {
- clustername = getDeployedClusterName();
- }
- String description = "Slider Application Instance " + clustername;
-
- Configuration siteConf = new Configuration(false);
- for (String key : desc.clientProperties.keySet()) {
- siteConf.set(key, desc.clientProperties.get(key), description);
- }
- return siteConf;
- }
--
-
-- /**
- * get the cluster configuration
- * @param clustername cluster name
- * @return the cluster name
- */
-
- @SuppressWarnings(
- {"UseOfSystemOutOrSystemErr", "IOResourceOpenedButNotSafelyClosed"})
- public int actionGetConf(String clustername, ActionGetConfArgs confArgs)
- throws YarnException, IOException {
- File outfile = null;
-
- if (confArgs.getOutput() != null) {
- outfile = new File(confArgs.getOutput());
- }
-
- String format = confArgs.getFormat();
- verifyBindingsDefined();
- SliderUtils.validateClusterName(clustername);
- ClusterDescription status = getClusterDescription(clustername);
- Writer writer;
- boolean toPrint;
- if (outfile != null) {
- writer = new FileWriter(outfile);
- toPrint = false;
- } else {
- writer = new StringWriter();
- toPrint = true;
- }
- try {
- String description = "Slider Application Instance " + clustername;
- // JDK7
- /*
- switch (format) {
- case Arguments.FORMAT_XML:
- Configuration siteConf = getSiteConf(status, clustername);
- siteConf.writeXml(writer);
- break;
- case Arguments.FORMAT_PROPERTIES:
- Properties props = new Properties();
- props.putAll(status.clientProperties);
- props.store(writer, description);
- break;
- default:
- throw new BadCommandArgumentsException("Unknown format: " + format);
- }
- */
- if (Arguments.FORMAT_XML.equals(format)) {
- Configuration siteConf = getSiteConf(status, clustername);
- siteConf.writeXml(writer);
- } else if (Arguments.FORMAT_PROPERTIES.equals(format)) {
- Properties props = new Properties();
- props.putAll(status.clientProperties);
- props.store(writer, description);
- } else {
- throw new BadCommandArgumentsException("Unknown format: " + format);
- }
- } finally {
- // data is written.
- // close the file
- writer.close();
- }
- // then, if this is not a file write, print it
- if (toPrint) {
- // not logged
- System.err.println(writer.toString());
- }
- return EXIT_SUCCESS;
- }
-
- * Restore a cluster
- */
+ @Override
public int actionThaw(String clustername, ActionThawArgs thaw) throws
YarnException, IOException {
SliderUtils.validateClusterName(clustername);
// see if it is actually running and bail out;
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/02623b1d/slider-core/src/main/java/org/apache/slider/common/params/ClientArgs.java
----------------------------------------------------------------------
diff --cc
slider-core/src/main/java/org/apache/slider/common/params/ClientArgs.java
index 16363d2,50bf106..a4265aa
--- a/slider-core/src/main/java/org/apache/slider/common/params/ClientArgs.java
+++ b/slider-core/src/main/java/org/apache/slider/common/params/ClientArgs.java
@@@ -78,26 -76,24 +77,25 @@@ public class ClientArgs extends CommonA
protected void addActionArguments() {
addActions(
- actionAMSuicideArgs,
- actionBuildArgs,
- actionCreateArgs,
- actionUpdateArgs,
- actionDestroyArgs,
- actionExistsArgs,
- actionFlexArgs,
- actionFreezeArgs,
- actionKillContainerArgs,
- actionListArgs,
- actionRegistryArgs,
- actionStatusArgs,
- actionThawArgs,
- actionHelpArgs,
- actionVersionArgs,
- actionInstallPackageArgs,
- actionDiagnosticArgs
- );
+ actionAMSuicideArgs,
+ actionBuildArgs,
+ actionCreateArgs,
+ actionUpdateArgs,
+ actionDestroyArgs,
+ actionDiagnosticArgs,
+ actionExistsArgs,
+ actionFlexArgs,
+ actionFreezeArgs,
- actionGetConfArgs,
+ actionHelpArgs,
+ actionInstallPackageArgs,
+ actionKillContainerArgs,
+ actionListArgs,
+ actionRegistryArgs,
+ actionResolveArgs,
+ actionStatusArgs,
+ actionThawArgs,
+ actionVersionArgs
+ );
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/02623b1d/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java
----------------------------------------------------------------------
