You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by du...@apache.org on 2019/01/15 11:26:48 UTC
[rocketmq] 01/02: Modify flow control config file
This is an automated email from the ASF dual-hosted git repository.
duhengforever pushed a commit to branch snode
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit ac25bccca6f73899878eeccbe90c8067c5f1c70e
Author: duhenglucky <du...@gmail.com>
AuthorDate: Tue Jan 15 13:47:32 2019 +0800
Modify flow control config file
---
.../apache/rocketmq/snode/config/SnodeConfig.java | 20 +++++---------------
.../main/resources/META-INF/service/flowControl.yml | 18 +++++++++---------
.../snode/processor/SendMessageProcessorTest.java | 4 ----
3 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/snode/src/main/java/org/apache/rocketmq/snode/config/SnodeConfig.java b/snode/src/main/java/org/apache/rocketmq/snode/config/SnodeConfig.java
index 6ec34a8..7f06ae7 100644
--- a/snode/src/main/java/org/apache/rocketmq/snode/config/SnodeConfig.java
+++ b/snode/src/main/java/org/apache/rocketmq/snode/config/SnodeConfig.java
@@ -53,7 +53,7 @@ public class SnodeConfig {
private long snodeHeartBeatInterval = 30 * 1000;
- private boolean fetechNameserver = false;
+ private boolean fetechNameServer = false;
private long houseKeepingInterval = 10 * 1000;
@@ -75,9 +75,6 @@ public class SnodeConfig {
private int listenPort = 11911;
- private double snodeQPSLimit = 10000;
-
-
private boolean vipChannelEnabled = Boolean.parseBoolean(System.getProperty(SEND_MESSAGE_WITH_VIP_CHANNEL_PROPERTY, "true"));
public void setSnodeHeartBeatInterval(long snodeHeartBeatInterval) {
@@ -92,12 +89,12 @@ public class SnodeConfig {
this.houseKeepingInterval = houseKeepingInterval;
}
- public boolean isFetechNameserver() {
- return fetechNameserver;
+ public boolean isFetechNameServer() {
+ return fetechNameServer;
}
- public void setFetechNameserver(boolean fetechNameserver) {
- this.fetechNameserver = fetechNameserver;
+ public void setFetechNameServer(boolean fetechNameServer) {
+ this.fetechNameServer = fetechNameServer;
}
public long getSnodeHeartBeatInterval() {
@@ -285,11 +282,4 @@ public class SnodeConfig {
return remotingServerInterceptorPath;
}
- public double getSnodeQPSLimit() {
- return snodeQPSLimit;
- }
-
- public void setSnodeQPSLimit(double snodeQPSLimit) {
- this.snodeQPSLimit = snodeQPSLimit;
- }
}
diff --git a/snode/src/main/resources/META-INF/service/flowControl.yml b/snode/src/main/resources/META-INF/service/flowControl.yml
index f76a906..cf71d2d 100644
--- a/snode/src/main/resources/META-INF/service/flowControl.yml
+++ b/snode/src/main/resources/META-INF/service/flowControl.yml
@@ -1,19 +1,19 @@
snode:
countLimit: # flow control type, only requestCount & requestSize support
- flowControlResourceName: 310
- flowControlGrade: directDeny
- flowControlBehavior: flowControlBehavior
- flowControlResourceCount: 100000.00 #QPS
+ flowControlGrade: 1
+ flowControlBehavior: 1
+ flowControlResourceCount: 500.00 #QPS
- flowControlResourceName: overall
- flowControlGrade: directDeny
- flowControlBehavior: flowControlBehavior
- flowControlResourceCount: 100000.00 #QPS
+ flowControlGrade: 1
+ flowControlBehavior: 1
+ flowControlResourceCount: 10000.00 #QPS
sizeLimit:
- flowControlResourceName: 310
- flowControlGrade: directDeny
- flowControlBehavior: flowControlBehavior
- flowControlResourceCount: 10.00 #MB/S
+ flowControlGrade: 1
+ flowControlBehavior: 1
+ flowControlResourceCount: 5.00 #KB/S
topicLimit:
\ No newline at end of file
diff --git a/snode/src/test/java/org/apache/rocketmq/snode/processor/SendMessageProcessorTest.java b/snode/src/test/java/org/apache/rocketmq/snode/processor/SendMessageProcessorTest.java
index 82b4616..448abc9 100644
--- a/snode/src/test/java/org/apache/rocketmq/snode/processor/SendMessageProcessorTest.java
+++ b/snode/src/test/java/org/apache/rocketmq/snode/processor/SendMessageProcessorTest.java
@@ -104,10 +104,6 @@ public class SendMessageProcessorTest {
return request;
}
- private void assertSendMessageResult(int responseCode) throws RemotingCommandException {
-
- }
-
RemotingCommand createSendMessageResponse(int responseCode) {
return RemotingCommand.createResponseCommand(ResponseCode.SUCCESS, null);
}