Git Push Summary
Repository: incubator-slider Updated Branches: refs/heads/feature/SLIDER_126_handle_heartbeat_failures [created] 7003c06eb
[1/5] git commit: SLIDER-24 - move to simple constructors while looking @ jenkins failures
Repository: incubator-slider
Updated Branches:
refs/heads/develop 7003c06eb - 93475e1bd
SLIDER-24 - move to simple constructors while looking @ jenkins failures
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/846310cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/846310cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/846310cb
Branch: refs/heads/develop
Commit: 846310cbc1689f095e9551fb8947ea1456f8e14e
Parents: 1bbeebe
Author: Steve Loughran ste...@apache.org
Authored: Wed Jun 18 13:45:32 2014 -0700
Committer: Steve Loughran ste...@apache.org
Committed: Wed Jun 18 13:45:32 2014 -0700
--
.../slider/server/services/workflow/ProcessCommandFactory.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/846310cb/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
--
diff --git
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
index 45fdc86..e77eeb3 100644
---
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
+++
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/ProcessCommandFactory.java
@@ -37,7 +37,7 @@ public class ProcessCommandFactory {
* @return commands
*/
public ListString ls(File dir) {
-ListString commands = new ArrayListString(5);
+ListString commands = new ArrayList(5);
commands.add(ls);
commands.add(-1);
commands.add(dir.getAbsolutePath());
@@ -50,7 +50,7 @@ public class ProcessCommandFactory {
* @return commands
*/
public ListString echo(String text) {
-ListString commands = new ArrayListString(5);
+ListString commands = new ArrayList(5);
commands.add(echo);
commands.add(text);
return commands;
@@ -72,7 +72,7 @@ public class ProcessCommandFactory {
* @return commands
*/
public ListString exitFalse() {
-ListString commands = new ArrayListString(2);
+ListString commands = new ArrayList(2);
commands.add(false);
return commands;
}
[4/5] git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider 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/6744e7db Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6744e7db Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6744e7db Branch: refs/heads/develop Commit: 6744e7dbce3744a46255c5aaf0464ab8e7fff70d Parents: 846310c 7003c06 Author: Steve Loughran ste...@apache.org Authored: Wed Jun 18 17:50:19 2014 -0700 Committer: Steve Loughran ste...@apache.org Committed: Wed Jun 18 17:50:19 2014 -0700 -- slider-funtest/pom.xml | 4 .../funtest/framework/CommandTestBase.groovy| 1 - .../funtest/framework/FuntestProperties.groovy | 5 - .../lifecycle/AgentCommandTestBase.groovy | 19 + .../lifecycle/TestAgentClusterLifecycle.groovy | 8 +++ .../lifecycle/TestAppsThroughAgent.groovy | 22 ++-- 6 files changed, 24 insertions(+), 35 deletions(-) --
[5/5] git commit: Merge branch 'feature/SLIDER-149_integrate_with_a_YARN_service_registry' into develop
Merge branch 'feature/SLIDER-149_integrate_with_a_YARN_service_registry' 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/93475e1b Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/93475e1b Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/93475e1b Branch: refs/heads/develop Commit: 93475e1bd281d6c65667e07d641819c85e74057e Parents: 6744e7d 5b90d3e Author: Steve Loughran ste...@apache.org Authored: Wed Jun 18 17:50:38 2014 -0700 Committer: Steve Loughran ste...@apache.org Committed: Wed Jun 18 17:50:38 2014 -0700 -- .../core/registry/info/RegisteredEndpoint.java | 44 +--- .../core/registry/info/ServiceInstanceData.java | 2 + .../providers/AbstractProviderService.java | 2 +- .../server/services/curator/CuratorUriSpec.java | 2 +- 4 files changed, 32 insertions(+), 18 deletions(-) --
[2/5] git commit: SLIDER-149 changing endpoint design to match current thoughts on what a YARN registry should do
SLIDER-149 changing endpoint design to match current thoughts on what a YARN
registry should do
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/86cabdc4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/86cabdc4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/86cabdc4
Branch: refs/heads/develop
Commit: 86cabdc427d59a5daf60c94bb5b00d7361391f81
Parents: 846310c
Author: Steve Loughran ste...@apache.org
Authored: Wed Jun 18 16:32:36 2014 -0700
Committer: Steve Loughran ste...@apache.org
Committed: Wed Jun 18 16:48:14 2014 -0700
--
.../core/registry/info/RegisteredEndpoint.java | 43 +---
.../core/registry/info/ServiceInstanceData.java | 2 +
.../providers/AbstractProviderService.java | 2 +-
.../server/services/curator/CuratorUriSpec.java | 2 +-
4 files changed, 32 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/86cabdc4/slider-core/src/main/java/org/apache/slider/core/registry/info/RegisteredEndpoint.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/core/registry/info/RegisteredEndpoint.java
b/slider-core/src/main/java/org/apache/slider/core/registry/info/RegisteredEndpoint.java
index 3dae7fc..dc335c6 100644
---
a/slider-core/src/main/java/org/apache/slider/core/registry/info/RegisteredEndpoint.java
+++
b/slider-core/src/main/java/org/apache/slider/core/registry/info/RegisteredEndpoint.java
@@ -48,7 +48,12 @@ public class RegisteredEndpoint {
/**
* hostname:port pair: {@value}
*/
- public static final String TYPE_ADDRESS = address;
+ public static final String TYPE_INETADDRESS = inetaddress;
+
+ /**
+ * simple path string: {@value}
+ */
+ public static final String TYPE_PATH = path;
// standard protocols
@@ -86,19 +91,31 @@ public class RegisteredEndpoint {
*/
public static final String PROTOCOL_HADOOP_PROTOBUF =
org.apache.hadoop.ipc.Protobuf;
- public String value;
+ /**
+ * The address -format is driven by the type entry
+ */
+ public String address;
+
+ /**
+ * Protocol
+ */
public String protocol = ;
+
public String type = ;
+
+ /**
+ * Human readable type
+ */
public String description = ;
public RegisteredEndpoint() {
}
- public RegisteredEndpoint(String value,
+ public RegisteredEndpoint(String address,
String protocol,
String type,
String description) {
-this.value = value;
+this.address = address;
this.protocol = protocol;
this.type = type;
this.description = description;
@@ -113,7 +130,7 @@ public class RegisteredEndpoint {
public RegisteredEndpoint(URI uri,
String description) {
-this.value = uri.toString();
+this.address = uri.toString();
this.protocol = uri.getScheme();
this.type = TYPE_URL;
this.description = description;
@@ -128,9 +145,9 @@ public class RegisteredEndpoint {
String protocol,
String description) {
-this.value = address.toString();
+this.address = address.toString();
this.protocol = protocol;
-this.type = TYPE_ADDRESS;
+this.type = TYPE_INETADDRESS;
this.description = description;
}
@@ -153,10 +170,10 @@ public class RegisteredEndpoint {
public URL asURL() throws SliderException {
verifyEndpointType(TYPE_URL);
try {
- return new URL(value);
+ return new URL(address);
} catch (MalformedURLException e) {
throw new SliderException(-1, e,
- could not create a URL from %s : %s, value, e.toString());
+ could not create a URL from %s : %s, address, e.toString());
}
}
@@ -165,20 +182,16 @@ public class RegisteredEndpoint {
final StringBuilder sb =
new StringBuilder();
if (TYPE_URL.equals(type)) {
- sb.append(value);
+ sb.append(address);
} else {
sb.append(protocol=').append(protocol).append('\'');
- sb.append( value=').append(value).append('\'');
+ sb.append( address=').append(address).append('\'');
sb.append( type=').append(type).append('\'');
}
sb.append( -- \).append(description).append('');
return sb.toString();
}
- @JsonIgnore
- public boolean isHttpProtocol() {
-return PROTOCOL_HTTP.equals(protocol) || PROTOCOL_HTTPS.equals(protocol);
- }
/**
* Verify that an endpoint is of the desired type
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/86cabdc4/slider-core/src/main/java/org/apache/slider/core/registry/info/ServiceInstanceData.java
