SLIDER-149/YARN-913 tracking changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/821d3066 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/821d3066 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/821d3066 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 821d3066496c0b1ba581b0231b63f9bf5e5e478b Parents: 2a28822 Author: Steve Loughran <ste...@apache.org> Authored: Tue Sep 23 21:05:03 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Sep 23 21:05:03 2014 +0100 ---------------------------------------------------------------------- .../org/apache/slider/server/appmaster/SliderAppMaster.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/821d3066/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 d2b9295..1fd378b 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 @@ -57,7 +57,7 @@ import org.apache.hadoop.yarn.registry.client.services.RegistryOperationsService import org.apache.hadoop.yarn.registry.client.types.PersistencePolicies; import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; import org.apache.hadoop.yarn.registry.client.binding.RegistryTypeUtils; -import org.apache.hadoop.yarn.registry.server.services.RMRegistryOperationsService; +import org.apache.hadoop.yarn.registry.server.integration.RMRegistryOperationsService; import org.apache.hadoop.yarn.security.AMRMTokenIdentifier; import org.apache.hadoop.yarn.security.client.ClientToAMTokenSecretManager; import org.apache.hadoop.yarn.util.ConverterUtils; @@ -984,7 +984,11 @@ public class SliderAppMaster extends AbstractSliderLaunchedService return new ResourceManagerRegistryService("YarnRegistry"); } */ - + + /** + * TODO: purge this once RM is doing the work + * @throws IOException + */ protected void setupInitialRegistryPaths() throws IOException { if (registryOperations instanceof RMRegistryOperationsService) { RMRegistryOperationsService rmRegOperations =