You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by vo...@apache.org on 2018/12/14 12:36:16 UTC
[rocketmq] branch develop updated (7fd657f -> b06074a)
This is an automated email from the ASF dual-hosted git repository.
vongosling pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
from 7fd657f Format the precision output TPS
new d073c69 Update README.md
new 6bb6cff update the year info in NOTICE
new 0a31a7b Release semaphore when timeout
new b06074a Revert "Release semaphore when timeout"
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
NOTICE | 2 +-
README.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[rocketmq] 01/04: Update README.md
Posted by vo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vongosling pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit d073c6913f53f273377e0ac30a11087fe08c5bd1
Author: von gosling <vo...@apache.org>
AuthorDate: Thu Dec 6 16:23:31 2018 +0800
Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index a5f47e5..7518f06 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ It offers a variety of features:
----------
## Apache RocketMQ Community
-* [RocketMQ Community Incubator Projects](https://github.com/apache/rocketmq-externals)
+* [RocketMQ Community Projects](https://github.com/apache/rocketmq-externals)
----------
[rocketmq] 04/04: Revert "Release semaphore when timeout"
Posted by vo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vongosling pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit b06074a559b33b0cabe33fc0f0cc4991c8da7848
Author: von gosling <vo...@apache.org>
AuthorDate: Fri Dec 14 20:35:21 2018 +0800
Revert "Release semaphore when timeout"
This reverts commit d4d02b5e017ebf8c7d3405516264645280cf57fa.
---
.../java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
index 9b02640..8dccebc 100644
--- a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
+++ b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
@@ -410,8 +410,7 @@ public abstract class NettyRemotingAbstract {
final SemaphoreReleaseOnlyOnce once = new SemaphoreReleaseOnlyOnce(this.semaphoreAsync);
long costTime = System.currentTimeMillis() - beginStartTime;
if (timeoutMillis < costTime) {
- once.release();
- throw new RemotingTimeoutException("invokeAsyncImpl call timeout");
+ throw new RemotingTooMuchRequestException("invokeAsyncImpl call timeout");
}
final ResponseFuture responseFuture = new ResponseFuture(channel, opaque, timeoutMillis - costTime, invokeCallback, once);
[rocketmq] 03/04: Release semaphore when timeout
Posted by vo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vongosling pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 0a31a7b27186ddb9d8cb453aef87e4872554f3c6
Author: maowei.ymw <ma...@alibaba-inc.com>
AuthorDate: Thu Dec 13 17:07:30 2018 +0800
Release semaphore when timeout
---
.../java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
index 8dccebc..9b02640 100644
--- a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
+++ b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
@@ -410,7 +410,8 @@ public abstract class NettyRemotingAbstract {
final SemaphoreReleaseOnlyOnce once = new SemaphoreReleaseOnlyOnce(this.semaphoreAsync);
long costTime = System.currentTimeMillis() - beginStartTime;
if (timeoutMillis < costTime) {
- throw new RemotingTooMuchRequestException("invokeAsyncImpl call timeout");
+ once.release();
+ throw new RemotingTimeoutException("invokeAsyncImpl call timeout");
}
final ResponseFuture responseFuture = new ResponseFuture(channel, opaque, timeoutMillis - costTime, invokeCallback, once);
[rocketmq] 02/04: update the year info in NOTICE
Posted by vo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vongosling pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 6bb6cffed75ef12f460aebda80960286cc85a6dd
Author: maowei.ymw <ma...@alibaba-inc.com>
AuthorDate: Thu Dec 6 12:50:16 2018 +0800
update the year info in NOTICE
---
NOTICE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/NOTICE b/NOTICE
index c218b26..703c28b 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache RocketMQ
-Copyright 2016-2017 The Apache Software Foundation
+Copyright 2016-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file