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 2015/05/28 22:11:00 UTC
[1/3] storm git commit: STORM-835 Netty Client hold batch object
until io operation complete
Repository: storm
Updated Branches:
refs/heads/master 59895a71f -> 93544b207
STORM-835 Netty Client hold batch object until io operation complete
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f3d5aca8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f3d5aca8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f3d5aca8
Branch: refs/heads/master
Commit: f3d5aca8c6eaf3057abe43dccea42b509de70987
Parents: 106af61
Author: zhanghailei <zh...@youku.com>
Authored: Mon May 25 10:00:12 2015 +0800
Committer: zhanghailei <zh...@youku.com>
Committed: Mon May 25 10:00:12 2015 +0800
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/messaging/netty/Client.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f3d5aca8/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
index f332bb3..ac3f3f2 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
@@ -461,7 +461,7 @@ public class Client extends ConnectionWithStatus implements IStatefulObject {
*
* If the write operation fails, then we will close the channel and trigger a reconnect.
*/
- private synchronized void flushMessages(Channel channel, final MessageBatch batch) {
+ private synchronized void flushMessages(Channel channel, MessageBatch batch) {
if (!containsMessages(batch)) {
return;
}
@@ -476,7 +476,7 @@ public class Client extends ConnectionWithStatus implements IStatefulObject {
pendingMessages.getAndAdd(0 - numMessages);
if (future.isSuccess()) {
LOG.debug("sent {} messages to {}", numMessages, dstAddressPrefixedName);
- messagesSent.getAndAdd(batch.size());
+ messagesSent.getAndAdd(numMessages);
}
else {
LOG.error("failed to send {} messages to {}: {}", numMessages, dstAddressPrefixedName,
[2/3] storm git commit: Merge branch 'storm-netty-client-improve' of
https://github.com/Hailei/storm-1 into STORM-835
Posted by bo...@apache.org.
Merge branch 'storm-netty-client-improve' of https://github.com/Hailei/storm-1 into STORM-835
STORM-835: Netty Client hold batch object until io operation complete
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/dc3f28f2
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dc3f28f2
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dc3f28f2
Branch: refs/heads/master
Commit: dc3f28f2fcb5a1ead6976e373fefc026e82df63d
Parents: 59895a7 f3d5aca
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu May 28 15:00:49 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu May 28 15:00:49 2015 -0500
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/messaging/netty/Client.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-835 to Changelog and README
Posted by bo...@apache.org.
Added STORM-835 to Changelog and README
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/93544b20
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/93544b20
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/93544b20
Branch: refs/heads/master
Commit: 93544b20799d05379d943f47eca8f22c583fe5dc
Parents: dc3f28f
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu May 28 15:10:10 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu May 28 15:10:10 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
README.markdown | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/93544b20/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9933057..af3dd5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-835: Netty Client hold batch object until io operation complete
* STORM-790: Log "task is null" instead of let worker died when task is null in transfer-fn
* STORM-596: remove config topology.receiver.buffer.size
* STORM-808: allow null to be parsed as null
http://git-wip-us.apache.org/repos/asf/storm/blob/93544b20/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 9a6ef2e..1fd1f01 100644
--- a/README.markdown
+++ b/README.markdown
@@ -198,6 +198,7 @@ under the License.
* Mark Davis ([@markdav](https://github.com/markdav))
* Zhuo Liu ([@zhuoliu](https://github.com/zhuoliu))
* jangie ([@jangie](https://github.com/jangie))
+* Hailei Zhang ([@Hailei](https://github.com/Hailei))
## Acknowledgements