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/20 16:57:19 UTC
[1/3] incubator-slider git commit: SLIDER-659 NPE in slider
am-suicide if you don't provide a message
Repository: incubator-slider
Updated Branches:
refs/heads/develop 81cd546bd -> a0b00f0d0
SLIDER-659 NPE in slider am-suicide if you don't provide a message
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6490bd7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6490bd7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6490bd7c
Branch: refs/heads/develop
Commit: 6490bd7cf50d132e5dd7ae7ea0ec6ad85872c0aa
Parents: 81cd546
Author: Steve Loughran <st...@apache.org>
Authored: Wed Nov 19 16:32:49 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Nov 19 16:32:49 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/slider/client/SliderClusterOperations.java | 4 +++-
.../org/apache/slider/common/params/ActionAMSuicideArgs.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6490bd7c/slider-core/src/main/java/org/apache/slider/client/SliderClusterOperations.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClusterOperations.java b/slider-core/src/main/java/org/apache/slider/client/SliderClusterOperations.java
index 30f17b6..fe44f22 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClusterOperations.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClusterOperations.java
@@ -312,7 +312,9 @@ public class SliderClusterOperations {
IOException {
Messages.AMSuicideRequestProto.Builder builder =
Messages.AMSuicideRequestProto.newBuilder();
- builder.setText(text);
+ if (text != null) {
+ builder.setText(text);
+ }
builder.setSignal(signal);
builder.setDelay(delay);
Messages.AMSuicideRequestProto req =
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6490bd7c/slider-core/src/main/java/org/apache/slider/common/params/ActionAMSuicideArgs.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ActionAMSuicideArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ActionAMSuicideArgs.java
index 5d889e1..d6cabf5 100644
--- a/slider-core/src/main/java/org/apache/slider/common/params/ActionAMSuicideArgs.java
+++ b/slider-core/src/main/java/org/apache/slider/common/params/ActionAMSuicideArgs.java
@@ -33,7 +33,7 @@ public class ActionAMSuicideArgs extends AbstractActionArgs {
@Parameter(names = {ARG_MESSAGE},
description = "reason for the action")
- public String message;
+ public String message = "";
@Parameter(names = {ARG_EXITCODE},
description = "exit code")
[2/3] incubator-slider git commit: SLIDER-659 NPE in slider
am-suicide if you don't provide a message: make sure AM handles null payload
Posted by st...@apache.org.
SLIDER-659 NPE in slider am-suicide if you don't provide a message: make sure AM handles null payload
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/976c889b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/976c889b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/976c889b
Branch: refs/heads/develop
Commit: 976c889ba04d23222d7f04ab4f50859a4edf122d
Parents: 6490bd7
Author: Steve Loughran <st...@apache.org>
Authored: Wed Nov 19 16:34:35 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Nov 19 16:34:35 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/slider/server/appmaster/SliderAppMaster.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/976c889b/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 bab359c..e26bc3f 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
@@ -1840,6 +1840,9 @@ the registry with/without the new record format
throws IOException, YarnException {
int signal = request.getSignal();
String text = request.getText();
+ if (text == null) {
+ text = "";
+ }
int delay = request.getDelay();
log.info("AM Suicide with signal {}, message {} delay = {}", signal, text, delay);
ActionHalt action = new ActionHalt(signal, text, delay,
[3/3] incubator-slider git commit: Merge branch
'feature/SLIDER-659-am-suicide-npe' into develop
Posted by st...@apache.org.
Merge branch 'feature/SLIDER-659-am-suicide-npe' 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/a0b00f0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a0b00f0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a0b00f0d
Branch: refs/heads/develop
Commit: a0b00f0d0a75c95f5de580865e817e392f4804ef
Parents: 81cd546 976c889
Author: Steve Loughran <st...@apache.org>
Authored: Wed Nov 19 16:34:52 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Nov 19 16:34:52 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/slider/client/SliderClusterOperations.java | 4 +++-
.../org/apache/slider/common/params/ActionAMSuicideArgs.java | 2 +-
.../java/org/apache/slider/server/appmaster/SliderAppMaster.java | 3 +++
3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------