SLIDER-149 latest YARN-913 revisions
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/dbae537f Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/dbae537f Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/dbae537f Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: dbae537ff17132411356a6f0f83c8fe9c6b0cb37 Parents: 69932dc Author: Steve Loughran <ste...@apache.org> Authored: Sun Aug 17 19:46:53 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Sun Aug 17 19:46:53 2014 +0100 ---------------------------------------------------------------------- .../apache/slider/providers/AbstractProviderService.java | 5 ++--- .../java/org/apache/slider/providers/ProviderService.java | 9 ++++----- .../apache/slider/providers/agent/AgentProviderService.java | 8 ++++---- .../slider/providers/agent/ComponentInstanceState.java | 1 - .../slider/providers/slideram/SliderAMProviderService.java | 6 +++--- .../org/apache/slider/server/appmaster/SliderAppMaster.java | 5 ++--- .../services/yarnregistry/YarnRegistryViewForProviders.java | 6 +++--- .../server/appmaster/model/mock/MockProviderService.groovy | 6 ++---- .../apache/slider/providers/hbase/HBaseProviderService.java | 8 ++++---- 9 files changed, 24 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dbae537f/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java index 0dbfe99..89e5c65 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java @@ -20,11 +20,10 @@ package org.apache.slider.providers; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.service.Service; -import org.apache.hadoop.yarn.registry.server.services.YarnRegistryService; -import org.apache.hadoop.yarn.registry.client.types.ServiceEntry; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.client.api.AMRMClient; +import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; import org.apache.slider.api.ClusterDescription; import org.apache.slider.common.SliderKeys; import org.apache.slider.common.tools.ConfigHelper; @@ -341,7 +340,7 @@ public abstract class AbstractProviderService public void applyInitialRegistryDefinitions(URL unsecureWebAPI, URL secureWebAPI, ServiceInstanceData registryInstanceData, - ServiceEntry serviceEntry) + ServiceRecord serviceRecord) throws IOException { this.amWebAPI = unsecureWebAPI; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dbae537f/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java index 92fb6f9..67ca0a9 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java @@ -22,9 +22,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.service.Service; import org.apache.hadoop.yarn.api.records.Container; -import org.apache.hadoop.yarn.registry.server.services.YarnRegistryService; -import org.apache.hadoop.yarn.registry.client.types.ServiceEntry; import org.apache.hadoop.yarn.api.records.ContainerId; +import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; import org.apache.slider.api.ClusterDescription; import org.apache.slider.common.tools.SliderFileSystem; import org.apache.slider.core.conf.AggregateConf; @@ -35,8 +34,8 @@ import org.apache.slider.core.launch.ContainerLauncher; import org.apache.slider.core.main.ExitCodeProvider; import org.apache.slider.core.registry.info.ServiceInstanceData; import org.apache.slider.server.appmaster.actions.QueueAccess; -import org.apache.slider.server.appmaster.state.ContainerReleaseSelector; import org.apache.slider.server.appmaster.operations.RMOperationHandlerActions; +import org.apache.slider.server.appmaster.state.ContainerReleaseSelector; import org.apache.slider.server.appmaster.state.StateAccessForProviders; import org.apache.slider.server.appmaster.web.rest.agent.AgentRestOperations; import org.apache.slider.server.services.registry.RegistryViewForProviders; @@ -188,12 +187,12 @@ public interface ProviderService extends ProviderCore, * @param unsecureWebAPI * @param secureWebAPI * @param registryInstanceData - * @param serviceEntry + * @param serviceRecord */ void applyInitialRegistryDefinitions(URL unsecureWebAPI, URL secureWebAPI, ServiceInstanceData registryInstanceData, - ServiceEntry serviceEntry) throws IOException; + ServiceRecord serviceRecord) throws IOException; /** * Create the container release selector for this provider...any policy http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dbae537f/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java index 575d41a..4d8f00f 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java @@ -30,7 +30,7 @@ import org.apache.hadoop.yarn.api.records.LocalResource; import org.apache.hadoop.yarn.api.records.LocalResourceType; import org.apache.hadoop.yarn.registry.client.types.Endpoint; import org.apache.hadoop.yarn.registry.client.types.ProtocolTypes; -import org.apache.hadoop.yarn.registry.client.types.ServiceEntry; +import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; import org.apache.slider.api.ClusterDescription; import org.apache.slider.api.ClusterDescriptionKeys; import org.apache.slider.api.ClusterNode; @@ -597,12 +597,12 @@ public class AgentProviderService extends AbstractProviderService implements @Override public void applyInitialRegistryDefinitions(URL unsecureWebAPI, URL secureWebAPI, - ServiceInstanceData instanceData, ServiceEntry serviceEntry) throws + ServiceInstanceData instanceData, ServiceRecord serviceRecord) throws IOException { super.applyInitialRegistryDefinitions(unsecureWebAPI, secureWebAPI, instanceData, - serviceEntry); + serviceRecord); try { URL url = new URL(secureWebAPI, SLIDER_PATH_AGENTS); @@ -614,7 +614,7 @@ public class AgentProviderService extends AbstractProviderService implements url, "Agent REST API")); - serviceEntry.putInternalEndpoint( + serviceRecord.putInternalEndpoint( CustomRegistryConstants.AGENT_REST_API, new Endpoint(CustomRegistryConstants.AGENT_REST_API, ProtocolTypes.PROTOCOL_REST, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dbae537f/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentInstanceState.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentInstanceState.java b/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentInstanceState.java index f7f8bf4..2563fb4 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentInstanceState.java +++ b/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentInstanceState.java @@ -19,7 +19,6 @@ package org.apache.slider.providers.agent; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import org.apache.hadoop.yarn.api.records.ContainerId; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dbae537f/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java index dda5f5b..a973971 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java @@ -23,7 +23,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.HdfsConfiguration; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.apache.hadoop.yarn.registry.client.types.ServiceEntry; +import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; import org.apache.slider.common.SliderKeys; import org.apache.slider.common.tools.ConfigHelper; import org.apache.slider.common.tools.SliderFileSystem; @@ -113,11 +113,11 @@ public class SliderAMProviderService extends AbstractProviderService implements @Override public void applyInitialRegistryDefinitions(URL unsecureWebAPI, URL secureWebAPI, - ServiceInstanceData instanceData, ServiceEntry serviceEntry) throws IOException { + ServiceInstanceData instanceData, ServiceRecord serviceRecord) throws IOException { super.applyInitialRegistryDefinitions(unsecureWebAPI, secureWebAPI, instanceData, - serviceEntry); + serviceRecord); // now publish site.xml files YarnConfiguration defaultYarnConfig = new YarnConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dbae537f/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 0612185..a614f39 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 @@ -52,9 +52,9 @@ import org.apache.hadoop.yarn.client.api.async.impl.NMClientAsyncImpl; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.ipc.YarnRPC; +import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; import org.apache.hadoop.yarn.registry.server.services.YarnRegistryService; import org.apache.hadoop.yarn.registry.client.types.RegistryTypeUtils; -import org.apache.hadoop.yarn.registry.client.types.ServiceEntry; import org.apache.hadoop.yarn.security.AMRMTokenIdentifier; import org.apache.hadoop.yarn.security.client.ClientToAMTokenSecretManager; import org.apache.hadoop.yarn.util.ConverterUtils; @@ -142,7 +142,6 @@ import org.apache.slider.server.services.workflow.ServiceThreadFactory; import org.apache.slider.server.services.workflow.WorkflowExecutorService; import org.apache.slider.server.services.workflow.WorkflowRpcService; import org.apache.slider.server.services.yarnregistry.YarnRegistryViewForProviders; -import org.apache.slider.server.services.workflow.WorkflowScheduledExecutorService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -903,7 +902,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService serviceType); // Yarn registry - ServiceEntry registryEntry = new ServiceEntry(); + ServiceRecord registryEntry = new ServiceRecord(); // IPC services instanceData.externalView.endpoints.put( http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dbae537f/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 c59e4e7..efc1cf3 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 @@ -19,7 +19,7 @@ package org.apache.slider.server.services.yarnregistry; import org.apache.hadoop.yarn.registry.client.api.RegistryWriter; -import org.apache.hadoop.yarn.registry.client.types.ComponentEntry; +import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; import java.io.IOException; @@ -64,7 +64,7 @@ public class YarnRegistryViewForProviders { * @throws IOException */ public void putComponent(String componentName, - ComponentEntry entry, + ServiceRecord entry, boolean ephemeral) throws IOException { registryWriter.putComponent(user, sliderServiceclass, instanceName, @@ -82,7 +82,7 @@ public class YarnRegistryViewForProviders { */ public void putComponent(String serviceClass, String serviceName, - String componentName, ComponentEntry entry, boolean ephemeral) throws + String componentName, ServiceRecord entry, boolean ephemeral) throws IOException { registryWriter.putComponent(user, serviceClass, serviceName, componentName, entry, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dbae537f/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy index ad486b7..30b3655 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy @@ -18,16 +18,14 @@ package org.apache.slider.server.appmaster.model.mock -import java.io.IOException; - import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path import org.apache.hadoop.service.LifecycleEvent import org.apache.hadoop.service.ServiceStateChangeListener import org.apache.hadoop.yarn.api.records.Container -import org.apache.hadoop.yarn.registry.client.types.ServiceEntry import org.apache.hadoop.yarn.api.records.ContainerId import org.apache.hadoop.yarn.client.api.AMRMClient +import org.apache.hadoop.yarn.registry.client.types.ServiceRecord import org.apache.slider.api.ClusterDescription import org.apache.slider.common.tools.SliderFileSystem import org.apache.slider.core.conf.AggregateConf @@ -250,7 +248,7 @@ class MockProviderService implements ProviderService { URL unsecureWebAPI, URL secureWebAPI, ServiceInstanceData registryInstanceData, - ServiceEntry serviceEntry) throws IOException { + ServiceRecord serviceEntry) throws IOException { } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dbae537f/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java b/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java index 5a01a64..4d33400 100644 --- a/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java +++ b/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java @@ -23,7 +23,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.registry.client.api.RegistryWriter; -import org.apache.hadoop.yarn.registry.client.types.ServiceEntry; +import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; import org.apache.slider.api.InternalKeys; import org.apache.slider.common.SliderKeys; import org.apache.slider.api.ClusterDescription; @@ -249,10 +249,10 @@ public class HBaseProviderService extends AbstractProviderService @Override public void applyInitialRegistryDefinitions(URL web, URL secureWebAPI, - ServiceInstanceData instanceData, ServiceEntry serviceEntry) throws + ServiceInstanceData instanceData, ServiceRecord serviceRecord) throws IOException { super.applyInitialRegistryDefinitions(web, secureWebAPI, instanceData, - serviceEntry); + serviceRecord); } @Override @@ -278,7 +278,7 @@ public class HBaseProviderService extends AbstractProviderService registry.registerServiceInstance(instanceData, null); - ServiceEntry yse = new ServiceEntry(); + ServiceRecord yse = new ServiceRecord(); RegistryWriter registryWriter = yarnRegistry.getRegistryWriter();
