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/11/02 15:25:38 UTC
[1/4] git commit: upgrade "use a URI in the api" from a SHOULD to a
MUST; fix examples and tests accordingly
Repository: incubator-slider
Updated Branches:
refs/heads/develop 96c9006d4 -> a5c0d3b41
upgrade "use a URI in the api" from a SHOULD to a MUST; fix examples and tests accordingly
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b51f5811
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b51f5811
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b51f5811
Branch: refs/heads/develop
Commit: b51f581124644482eeb71e202459b1259cd58f8c
Parents: 0161b59
Author: Steve Loughran <st...@apache.org>
Authored: Mon Oct 27 18:56:25 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sun Nov 2 14:14:08 2014 +0000
----------------------------------------------------------------------
.../registry/info/CustomRegistryConstants.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b51f5811/slider-core/src/main/java/org/apache/slider/core/registry/info/CustomRegistryConstants.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/registry/info/CustomRegistryConstants.java b/slider-core/src/main/java/org/apache/slider/core/registry/info/CustomRegistryConstants.java
index 67b9feb..0a3476c 100644
--- a/slider-core/src/main/java/org/apache/slider/core/registry/info/CustomRegistryConstants.java
+++ b/slider-core/src/main/java/org/apache/slider/core/registry/info/CustomRegistryConstants.java
@@ -24,31 +24,31 @@ package org.apache.slider.core.registry.info;
public class CustomRegistryConstants {
public static final String MANAGEMENT_REST_API =
- "org.apache.slider.management";
+ "classpath:org.apache.slider.management";
public static final String REGISTRY_REST_API =
- "org.apache.slider.registry";
+ "classpath:org.apache.slider.registry";
public static final String PUBLISHER_REST_API =
- "org.apache.slider.publisher";
+ "classpath:org.apache.slider.publisher";
public static final String PUBLISHER_CONFIGURATIONS_API =
- "org.apache.slider.publisher.configurations";
+ "classpath:org.apache.slider.publisher.configurations";
public static final String PUBLISHER_EXPORTS_API =
- "org.apache.slider.publisher.exports";
+ "classpath:org.apache.slider.publisher.exports";
public static final String PUBLISHER_DOCUMENTS_API =
- "org.apache.slider.publisher.documents";
+ "classpath:org.apache.slider.publisher.documents";
public static final String AGENT_SECURE_REST_API =
- "org.apache.slider.agents.secure";
+ "classpath:org.apache.slider.agents.secure";
public static final String AGENT_ONEWAY_REST_API =
- "org.apache.slider.agents.oneway";
+ "classpath:org.apache.slider.agents.oneway";
public static final String AM_IPC_PROTOCOL =
- "org.apache.slider.appmaster";
+ "classpath:org.apache.slider.appmaster";
- public static final String WEB_UI = "org.apache.http.UI";
+ public static final String WEB_UI = "http://";
}
[4/4] git commit: Merge branch
'feature/SLIDER-531-registry-enhancements' into develop
Posted by st...@apache.org.
Merge branch 'feature/SLIDER-531-registry-enhancements' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a5c0d3b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a5c0d3b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a5c0d3b4
Branch: refs/heads/develop
Commit: a5c0d3b41b20be92cc9a90072d368d7be6fa31a6
Parents: 96c9006 b51f581
Author: Steve Loughran <st...@apache.org>
Authored: Sun Nov 2 14:25:26 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sun Nov 2 14:25:26 2014 +0000
----------------------------------------------------------------------
slider-agent/src/main/python/agent/Registry.py | 11 ++++++-----
.../registry/info/CustomRegistryConstants.java | 20 ++++++++++----------
.../server/appmaster/SliderAppMaster.java | 3 +--
.../rest/registry/PathEntryMarshalling.groovy | 2 +-
.../funtest/lifecycle/AgentRegistryIT.groovy | 2 +-
5 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
[3/4] git commit: SLIDER-531. YARN-2678 new registry formats
Posted by st...@apache.org.
SLIDER-531. YARN-2678 new registry formats
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ee929430
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ee929430
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ee929430
Branch: refs/heads/develop
Commit: ee9294302551c4cb4f52c41f67f8fc17b357787a
Parents: 96c9006
Author: Steve Loughran <st...@apache.org>
Authored: Thu Oct 23 16:00:32 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Sun Nov 2 14:14:08 2014 +0000
----------------------------------------------------------------------
slider-agent/src/main/python/agent/Registry.py | 11 ++++++-----
.../apache/slider/server/appmaster/SliderAppMaster.java | 3 +--
.../slider/funtest/lifecycle/AgentRegistryIT.groovy | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ee929430/slider-agent/src/main/python/agent/Registry.py
----------------------------------------------------------------------
diff --git a/slider-agent/src/main/python/agent/Registry.py b/slider-agent/src/main/python/agent/Registry.py
index ad84053..6d34956 100644
--- a/slider-agent/src/main/python/agent/Registry.py
+++ b/slider-agent/src/main/python/agent/Registry.py
@@ -24,7 +24,7 @@ from kazoo.client import KazooClient
logger = logging.getLogger()
-class Registry:
+class Registry(object):
def __init__(self, zk_quorum, zk_reg_path):
self.zk_quorum = zk_quorum
self.zk_reg_path = zk_reg_path
@@ -39,17 +39,18 @@ class Registry:
zk = KazooClient(hosts=self.zk_quorum, read_only=True)
zk.start()
data, stat = zk.get(self.zk_reg_path)
- data = data.lstrip("jsonservicerec")
logger.debug("Registry Data: %s" % (data.decode("utf-8")))
sliderRegistry = json.loads(data)
internalAttr = sliderRegistry["internal"]
for internal in internalAttr:
if internal["api"] == "org.apache.slider.agents.secure":
- amUrl = internal["addresses"][0][0]
+ address0 = internal["addresses"][0]
+ amUrl = address0["uri"]
amHost = amUrl.split("/")[2].split(":")[0]
amSecuredPort = amUrl.split(":")[2].split("/")[0]
if internal["api"] == "org.apache.slider.agents.oneway":
- amUnsecureUrl = internal["addresses"][0][0]
+ address0 = internal["addresses"][0]
+ amUnsecureUrl = address0["uri"]
amHost = amUnsecureUrl.split("/")[2].split(":")[0]
amUnsecuredPort = amUnsecureUrl.split(":")[2].split("/")[0]
@@ -62,7 +63,7 @@ class Registry:
(self.zk_reg_path, self.zk_quorum, str(e)))
pass
finally:
- if not zk == None:
+ if not zk is None:
zk.stop()
zk.close()
logger.info("AM Host = %s, AM Secured Port = %s, ping port = %s" % (amHost, amSecuredPort, amUnsecuredPort))
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ee929430/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 f2ea00f..3bee4a4 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
@@ -1060,8 +1060,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
serviceRecord.addExternalEndpoint(
RegistryTypeUtils.ipcEndpoint(
CustomRegistryConstants.AM_IPC_PROTOCOL,
- true,
- RegistryTypeUtils.marshall(rpcServiceAddress)));
+ rpcServiceAddress));
// internal services
sliderAMProvider.applyInitialRegistryDefinitions(amWebURI,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ee929430/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy
index 5b8b3cd..ee9ef61 100644
--- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy
+++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy
@@ -50,7 +50,7 @@ public class AgentRegistryIT extends AgentCommandTestBase
@Before
public void prepareCluster() {
setupCluster(CLUSTER)
- }
+ }
@After
public void destroyCluster() {
[2/4] git commit: SLIDER-531 -keep in sync with latest YARN changes
Posted by st...@apache.org.
SLIDER-531 -keep in sync with latest YARN 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/0161b590
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0161b590
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0161b590
Branch: refs/heads/develop
Commit: 0161b590ac4311512a5729f5e2f984d5d1dac319
Parents: ee92943
Author: Steve Loughran <st...@apache.org>
Authored: Mon Oct 27 17:57:25 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sun Nov 2 14:14:08 2014 +0000
----------------------------------------------------------------------
.../server/appmaster/web/rest/registry/PathEntryMarshalling.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0161b590/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/PathEntryMarshalling.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/PathEntryMarshalling.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/PathEntryMarshalling.groovy
index 937bebf..5f987c2 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/PathEntryMarshalling.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/PathEntryMarshalling.groovy
@@ -23,6 +23,6 @@ import org.apache.hadoop.registry.client.binding.JsonSerDeser
class PathEntryMarshalling
extends JsonSerDeser<PathEntryResource> {
public PathEntryMarshalling() {
- super(PathEntryResource.class, new byte[0]);
+ super(PathEntryResource.class);
}
}
\ No newline at end of file