YARN-913 ephemeral service records no longer supported
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/edf72865 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/edf72865 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/edf72865 Branch: refs/heads/develop Commit: edf728654754e47e360ae3b56b1bf8df8d24aa4a Parents: 4eeed33 Author: Steve Loughran <ste...@apache.org> Authored: Thu Sep 11 14:50:21 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Sep 11 14:50:21 2014 +0100 ---------------------------------------------------------------------- .../server/appmaster/SliderAppMaster.java | 10 ++++---- .../YarnRegistryViewForProviders.java | 24 ++++++++------------ 2 files changed, 15 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/edf72865/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 4b5e0b3..f924ef5 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 @@ -970,8 +970,8 @@ public class SliderAppMaster extends AbstractSliderLaunchedService // and an ephemeral binding to the app yarnRegistryOperations.putComponent( RegistryPathUtils.encodeYarnID(appAttemptID.toString()), - serviceRecord, - false); + serviceRecord + ); } @@ -987,7 +987,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService if (registryOperations instanceof RMRegistryOperationsService) { RMRegistryOperationsService rmRegOperations = (RMRegistryOperationsService) registryOperations; - rmRegOperations.createHomeDirectory(service_user_name); + rmRegOperations.initUserRegistryAsync(service_user_name); } } @@ -1009,9 +1009,9 @@ public class SliderAppMaster extends AbstractSliderLaunchedService ServiceRecord container = new ServiceRecord( cid, description, - PersistencePolicies.EPHEMERAL); + PersistencePolicies.CONTAINER); try { - yarnRegistryOperations.putComponent(cid, container, true); + yarnRegistryOperations.putComponent(cid, container); } catch (IOException e) { log.warn("Failed to register container {}/{}: {}", id, description, e, e); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/edf72865/slider-core/src/main/java/org/apache/slider/server/services/yarnregistry/YarnRegistryViewForProviders.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/services/yarnregistry/YarnRegistryViewForProviders.java b/slider-core/src/main/java/org/apache/slider/server/services/yarnregistry/YarnRegistryViewForProviders.java index ef9c3a4..bea7f78 100644 --- a/slider-core/src/main/java/org/apache/slider/server/services/yarnregistry/YarnRegistryViewForProviders.java +++ b/slider-core/src/main/java/org/apache/slider/server/services/yarnregistry/YarnRegistryViewForProviders.java @@ -61,39 +61,35 @@ public class YarnRegistryViewForProviders { /** * Add a component under the slider name/entry - * @param componentName - * @param entry - * @param ephemeral + * @param componentName component name + * @param record record to put * @throws IOException */ public void putComponent(String componentName, - ServiceRecord entry, - boolean ephemeral) throws + ServiceRecord record) throws IOException { putComponent(sliderServiceclass, instanceName, componentName, - entry, - ephemeral); + record + ); } /** * Add a component - * @param componentName - * @param record - * @param ephemeral + * @param serviceClass service class to use under ~user + * @param componentName component name + * @param record record to put * @throws IOException */ public void putComponent(String serviceClass, String serviceName, String componentName, - ServiceRecord record, - boolean ephemeral) throws IOException { + ServiceRecord record) throws IOException { String path = BindingUtils.componentPath( user, serviceClass, serviceName, componentName); registryOperations.mkdir(RegistryPathUtils.parentOf(path), true); registryOperations.create(path, record, - CreateFlags.OVERWRITE - + (ephemeral ? CreateFlags.EPHEMERAL : 0)); + CreateFlags.OVERWRITE); }
