You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/07/31 02:16:36 UTC
[1/3] storm git commit: PacemakerClient code improvement
Repository: storm
Updated Branches:
refs/heads/master 29764bd2b -> 393e5c436
PacemakerClient code improvement
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1a6ab72c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1a6ab72c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1a6ab72c
Branch: refs/heads/master
Commit: 1a6ab72cb61493a3fac5be5efe3fb2eec4b0f9eb
Parents: 1622f19
Author: Ethan Li <et...@gmail.com>
Authored: Sun Jul 23 22:27:34 2017 -0500
Committer: Ethan Li <et...@gmail.com>
Committed: Sun Jul 23 22:32:19 2017 -0500
----------------------------------------------------------------------
.../apache/storm/pacemaker/PacemakerClient.java | 23 ++++++++++++++------
1 file changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1a6ab72c/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 c43bd16..bb42d21 100644
--- a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java
+++ b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java
@@ -48,6 +48,7 @@ public class PacemakerClient implements ISaslClient {
private String client_name;
private String secret;
private AtomicBoolean ready;
+ private AtomicBoolean shutdown;
private final ClientBootstrap bootstrap;
private AtomicReference<Channel> channelRef;
private InetSocketAddress remote_addr;
@@ -103,6 +104,7 @@ public class PacemakerClient implements ISaslClient {
}
ready = new AtomicBoolean(false);
+ shutdown = new AtomicBoolean(false);
channelRef = new AtomicReference<Channel>(null);
setupMessaging();
@@ -176,11 +178,15 @@ public class PacemakerClient implements ISaslClient {
messages[next] = m;
LOG.debug("Put message in slot: {}", Integer.toString(next));
do {
- waitUntilReady();
- Channel channel = channelRef.get();
- if(channel != null) {
- channel.write(m);
- m.wait(1000);
+ try {
+ waitUntilReady();
+ Channel channel = channelRef.get();
+ if (channel != null) {
+ channel.write(m);
+ m.wait(1000);
+ }
+ } catch (Exception exp) {
+ LOG.error("error attempting to write to a channel {}", exp);
}
} while (messages[next] == m);
}
@@ -256,11 +262,14 @@ public class PacemakerClient implements ISaslClient {
public synchronized void doReconnect() {
close_channel();
- bootstrap.connect(remote_addr);
+ if (!shutdown.get()) {
+ bootstrap.connect(remote_addr);
+ }
}
public void shutdown() {
- bootstrap.shutdown();
+ shutdown.set(true);
+ bootstrap.releaseExternalResources();
}
private synchronized void close_channel() {
[2/3] storm git commit: Merge branch 'pacemaker-code-improvement' of
https://github.com/Ethanlm/storm into STORM-2653-merge
Posted by ka...@apache.org.
Merge branch 'pacemaker-code-improvement' of https://github.com/Ethanlm/storm into STORM-2653-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f36cfb0d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f36cfb0d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f36cfb0d
Branch: refs/heads/master
Commit: f36cfb0dd29a7bb6687232cfa4931e1c285c1cc0
Parents: 29764bd 1a6ab72
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Jul 31 11:15:35 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Jul 31 11:15:35 2017 +0900
----------------------------------------------------------------------
.../apache/storm/pacemaker/PacemakerClient.java | 23 ++++++++++++++------
1 file changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[3/3] storm git commit: STORM-2653: CHANGELOG
Posted by ka...@apache.org.
STORM-2653: CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/393e5c43
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/393e5c43
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/393e5c43
Branch: refs/heads/master
Commit: 393e5c4363468b2dba9e7421d2e6dde5afd9b094
Parents: f36cfb0
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Jul 31 11:16:24 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Jul 31 11:16:24 2017 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/393e5c43/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f701662..44e51d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 2.0.0
+ * STORM-2653: PaceMaker code improvement
* STORM-2497: Let Supervisor enforce memory and add in support for shared memory regions
* STORM-2626: Provided a template for drpc-auth-acl.yaml
* STORM-1280: port backtype.storm.daemon.logviewer to java