SLIDER-1149 in sync w/ YARN-913 branch with [[string]] address lists
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b0025d60 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b0025d60 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b0025d60 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: b0025d60d39193e6a8a824d1c205e674338701d7 Parents: 0252164 Author: Steve Loughran <ste...@apache.org> Authored: Thu Aug 21 15:42:02 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Aug 21 15:42:02 2014 +0100 ---------------------------------------------------------------------- .../org/apache/slider/providers/agent/AgentProviderService.java | 4 +--- .../org/apache/slider/server/appmaster/SliderAppMaster.java | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b0025d60/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 3869911..790e379 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 @@ -604,11 +604,9 @@ public class AgentProviderService extends AbstractProviderService implements url, "Agent REST API")); - serviceRecord.putInternalEndpoint( - CustomRegistryConstants.AGENT_REST_API, + serviceRecord.addInternalEndpoint( new Endpoint(CustomRegistryConstants.AGENT_REST_API, ProtocolTypes.PROTOCOL_REST, - "Agent REST API", uri)); } catch (URISyntaxException e) { throw new IOException(e); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b0025d60/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 e9cdad6..d8c062c 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 @@ -911,12 +911,11 @@ public class SliderAppMaster extends AbstractSliderLaunchedService RegisteredEndpoint.PROTOCOL_HADOOP_PROTOBUF, SLIDER_AM_RPC) ); - registryEntry.putExternalEndpoint(CustomRegistryConstants.AM_IPC_PROTOCOL, + registryEntry.addExternalEndpoint( RegistryTypeUtils.ipcEndpoint( CustomRegistryConstants.AM_IPC_PROTOCOL, - SLIDER_AM_RPC, true, - RegistryTypeUtils.toWireFormat(rpcServiceAddress))); + RegistryTypeUtils.marshall(rpcServiceAddress))); // internal services
