From f4a9162dec1ab78a4cfa44e7c647c37192433fd6 Mon Sep 17 00:00:00 2001 From: von gosling Date: Mon, 15 Oct 2018 22:40:31 +0800 Subject: [PATCH 01/13] prepare to separate production-ready projects from the external projects --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fbbd0d718d6..a5f47e597ce 100644 --- a/README.md +++ b/README.md @@ -37,12 +37,12 @@ It offers a variety of features: ---------- ## Apache RocketMQ Community -* [RocketMQ Community Projects](https://github.com/apache/rocketmq-externals) +* [RocketMQ Community Incubator Projects](https://github.com/apache/rocketmq-externals) ---------- ## Contributing -We always welcome new contributions, whether for trivial cleanups, big new features or other material rewards, more details see [here](http://rocketmq.apache.org/docs/how-to-contribute/) +We always welcome new contributions, whether for trivial cleanups, big new features or other material rewards, more details see [here](http://rocketmq.apache.org/docs/how-to-contribute/). ---------- ## License From d434a3afb39c0c0c20fcd663368b8d4a90c3fcd3 Mon Sep 17 00:00:00 2001 From: von gosling Date: Fri, 2 Nov 2018 16:58:23 +0800 Subject: [PATCH 02/13] Update fastjson to the latest stable version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1f71cd4b7f6..8f6b7d2acde 100644 --- a/pom.xml +++ b/pom.xml @@ -563,7 +563,7 @@ com.alibaba fastjson - 1.2.29 + 1.2.51 org.javassist From 91c2aabb01e08febb7664031c0081a312b01add1 Mon Sep 17 00:00:00 2001 From: von gosling Date: Wed, 5 Dec 2018 13:04:12 +0800 Subject: [PATCH 03/13] Clean code, don't list the default config in JVM --- distribution/bin/runbroker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/bin/runbroker.sh b/distribution/bin/runbroker.sh index 3bd00bb3014..df962b4a275 100644 --- a/distribution/bin/runbroker.sh +++ b/distribution/bin/runbroker.sh @@ -37,7 +37,7 @@ export CLASSPATH=.:${BASE_DIR}/conf:${CLASSPATH} # JVM Configuration #=========================================================================================== JAVA_OPT="${JAVA_OPT} -server -Xms8g -Xmx8g -Xmn4g" -JAVA_OPT="${JAVA_OPT} -XX:+UseG1GC -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=25 -XX:InitiatingHeapOccupancyPercent=30 -XX:SoftRefLRUPolicyMSPerMB=0 -XX:SurvivorRatio=8" +JAVA_OPT="${JAVA_OPT} -XX:+UseG1GC -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=25 -XX:InitiatingHeapOccupancyPercent=30 -XX:SoftRefLRUPolicyMSPerMB=0" JAVA_OPT="${JAVA_OPT} -verbose:gc -Xloggc:/dev/shm/mq_gc_%p.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintAdaptiveSizePolicy" JAVA_OPT="${JAVA_OPT} -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=30m" JAVA_OPT="${JAVA_OPT} -XX:-OmitStackTraceInFastThrow" From 1ee7162fd9d315631acac6426a33b0301ecc4640 Mon Sep 17 00:00:00 2001 From: von gosling Date: Thu, 6 Dec 2018 16:23:31 +0800 Subject: [PATCH 04/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a5f47e597ce..7518f06a8f9 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) ---------- From b32668b1074f17e7e62707b808d2c0b008f27cfe Mon Sep 17 00:00:00 2001 From: "maowei.ymw" Date: Thu, 6 Dec 2018 12:50:16 +0800 Subject: [PATCH 05/13] update the year info in NOTICE --- NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index c218b26089b..703c28b27c5 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 From d4d02b5e017ebf8c7d3405516264645280cf57fa Mon Sep 17 00:00:00 2001 From: "maowei.ymw" Date: Thu, 13 Dec 2018 17:07:30 +0800 Subject: [PATCH 06/13] Release semaphore when timeout --- .../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 8dccebc0457..9b026403dd4 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 void invokeAsyncImpl(final Channel channel, final RemotingCommand request 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); From d073c6913f53f273377e0ac30a11087fe08c5bd1 Mon Sep 17 00:00:00 2001 From: von gosling Date: Thu, 6 Dec 2018 16:23:31 +0800 Subject: [PATCH 07/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a5f47e597ce..7518f06a8f9 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) ---------- From 6bb6cffed75ef12f460aebda80960286cc85a6dd Mon Sep 17 00:00:00 2001 From: "maowei.ymw" Date: Thu, 6 Dec 2018 12:50:16 +0800 Subject: [PATCH 08/13] update the year info in NOTICE --- NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index c218b26089b..703c28b27c5 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 From 0a31a7b27186ddb9d8cb453aef87e4872554f3c6 Mon Sep 17 00:00:00 2001 From: "maowei.ymw" Date: Thu, 13 Dec 2018 17:07:30 +0800 Subject: [PATCH 09/13] Release semaphore when timeout --- .../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 8dccebc0457..9b026403dd4 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 void invokeAsyncImpl(final Channel channel, final RemotingCommand request 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); From b06074a559b33b0cabe33fc0f0cc4991c8da7848 Mon Sep 17 00:00:00 2001 From: von gosling Date: Fri, 14 Dec 2018 20:35:21 +0800 Subject: [PATCH 10/13] Revert "Release semaphore when timeout" This reverts commit d4d02b5e017ebf8c7d3405516264645280cf57fa. --- .../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 9b026403dd4..8dccebc0457 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 void invokeAsyncImpl(final Channel channel, final RemotingCommand request 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); From 9fe30e2e27d34e0df0c575e0fcb7c323f17210cc Mon Sep 17 00:00:00 2001 From: "maowei.ymw" Date: Tue, 18 Dec 2018 16:25:25 +0800 Subject: [PATCH 11/13] FixSemaphoreProblem --- .../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 8dccebc0457..9b026403dd4 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 void invokeAsyncImpl(final Channel channel, final RemotingCommand request 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); From d45fda46515ab84a8150f9bdd1b0b5987374ee33 Mon Sep 17 00:00:00 2001 From: dongeforever Date: Thu, 27 Dec 2018 14:41:19 +0800 Subject: [PATCH 12/13] Add docs --- docs/cn/index.md | 0 docs/en/index.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/cn/index.md create mode 100644 docs/en/index.md diff --git a/docs/cn/index.md b/docs/cn/index.md new file mode 100644 index 00000000000..e69de29bb2d diff --git a/docs/en/index.md b/docs/en/index.md new file mode 100644 index 00000000000..e69de29bb2d From e5d2807f38195589e9575277bb92f2b6a8817bb7 Mon Sep 17 00:00:00 2001 From: chengxiangwang Date: Thu, 27 Dec 2018 18:37:52 +0800 Subject: [PATCH 13/13] exclude docs folder when running apache-rat-plugin --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 0a8fef87584..fbb7effc094 100644 --- a/pom.xml +++ b/pom.xml @@ -259,6 +259,7 @@ src/test/resources/META-INF/service/* */target/** */*.iml + docs/**