You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/08/28 13:19:59 UTC
[11/12] git commit: SLIDER-149 ... in sync with YARN-913 change to
return full list of endpoint addresses
SLIDER-149 ... in sync with YARN-913 change to return full list of endpoint addresses
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e0854cf9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e0854cf9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e0854cf9
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: e0854cf9cf81da249394ad6d912ae86166d5d561
Parents: a052888
Author: Steve Loughran <st...@apache.org>
Authored: Thu Aug 28 12:18:35 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Aug 28 12:18:35 2014 +0100
----------------------------------------------------------------------
.../slider/core/registry/retrieve/RegistryRetriever.java | 8 ++++----
.../apache/slider/agent/standalone/TestYarnRegistryAM.groovy | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e0854cf9/slider-core/src/main/java/org/apache/slider/core/registry/retrieve/RegistryRetriever.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/registry/retrieve/RegistryRetriever.java b/slider-core/src/main/java/org/apache/slider/core/registry/retrieve/RegistryRetriever.java
index 001bf66..377b0b0 100644
--- a/slider-core/src/main/java/org/apache/slider/core/registry/retrieve/RegistryRetriever.java
+++ b/slider-core/src/main/java/org/apache/slider/core/registry/retrieve/RegistryRetriever.java
@@ -79,13 +79,13 @@ public class RegistryRetriever {
Endpoint internal = record.getInternalEndpoint(
CustomRegistryConstants.PUBLISHER_CONFIGURATIONS_API);
- internalConfigurationURL = RegistryTypeUtils.retrieveAddressUriType(
- internal);
+ internalConfigurationURL = RegistryTypeUtils.retrieveAddressesUriType(
+ internal).get(0);
Endpoint external = record.getExternalEndpoint(
CustomRegistryConstants.PUBLISHER_CONFIGURATIONS_API);
- externalConfigurationURL = RegistryTypeUtils.retrieveAddressUriType(
- external);
+ externalConfigurationURL = RegistryTypeUtils.retrieveAddressesUriType(
+ external).get(0);
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e0854cf9/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestYarnRegistryAM.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestYarnRegistryAM.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestYarnRegistryAM.groovy
index 7bdf927..8ab5c6c 100644
--- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestYarnRegistryAM.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestYarnRegistryAM.groovy
@@ -160,13 +160,13 @@ class TestYarnRegistryAM extends AgentMiniClusterTestBase {
def registryEndpoint = serviceInstance.getExternalEndpoint(
CustomRegistryConstants.REGISTRY_REST_API)
assert registryEndpoint != null
- def registryURL = RegistryTypeUtils.retrieveAddressURL(registryEndpoint)
+ def registryURL = RegistryTypeUtils.retrieveAddressURLs(registryEndpoint)[0]
describe("Registry WADL @ $registryURL")
def publisherEndpoint = serviceInstance.getExternalEndpoint(
CustomRegistryConstants.PUBLISHER_REST_API)
- def publisherURL = RegistryTypeUtils.retrieveAddressURL(publisherEndpoint)
+ def publisherURL = RegistryTypeUtils.retrieveAddressURLs(publisherEndpoint)[0]
def publisher = publisherURL.toString()
describe("Publisher")