You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/03/30 15:41:01 UTC
[1/2] storm git commit: [STORM-3012] Fix the issue that nimbus will
crash if pacemaker is restarted
Repository: storm
Updated Branches:
refs/heads/master d42bd2b31 -> 4bca4ad8d
[STORM-3012] Fix the issue that nimbus will crash if pacemaker is restarted
by returning results from resending HBMessage
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7814f01f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7814f01f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7814f01f
Branch: refs/heads/master
Commit: 7814f01f0697743c8168205aa2c800705844b4d4
Parents: adf4efb
Author: Ethan Li <et...@gmail.com>
Authored: Tue Mar 27 10:41:45 2018 -0500
Committer: Ethan Li <et...@gmail.com>
Committed: Tue Mar 27 10:41:45 2018 -0500
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/pacemaker/PacemakerClient.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7814f01f/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java
index 9e3d207..e389046 100644
--- a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java
+++ b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java
@@ -192,9 +192,11 @@ public class PacemakerClient implements ISaslClient {
}
HBMessage ret = messages[next];
- if(ret == null) {
+ if (ret == null) {
// This can happen if we lost the connection and subsequently reconnected or timed out.
- send(m);
+ LOG.warn("Got null response. This can happen if we lost the connection and subsequently reconnected or timed out. "
+ + "Resending message...");
+ ret = send(m);
}
messages[next] = null;
LOG.debug("Got Response: {}", ret);
[2/2] storm git commit: Merge branch 'STORM-3012' of
https://github.com/Ethanlm/storm into STORM-3012
Posted by bo...@apache.org.
Merge branch 'STORM-3012' of https://github.com/Ethanlm/storm into STORM-3012
STORM-3012: Fix the issue that nimbus will crash if pacemaker is restarted
This closes #2608
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4bca4ad8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4bca4ad8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4bca4ad8
Branch: refs/heads/master
Commit: 4bca4ad8d02ab05aab729d56b6393261a59c0601
Parents: d42bd2b 7814f01
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Fri Mar 30 10:11:05 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Fri Mar 30 10:11:05 2018 -0500
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/pacemaker/PacemakerClient.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------