You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ji...@apache.org on 2022/03/12 13:47:33 UTC
[rocketmq] branch 5.0.0-beta created (now 176e0d5)
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a change to branch 5.0.0-beta
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
at 176e0d5 Modify MQVersion to V5_0_0_BETA_SNAPSHOT
This branch includes the following new commits:
new 78dde88 Prepare for next development iteration
new 3aa31a6 Merge remote-tracking branch 'apache/develop' into 5.0.0-alpha
new 176e0d5 Modify MQVersion to V5_0_0_BETA_SNAPSHOT
The 3 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.
[rocketmq] 02/03: Merge remote-tracking branch 'apache/develop' into 5.0.0-alpha
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch 5.0.0-beta
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 3aa31a6a36d70be025a4a84c4fdd8084708b35f5
Merge: 78dde88 40d9505
Author: RongtongJin <ji...@mails.ucas.ac.cn>
AuthorDate: Sat Mar 12 21:15:45 2022 +0800
Merge remote-tracking branch 'apache/develop' into 5.0.0-alpha
# Conflicts:
# acl/pom.xml
# broker/pom.xml
# client/pom.xml
# common/pom.xml
# common/src/main/java/org/apache/rocketmq/common/MQVersion.java
# distribution/pom.xml
# example/pom.xml
# filter/pom.xml
# logging/pom.xml
# namesrv/pom.xml
# openmessaging/pom.xml
# pom.xml
# remoting/pom.xml
# srvutil/pom.xml
# store/pom.xml
# store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
# test/pom.xml
# tools/pom.xml
.github/ISSUE_TEMPLATE/issue_template.md | 23 +-
README.md | 2 +
.../rocketmq/acl/plain/PlainAccessValidator.java | 9 -
.../rocketmq/acl/plain/PlainPermissionManager.java | 140 ++++----
.../acl/plain/PlainAccessControlFlowTest.java | 396 +++++++++++++++++++++
.../acl/plain/PlainAccessValidatorTest.java | 60 +++-
.../conf/acl/plain_acl.yml | 11 +-
.../both_acl_file_folder_conf/conf}/plain_acl.yml | 25 +-
.../empty_acl_folder_conf/conf}/plain_acl.yml | 25 +-
.../only_acl_folder_conf}/conf/acl/plain_acl.yml | 11 +-
.../broker/offset/LmqConsumerOffsetManager.java | 4 +
.../offset/LmqConsumerOffsetManagerTest.java | 27 ++
.../rocketmq/client/impl/MQClientAPIImpl.java | 7 +-
.../ConsumeMessageConcurrentlyService.java | 2 +-
.../client/common/ThreadLocalIndexTest.java | 2 +-
.../java/org/apache/rocketmq/common/MQVersion.java | 6 -
.../rocketmq/common/topic/TopicValidator.java | 5 +
distribution/conf/{acl => }/plain_acl.yml | 0
docs/cn/Deployment.md | 12 +-
docs/cn/best_practice.md | 2 +-
.../namespace/PushConsumerWithNamespace.java | 2 +-
.../apache/rocketmq/namesrv/NamesrvStartup.java | 9 +-
.../rocketmq/namesrv/NamesrvStartupTest.java | 66 ++++
.../rocketmq/remoting/protocol/LanguageCode.java | 3 +-
.../remoting/protocol/LanguageCodeTest.java | 26 +-
.../apache/rocketmq/store/StoreStatsService.java | 74 +++-
.../rocketmq/store/logfile/DefaultMappedFile.java | 20 +-
.../rocketmq/store/StoreStatsServiceTest.java | 13 +
.../org/apache/rocketmq/store/StoreTestUtil.java | 15 +
.../store/dledger/DLedgerCommitlogTest.java | 4 +
.../rocketmq/tools/admin/DefaultMQAdminExt.java | 7 +
.../tools/admin/DefaultMQAdminExtImpl.java | 15 +
.../apache/rocketmq/tools/admin/MQAdminExt.java | 4 +
.../connection/ConsumerConnectionSubCommand.java | 8 +-
.../command/consumer/ConsumerStatusSubCommand.java | 8 +-
.../tools/admin/DefaultMQAdminExtTest.java | 4 +
36 files changed, 856 insertions(+), 191 deletions(-)
diff --cc client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
index d7f1652,e7e805d..09599d2
--- a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
+++ b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
@@@ -272,37 -247,8 +272,36 @@@ public class MQClientAPIImpl
this.remotingClient.shutdown();
}
+ public Set<MessageQueueAssignment> queryAssignment(final String addr, final String topic,
+ final String consumerGroup, final String clientId, final String strategyName,
+ final MessageModel messageModel, final long timeoutMillis)
+ throws RemotingException, MQBrokerException, InterruptedException {
+ QueryAssignmentRequestBody requestBody = new QueryAssignmentRequestBody();
+ requestBody.setTopic(topic);
+ requestBody.setConsumerGroup(consumerGroup);
+ requestBody.setClientId(clientId);
+ requestBody.setMessageModel(messageModel);
+ requestBody.setStrategyName(strategyName);
+
+ RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.QUERY_ASSIGNMENT, null);
+ request.setBody(requestBody.encode());
+
+ RemotingCommand response = this.remotingClient.invokeSync(MixAll.brokerVIPChannel(this.clientConfig.isVipChannelEnabled(), addr),
+ request, timeoutMillis);
+ switch (response.getCode()) {
+ case ResponseCode.SUCCESS: {
+ QueryAssignmentResponseBody queryAssignmentResponseBody = QueryAssignmentResponseBody.decode(response.getBody(), QueryAssignmentResponseBody.class);
+ return queryAssignmentResponseBody.getMessageQueueAssignments();
+ }
+ default:
+ break;
+ }
+
+ throw new MQBrokerException(response.getCode(), response.getRemark());
+ }
+
public void createSubscriptionGroup(final String addr, final SubscriptionGroupConfig config,
- final long timeoutMillis)
- throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ final long timeoutMillis) throws RemotingException, InterruptedException, MQClientException {
RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.UPDATE_AND_CREATE_SUBSCRIPTIONGROUP, null);
byte[] body = RemotingSerializable.encode(config);
@@@ -672,11 -617,11 +671,11 @@@
String retryBrokerName = brokerName;//by default, it will send to the same broker
if (topicPublishInfo != null) { //select one message queue accordingly, in order to determine which broker to send
MessageQueue mqChosen = producer.selectOneMessageQueue(topicPublishInfo, brokerName);
- retryBrokerName = mqChosen.getBrokerName();
+ retryBrokerName = instance.getBrokerNameFromMessageQueue(mqChosen);
}
String addr = instance.findBrokerAddressInPublish(retryBrokerName);
- log.warn(String.format("async send msg by retry {} times. topic={}, brokerAddr={}, brokerName={}", tmp, msg.getTopic(), addr,
- retryBrokerName), e);
+ log.warn("async send msg by retry {} times. topic={}, brokerAddr={}, brokerName={}", tmp, msg.getTopic(), addr,
+ retryBrokerName, e);
try {
request.setOpaque(RemotingCommand.createNewRequestId());
sendMessageAsync(addr, retryBrokerName, msg, timeoutMillis, request, sendCallback, topicPublishInfo, instance,
diff --cc store/src/main/java/org/apache/rocketmq/store/logfile/DefaultMappedFile.java
index a8ea1c6,b46e7ca..4d4830b
--- a/store/src/main/java/org/apache/rocketmq/store/logfile/DefaultMappedFile.java
+++ b/store/src/main/java/org/apache/rocketmq/store/logfile/DefaultMappedFile.java
@@@ -36,15 -36,10 +36,16 @@@ import org.apache.rocketmq.common.const
import org.apache.rocketmq.logging.InternalLogger;
import org.apache.rocketmq.logging.InternalLoggerFactory;
import org.apache.rocketmq.common.message.MessageExt;
-import org.apache.rocketmq.common.message.MessageExtBatch;
-import org.apache.rocketmq.store.CommitLog.PutMessageContext;
+import org.apache.rocketmq.store.AppendMessageCallback;
+import org.apache.rocketmq.store.AppendMessageResult;
+import org.apache.rocketmq.store.AppendMessageStatus;
+import org.apache.rocketmq.store.MessageExtBatch;
+import org.apache.rocketmq.store.MessageExtBrokerInner;
+import org.apache.rocketmq.store.PutMessageContext;
+import org.apache.rocketmq.store.SelectMappedBufferResult;
+import org.apache.rocketmq.store.TransientStorePool;
import org.apache.rocketmq.store.config.FlushDiskType;
+ import org.apache.rocketmq.store.config.MessageStoreConfig;
import org.apache.rocketmq.store.util.LibC;
import sun.nio.ch.DirectBuffer;
diff --cc store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
index 1c0e54c,0e3e01d..18b9eac
--- a/store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
@@@ -40,9 -39,8 +40,11 @@@ import org.apache.rocketmq.store.PutMes
import org.junit.Assert;
import org.junit.Test;
+ import static org.apache.rocketmq.store.StoreTestUtil.releaseMmapFilesOnWindows;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.awaitility.Awaitility.await;
+
public class DLedgerCommitlogTest extends MessageStoreTestBase {
[rocketmq] 01/03: Prepare for next development iteration
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch 5.0.0-beta
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 78dde88cf9a1c55c46827673a2d04475d084e9bc
Author: RongtongJin <ji...@mails.ucas.ac.cn>
AuthorDate: Sat Mar 12 21:13:24 2022 +0800
Prepare for next development iteration
---
acl/pom.xml | 2 +-
broker/pom.xml | 2 +-
client/pom.xml | 2 +-
common/pom.xml | 2 +-
distribution/pom.xml | 2 +-
example/pom.xml | 2 +-
filter/pom.xml | 2 +-
logging/pom.xml | 2 +-
namesrv/pom.xml | 2 +-
openmessaging/pom.xml | 2 +-
pom.xml | 2 +-
remoting/pom.xml | 2 +-
srvutil/pom.xml | 2 +-
store/pom.xml | 2 +-
test/pom.xml | 2 +-
tools/pom.xml | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/acl/pom.xml b/acl/pom.xml
index 74193d7..686a398 100644
--- a/acl/pom.xml
+++ b/acl/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
- <version>5.0.0-ALPHA</version>
+ <version>5.0.0-BETA-SNAPSHOT</version>
</parent>
<artifactId>rocketmq-acl</artifactId>
<name>rocketmq-acl ${project.version}</name>
diff --git a/broker/pom.xml b/broker/pom.xml
index 99bc694..31a10cc 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
- <version>5.0.0-ALPHA</version>
+ <version>5.0.0-BETA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/client/pom.xml b/client/pom.xml
index fbc689d..1e3d23e 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
- <version>5.0.0-ALPHA</version>
+ <version>5.0.0-BETA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/common/pom.xml b/common/pom.xml
index 0cbcbc0..cea5830 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
- <version>5.0.0-ALPHA</version>
+ <version>5.0.0-BETA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index d2fd791..8059a9a 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
- <version>5.0.0-ALPHA</version>
+ <version>5.0.0-BETA-SNAPSHOT</version>
</parent>
<artifactId>rocketmq-distribution</artifactId>
<name>rocketmq-distribution ${project.version}</name>
diff --git a/example/pom.xml b/example/pom.xml
index aaf7fa8..6ba9321 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>rocketmq-all</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>5.0.0-ALPHA</version>
+ <version>5.0.0-BETA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/filter/pom.xml b/filter/pom.xml
index bd22a37..d886ad6 100644
--- a/filter/pom.xml
+++ b/filter/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>rocketmq-all</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>5.0.0-ALPHA</version>
+ <version>5.0.0-BETA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/logging/pom.xml b/logging/pom.xml
index 9de6732..c689b90 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
- <version>5.0.0-ALPHA</version>
+ <version>5.0.0-BETA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/namesrv/pom.xml b/namesrv/pom.xml
index 8bcf76f..11ddfb7 100644
--- a/namesrv/pom.xml
+++ b/namesrv/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
- <version>5.0.0-ALPHA</version>
+ <version>5.0.0-BETA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/openmessaging/pom.xml b/openmessaging/pom.xml
index e1e796d..fc27143 100644
--- a/openmessaging/pom.xml
+++ b/openmessaging/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>rocketmq-all</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>5.0.0-ALPHA</version>
+ <version>5.0.0-BETA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 5be5ee4..880df2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<inceptionYear>2012</inceptionYear>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
- <version>5.0.0-ALPHA</version>
+ <version>5.0.0-BETA-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache RocketMQ ${project.version}</name>
<url>http://rocketmq.apache.org/</url>
diff --git a/remoting/pom.xml b/remoting/pom.xml
index da4b4ca..cacea32 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
- <version>5.0.0-ALPHA</version>
+ <version>5.0.0-BETA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/srvutil/pom.xml b/srvutil/pom.xml
index 174e0da..820a406 100644
--- a/srvutil/pom.xml
+++ b/srvutil/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
- <version>5.0.0-ALPHA</version>
+ <version>5.0.0-BETA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/store/pom.xml b/store/pom.xml
index 5cddbcb..5588052 100644
--- a/store/pom.xml
+++ b/store/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
- <version>5.0.0-ALPHA</version>
+ <version>5.0.0-BETA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/test/pom.xml b/test/pom.xml
index 3ecb768..2bdab7c 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>rocketmq-all</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>5.0.0-ALPHA</version>
+ <version>5.0.0-BETA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/tools/pom.xml b/tools/pom.xml
index 5e66dc9..8f9137c 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
- <version>5.0.0-ALPHA</version>
+ <version>5.0.0-BETA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
[rocketmq] 03/03: Modify MQVersion to V5_0_0_BETA_SNAPSHOT
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch 5.0.0-beta
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 176e0d5c225a15e6c24a065325eed6eabc9cb1a2
Author: RongtongJin <ji...@mails.ucas.ac.cn>
AuthorDate: Sat Mar 12 21:41:48 2022 +0800
Modify MQVersion to V5_0_0_BETA_SNAPSHOT
---
.../src/main/java/org/apache/rocketmq/common/MQVersion.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/common/src/main/java/org/apache/rocketmq/common/MQVersion.java b/common/src/main/java/org/apache/rocketmq/common/MQVersion.java
index a7c4f27..847fd74 100644
--- a/common/src/main/java/org/apache/rocketmq/common/MQVersion.java
+++ b/common/src/main/java/org/apache/rocketmq/common/MQVersion.java
@@ -18,7 +18,7 @@ package org.apache.rocketmq.common;
public class MQVersion {
- public static final int CURRENT_VERSION = Version.V5_0_0_ALPHA.ordinal();
+ public static final int CURRENT_VERSION = Version.V5_0_0_BETA_SNAPSHOT.ordinal();
public static String getVersionDesc(int value) {
int length = Version.values().length;
@@ -640,6 +640,15 @@ public class MQVersion {
V4_9_9_SNAPSHOT,
V4_9_9,
+ V5_0_0_PREVIEW_SNAPSHOT,
+ V5_0_0_PREVIEW,
+
+ V5_0_0_ALPHA_SNAPSHOT,
+ V5_0_0_ALPHA,
+
+ V5_0_0_BETA_SNAPSHOT,
+ V5_0_0_BETA,
+
V5_0_0_SNAPSHOT,
V5_0_0,