Repository: incubator-slider Updated Branches: refs/heads/feature/SLIDER-151_REST_API 621a981cb -> bfe71dc05
SLIDER-90: HA NN, RM support Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0b52d4b0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0b52d4b0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0b52d4b0 Branch: refs/heads/feature/SLIDER-151_REST_API Commit: 0b52d4b0e2fc0a3a5e98c34bb6248a84e359c3db Parents: 7ab9ce9 Author: Steve Loughran <ste...@apache.org> Authored: Tue Aug 5 12:04:41 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Aug 5 12:04:41 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/slider/client/SliderClient.java | 10 ++++------ .../slider/common/params/AbstractActionArgs.java | 14 +++++--------- .../java/org/apache/slider/common/params/ArgOps.java | 7 ++++--- .../org/apache/slider/common/params/ClientArgs.java | 5 +++-- .../org/apache/slider/common/params/CommonArgs.java | 11 +++++------ .../slider/server/appmaster/SliderAppMaster.java | 4 ++-- 6 files changed, 23 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0b52d4b0/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 40e01bb..ff2e865 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 @@ -182,7 +182,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe Configuration clientConf = SliderUtils.loadClientConfigurationResource(); ConfigHelper.mergeConfigurations(conf, clientConf, CLIENT_RESOURCE); serviceArgs.applyDefinitions(conf); - serviceArgs.applyFileSystemURL(conf); + serviceArgs.applyFileSystemBinding(conf); // init security with our conf if (SliderUtils.isHadoopClusterSecure(conf)) { SliderUtils.forceLogin(); @@ -330,9 +330,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe client.createPath(zkPath, "", ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); return zkPath; - } catch (InterruptedException e) { - log.warn("Unable to create zk node {}", zkPath, e); - } catch (KeeperException e) { + } catch (InterruptedException | KeeperException e) { log.warn("Unable to create zk node {}", zkPath, e); } } @@ -1008,8 +1006,8 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe commandLine.add(Arguments.ARG_RM_ADDR, rmAddr); } - if (serviceArgs.getFilesystemURL() != null) { - commandLine.add(Arguments.ARG_FILESYSTEM, serviceArgs.getFilesystemURL()); + if (serviceArgs.getFilesystemBinding() != null) { + commandLine.add(Arguments.ARG_FILESYSTEM, serviceArgs.getFilesystemBinding()); } addConfOptionToCLI(commandLine, config, REGISTRY_PATH, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0b52d4b0/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java index 44bc239..3a8cea4 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java @@ -25,7 +25,6 @@ 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.List; @@ -41,26 +40,23 @@ public abstract class AbstractActionArgs extends ArgOps implements Arguments { } /** - * URI of the filesystem + * URI/binding to the filesystem */ @Parameter(names = {ARG_FILESYSTEM, ARG_FILESYSTEM_LONG}, - description = "Filesystem URI", - converter = URIArgumentConverter.class) - public URI filesystemURL; + description = "Filesystem Binding") + public String filesystemBinding; @Parameter(names = {ARG_BASE_PATH}, description = "Slider base path on the filesystem", converter = PathArgumentConverter.class) public Path basePath; - /** * This is the default parameter */ @Parameter public final List<String> parameters = new ArrayList<>(); - /** * get the name: relies on arg 1 being the cluster name in all operations * @return the name argument, null if there is none @@ -92,7 +88,7 @@ public abstract class AbstractActionArgs extends ArgOps implements Arguments { @Parameter(names = {ARG_MANAGER_SHORT, ARG_MANAGER}, - description = "hostname:port of the YARN resource manager") + description = "Binding (usually hostname:port) of the YARN resource manager") public String manager; @@ -110,7 +106,7 @@ public abstract class AbstractActionArgs extends ArgOps implements Arguments { /** * Get the name of the action - * @return + * @return the action name */ public abstract String getActionName() ; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0b52d4b0/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java b/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java index 0837dd2..b53ebd3 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java @@ -58,11 +58,12 @@ public class ArgOps { return triple(msg, min, min); } - public static void applyFileSystemURL(URI filesystemURL, Configuration conf) { - if (filesystemURL != null) { + 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, filesystemURL); + FileSystem.setDefaultUri(conf, filesystemBinding); } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0b52d4b0/slider-core/src/main/java/org/apache/slider/common/params/ClientArgs.java ---------------------------------------------------------------------- diff --git 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 index 6e44402..ca854f1 100644 --- 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 @@ -103,9 +103,10 @@ public class ClientArgs extends CommonArgs { log.debug("Setting RM to {}", getManager()); conf.set(YarnConfiguration.RM_ADDRESS, getManager()); } - if ( getBasePath() != null ) { + if (getBasePath() != null) { log.debug("Setting basePath to {}", getBasePath()); - conf.set(SliderXmlConfKeys.KEY_SLIDER_BASE_PATH, getBasePath().toString()); + conf.set(SliderXmlConfKeys.KEY_SLIDER_BASE_PATH, + getBasePath().toString()); } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0b52d4b0/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java index 4cee1d1..83e658d 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java @@ -30,7 +30,6 @@ import org.apache.slider.core.exceptions.SliderException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.URI; import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -215,12 +214,12 @@ public abstract class CommonArgs extends ArgOps implements SliderActions, /** - * If the Filesystem URL was provided, it overrides anything in + * If the Filesystem binding was provided, it overrides anything in * the configuration * @param conf configuration */ - public void applyFileSystemURL(Configuration conf) { - ArgOps.applyFileSystemURL(getFilesystemURL(), conf); + public void applyFileSystemBinding(Configuration conf) { + ArgOps.applyFileSystemBinding(getFilesystemBinding(), conf); } public boolean isDebug() { @@ -228,8 +227,8 @@ public abstract class CommonArgs extends ArgOps implements SliderActions, } - public URI getFilesystemURL() { - return coreAction.filesystemURL; + public String getFilesystemBinding() { + return coreAction.filesystemBinding; } public Path getBasePath() { return coreAction.basePath; } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0b52d4b0/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java index 3b061d5..7e0ae5e 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java @@ -340,7 +340,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService SliderAMCreateAction createAction = (SliderAMCreateAction) action; //sort out the location of the AM serviceArgs.applyDefinitions(conf); - serviceArgs.applyFileSystemURL(conf); + serviceArgs.applyFileSystemBinding(conf); String rmAddress = createAction.getRmAddress(); if (rmAddress != null) { @@ -348,7 +348,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService SliderUtils.setRmSchedulerAddress(conf, rmAddress); } serviceArgs.applyDefinitions(conf); - serviceArgs.applyFileSystemURL(conf); + serviceArgs.applyFileSystemBinding(conf); //init security with our conf if (SliderUtils.isHadoopClusterSecure(conf)) { log.info("Secure mode with kerberos realm {}",
