Repository: incubator-slider Updated Branches: refs/heads/develop b8c3546aa -> e39d99e19
SLIDER-222 Enhance registry command with --out option Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/fa53ef91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/fa53ef91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/fa53ef91 Branch: refs/heads/develop Commit: fa53ef91c982eaced4dde327b79af5f32be24416 Parents: 2553f15 Author: Steve Loughran <ste...@apache.org> Authored: Wed Oct 8 17:16:30 2014 -0700 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Oct 8 17:16:30 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/slider/client/SliderClient.java | 13 ++++++------- .../slider/common/params/ActionRegistryArgs.java | 10 +++++----- .../org/apache/slider/common/params/Arguments.java | 4 +++- .../hbase/funtest/FunctionalHBaseClusterIT.groovy | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fa53ef91/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java index 8b44870..7daa2b8 100644 --- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -2701,16 +2701,15 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe PublishedConfigurationOutputter outputter = PublishedConfigurationOutputter.createOutputter(configFormat, published); - boolean print = registryArgs.dest == null; + boolean print = registryArgs.out == null; if (!print) { - File destFile; - destFile = registryArgs.dest; - if (destFile.isDirectory()) { + File outputPath = registryArgs.out; + if (outputPath.isDirectory()) { // creating it under a directory - destFile = new File(destFile, entry + "." + format); + outputPath = new File(outputPath, entry + "." + format); } - log.info("Destination path: {}", destFile); - outputter.save(destFile); + log.debug("Destination path: {}", outputPath); + outputter.save(outputPath); } else { print(outputter.asString()); } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fa53ef91/slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java index 6de9a45..df40ef1 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java @@ -104,7 +104,7 @@ public class ActionRegistryArgs extends AbstractActionArgs { @Parameter(names = {ARG_OUTPUT, ARG_OUTPUT_SHORT, ARG_DEST}, description = "Output destination") - public File dest; + public File out; @Parameter(names = {ARG_NAME}, description = "name of an instance") @@ -137,8 +137,8 @@ public class ActionRegistryArgs extends AbstractActionArgs { if (set > 1) { throw new UsageException(USAGE); } - if (dest != null && (lists > 0 || set == 0)) { - throw new UsageException("Argument " + ARG_DEST + if (out != null && (lists > 0 || set == 0)) { + throw new UsageException("output path" + " is only supported on 'get' operations: " + USAGE); } if (!list && !is(name)) { @@ -190,8 +190,8 @@ public class ActionRegistryArgs extends AbstractActionArgs { sb.append(ifdef(ARG_VERBOSE, verbose)); sb.append(ifdef(ARG_INTERNAL, internal)); - if (dest != null) { - sb.append(ifdef(ARG_DEST, dest.toString())); + if (out != null) { + sb.append(ifdef(ARG_OUTPUT, out.toString())); } sb.append(ifdef(ARG_FORMAT, format)); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fa53ef91/slider-core/src/main/java/org/apache/slider/common/params/Arguments.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/Arguments.java b/slider-core/src/main/java/org/apache/slider/common/params/Arguments.java index bbd7da6..4deebd7 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/Arguments.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/Arguments.java @@ -32,8 +32,10 @@ public interface Arguments { String ARG_COMP_OPT_SHORT = "--co"; String ARG_DEBUG = "--debug"; - String ARG_DEST = "--dest"; String ARG_DEFINE = "-D"; + String ARG_DEST = "--dest"; + String ARG_DESTDIR = "--destdir"; + String ARG_DESTFILE = "--destfile"; String ARG_EXITCODE = "--exitcode"; /** filesystem-uri: {@value} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fa53ef91/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/FunctionalHBaseClusterIT.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/FunctionalHBaseClusterIT.groovy b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/FunctionalHBaseClusterIT.groovy index 5137101..3b8d1f9 100644 --- a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/FunctionalHBaseClusterIT.groovy +++ b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/FunctionalHBaseClusterIT.groovy @@ -210,7 +210,7 @@ public class FunctionalHBaseClusterIT extends HBaseCommandTestBase getConfDir.mkdirs(); registry([ARG_GETCONF, yarn_site_config, ARG_NAME, name, - ARG_DEST, getConfDir.absolutePath]) + ARG_OUTPUT, getConfDir.absolutePath]) File retrieved = new File(getConfDir, yarn_site_config +".xml") def confFromFile = ConfigHelper.loadConfFromFile(retrieved) assert confFromFile.get(YarnConfiguration.RM_ADDRESS)
