diff --git a/distribution/conf/flowControl.yml
b/distribution/conf/flowControl.yml
new file mode 100644
index 000000000..cf71d2ddc
--- /dev/null
+++ b/distribution/conf/flowControl.yml
@@ -0,0 +1,19 @@
+snode:
+ countLimit: # flow control type, only requestCount & requestSize support
+ - flowControlResourceName: 310
+ flowControlGrade: 1
+ flowControlBehavior: 1
+ flowControlResourceCount: 500.00 #QPS
+
+ - flowControlResourceName: overall
+ flowControlGrade: 1
+ flowControlBehavior: 1
+ flowControlResourceCount: 10000.00 #QPS
+
+ sizeLimit:
+ - flowControlResourceName: 310
+ flowControlGrade: 1
+ flowControlBehavior: 1
+ flowControlResourceCount: 5.00 #KB/S
+
+ topicLimit:
\ No newline at end of file
diff --git
a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyChannelHandlerContextImpl.java
b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyChannelHandlerContextImpl.java
index f1746fab1..dde3419d4 100644
---
a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyChannelHandlerContextImpl.java
+++
b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyChannelHandlerContextImpl.java
@@ -23,9 +23,8 @@
import org.apache.rocketmq.remoting.protocol.RemotingCommand;
public class NettyChannelHandlerContextImpl implements RemotingChannel {
- public static final String ROCKETMQ_REMOTING = "RocketmqRemoting";
- private static final InternalLogger log =
InternalLoggerFactory.getLogger(ROCKETMQ_REMOTING);
+ private static final InternalLogger log =
InternalLoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING);
private final ChannelHandlerContext channelHandlerContext;
diff --git
a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyChannelImpl.java
b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyChannelImpl.java
index 90f2b31d5..cc76e8ebc 100644
---
a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyChannelImpl.java
+++
b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyChannelImpl.java
@@ -28,9 +28,7 @@
import org.apache.rocketmq.remoting.protocol.RemotingCommand;
public class NettyChannelImpl implements RemotingChannel {
- public static final String ROCKETMQ_REMOTING = "RocketmqRemoting";
-
- private static final InternalLogger log =
InternalLoggerFactory.getLogger(ROCKETMQ_REMOTING);
+ private static final InternalLogger log =
InternalLoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING);
private final Channel channel;
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 f2ff24bbf..3f7917058 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
@@ -176,7 +176,7 @@ public void processMessageReceived(ChannelHandlerContext
ctx, RemotingCommand ms
processRequestCommand(remotingChannel, cmd);
break;
case RESPONSE_COMMAND:
- processResponseCommand(ctx, cmd);
+ processResponseCommand(remotingChannel, cmd);
break;
default:
break;
@@ -279,10 +279,13 @@ public void run() {
/**
* Process response from remote peer to the previous issued requests.
*
- * @param ctx channel handler context.
+ * @param remotingChannel channel handler context.
* @param cmd response command instance.
*/
- public void processResponseCommand(ChannelHandlerContext ctx,
RemotingCommand cmd) {
+ public void processResponseCommand(final RemotingChannel remotingChannel,
RemotingCommand cmd) {
+ NettyChannelHandlerContextImpl nettyChannelHandlerContext =
(NettyChannelHandlerContextImpl) remotingChannel;
+ final ChannelHandlerContext ctx =
nettyChannelHandlerContext.getChannelHandlerContext();
+
final int opaque = cmd.getOpaque();
final ResponseFuture responseFuture = responseTable.get(opaque);
if (responseFuture != null) {
diff --git
a/remoting/src/main/java/org/apache/rocketmq/remoting/util/ServiceProvider.java
b/remoting/src/main/java/org/apache/rocketmq/remoting/util/ServiceProvider.java
index cef31f244..472a8de2d 100644
---
a/remoting/src/main/java/org/apache/rocketmq/remoting/util/ServiceProvider.java
+++
b/remoting/src/main/java/org/apache/rocketmq/remoting/util/ServiceProvider.java
@@ -32,14 +32,6 @@
*/
private static ClassLoader thisClassLoader;
- /**
- * JDK1.3+ <a href=
"http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#Service%20Provider"; >
'Service Provider'
- * specification</a>.
- */
- public static final String TRANSACTION_SERVICE_ID =
"META-INF/service/org.apache.rocketmq.broker.transaction.TransactionalMessageService";
-
- public static final String TRANSACTION_LISTENER_ID =
"META-INF/service/org.apache.rocketmq.broker.transaction.AbstractTransactionalMessageCheckListener";
-
static {
thisClassLoader = getClassLoader(ServiceProvider.class);
}
With regards,
Apache Git Services
