packages/rocketmq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug and backport some enhancement

Browse Source
This commit is contained in:
shizhili 2023-09-13 17:29:07 +08:00
parent ffc764bf96
commit 8f41dfec59
3 changed files with 13 additions and 727 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
backport_some_typo_fixes.patch → patch001-backport-some-typo-fixes.patch
View File

731
001-fix-some-bugs.patch → patch002-backport-some-enhancement.patch
View File

@ -1,724 +1,7 @@
From e369d7deac6e4dde950a8da7c3d976bb26d0e6b5 Mon Sep 17 00:00:00 2001
From: rongtong <jinrongtong5@163.com>
Date: Sat, 24 Jun 2023 14:31:42 +0800
Subject: [PATCH 01/11] [maven-release-plugin] prepare for next development
iteration (#6939)
---
acl/pom.xml | 2 +-
broker/pom.xml | 2 +-
client/pom.xml | 2 +-
common/pom.xml | 2 +-
container/pom.xml | 2 +-
controller/pom.xml | 2 +-
distribution/pom.xml | 2 +-
example/pom.xml | 2 +-
filter/pom.xml | 2 +-
namesrv/pom.xml | 2 +-
openmessaging/pom.xml | 2 +-
pom.xml | 4 ++--
proxy/pom.xml | 2 +-
remoting/pom.xml | 2 +-
srvutil/pom.xml | 2 +-
store/pom.xml | 2 +-
test/pom.xml | 2 +-
tieredstore/pom.xml | 2 +-
tools/pom.xml | 2 +-
19 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/acl/pom.xml b/acl/pom.xml
index 26c30d135..67bfcb8d2 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.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<artifactId>rocketmq-acl</artifactId>
<name>rocketmq-acl ${project.version}</name>
diff --git a/broker/pom.xml b/broker/pom.xml
index 70ba0ee66..16e026276 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.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/client/pom.xml b/client/pom.xml
index 5bd725922..c59a43889 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.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/common/pom.xml b/common/pom.xml
index 01a439089..9796d1b2d 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.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/container/pom.xml b/container/pom.xml
index 6881bca56..c8499f127 100644
--- a/container/pom.xml
+++ b/container/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
- <version>5.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/controller/pom.xml b/controller/pom.xml
index beb0a0583..3346c7c82 100644
--- a/controller/pom.xml
+++ b/controller/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>rocketmq-all</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>5.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 1269e1600..dbde2d9d4 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.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<artifactId>rocketmq-distribution</artifactId>
<name>rocketmq-distribution ${project.version}</name>
diff --git a/example/pom.xml b/example/pom.xml
index 9b11cf676..862fc3169 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.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/filter/pom.xml b/filter/pom.xml
index 1c4bfdc48..3fe51ceae 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.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/namesrv/pom.xml b/namesrv/pom.xml
index 93989d5dc..684b2683c 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.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/openmessaging/pom.xml b/openmessaging/pom.xml
index 288408839..aaa4c896c 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.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 48e784603..aecb9a424 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<inceptionYear>2012</inceptionYear>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
- <version>5.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache RocketMQ ${project.version}</name>
<url>http://rocketmq.apache.org/</url>
@@ -37,7 +37,7 @@
<url>git@github.com:apache/rocketmq.git</url>
<connection>scm:git:git@github.com:apache/rocketmq.git</connection>
<developerConnection>scm:git:git@github.com:apache/rocketmq.git</developerConnection>
- <tag>rocketmq-all-5.1.3</tag>
+ <tag>HEAD</tag>
</scm>
<mailingLists>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index ff247f6e0..f14155737 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>rocketmq-all</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>5.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/remoting/pom.xml b/remoting/pom.xml
index f67dc3abc..8a43c5c30 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.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/srvutil/pom.xml b/srvutil/pom.xml
index c9cae8714..fa54ad019 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.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/store/pom.xml b/store/pom.xml
index 0712140c1..38f04009d 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.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/test/pom.xml b/test/pom.xml
index c24d0e7fd..8f25c35c9 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.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/tieredstore/pom.xml b/tieredstore/pom.xml
index 523ca30d5..c476040ba 100644
--- a/tieredstore/pom.xml
+++ b/tieredstore/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
- <version>5.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/tools/pom.xml b/tools/pom.xml
index 22d7fd97c..1c3b431bc 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.1.3</version>
+ <version>5.1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
--
2.32.0.windows.2
From 16ef5755375e7c8f4fb11dd63f5fdfdfa25668e7 Mon Sep 17 00:00:00 2001
From: panzhi <panzhi33@qq.com>
Date: Sun, 25 Jun 2023 14:44:56 +0800
Subject: [PATCH 02/11] [ISSUE #4612] Fix trace not complete (#6941)
---
.../rocketmq/client/hook/ConsumeMessageContext.java | 11 +++++++++++
.../consumer/ConsumeMessageConcurrentlyService.java | 1 +
.../impl/consumer/ConsumeMessageOrderlyService.java | 1 +
.../ConsumeMessagePopConcurrentlyService.java | 1 +
.../impl/consumer/DefaultLitePullConsumerImpl.java | 1 +
.../impl/consumer/DefaultMQPullConsumerImpl.java | 1 +
.../apache/rocketmq/client/trace/TraceContext.java | 10 ++++++++++
.../rocketmq/client/trace/TraceDataEncoder.java | 9 ++++++---
.../trace/hook/ConsumeMessageTraceHookImpl.java | 1 +
.../rocketmq/client/trace/TraceDataEncoderTest.java | 2 ++
10 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/client/src/main/java/org/apache/rocketmq/client/hook/ConsumeMessageContext.java b/client/src/main/java/org/apache/rocketmq/client/hook/ConsumeMessageContext.java
index 835852e9e..94633cea8 100644
--- a/client/src/main/java/org/apache/rocketmq/client/hook/ConsumeMessageContext.java
+++ b/client/src/main/java/org/apache/rocketmq/client/hook/ConsumeMessageContext.java
@@ -18,6 +18,8 @@ package org.apache.rocketmq.client.hook;
import java.util.List;
import java.util.Map;
+
+import org.apache.rocketmq.client.AccessChannel;
import org.apache.rocketmq.common.message.MessageExt;
import org.apache.rocketmq.common.message.MessageQueue;
@@ -30,6 +32,7 @@ public class ConsumeMessageContext {
private Object mqTraceContext;
private Map<String, String> props;
private String namespace;
+ private AccessChannel accessChannel;
public String getConsumerGroup() {
return consumerGroup;
@@ -94,4 +97,12 @@ public class ConsumeMessageContext {
public void setNamespace(String namespace) {
this.namespace = namespace;
}
+
+ public AccessChannel getAccessChannel() {
+ return accessChannel;
+ }
+
+ public void setAccessChannel(AccessChannel accessChannel) {
+ this.accessChannel = accessChannel;
+ }
}
diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java
index c915cce81..ea6c8072b 100644
--- a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java
+++ b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java
@@ -447,6 +447,7 @@ public class ConsumeMessageConcurrentlyService implements ConsumeMessageService
if (ConsumeMessageConcurrentlyService.this.defaultMQPushConsumerImpl.hasHook()) {
consumeMessageContext.setStatus(status.toString());
consumeMessageContext.setSuccess(ConsumeConcurrentlyStatus.CONSUME_SUCCESS == status);
+ consumeMessageContext.setAccessChannel(defaultMQPushConsumer.getAccessChannel());
ConsumeMessageConcurrentlyService.this.defaultMQPushConsumerImpl.executeHookAfter(consumeMessageContext);
}
diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
index f9c00839c..4246768d4 100644
--- a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
+++ b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
@@ -543,6 +543,7 @@ public class ConsumeMessageOrderlyService implements ConsumeMessageService {
consumeMessageContext.setStatus(status.toString());
consumeMessageContext
.setSuccess(ConsumeOrderlyStatus.SUCCESS == status || ConsumeOrderlyStatus.COMMIT == status);
+ consumeMessageContext.setAccessChannel(defaultMQPushConsumer.getAccessChannel());
ConsumeMessageOrderlyService.this.defaultMQPushConsumerImpl.executeHookAfter(consumeMessageContext);
}
diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessagePopConcurrentlyService.java b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessagePopConcurrentlyService.java
index c2b39ad7b..a61454f59 100644
--- a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessagePopConcurrentlyService.java
+++ b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessagePopConcurrentlyService.java
@@ -457,6 +457,7 @@ public class ConsumeMessagePopConcurrentlyService implements ConsumeMessageServi
consumeMessageContext.getProps().put(MixAll.CONSUME_CONTEXT_TYPE, returnType.name());
consumeMessageContext.setStatus(status.toString());
consumeMessageContext.setSuccess(ConsumeConcurrentlyStatus.CONSUME_SUCCESS == status);
+ consumeMessageContext.setAccessChannel(defaultMQPushConsumer.getAccessChannel());
ConsumeMessagePopConcurrentlyService.this.defaultMQPushConsumerImpl.executeHookAfter(consumeMessageContext);
}
diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultLitePullConsumerImpl.java b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultLitePullConsumerImpl.java
index 2d37581bb..20ca47700 100644
--- a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultLitePullConsumerImpl.java
+++ b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultLitePullConsumerImpl.java
@@ -632,6 +632,7 @@ public class DefaultLitePullConsumerImpl implements MQConsumerInner {
this.executeHookBefore(consumeMessageContext);
consumeMessageContext.setStatus(ConsumeConcurrentlyStatus.CONSUME_SUCCESS.toString());
consumeMessageContext.setSuccess(true);
+ consumeMessageContext.setAccessChannel(defaultLitePullConsumer.getAccessChannel());
this.executeHookAfter(consumeMessageContext);
}
consumeRequest.getProcessQueue().setLastConsumeTimestamp(System.currentTimeMillis());
diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java
index 3348f3192..e6d148c7f 100644
--- a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java
+++ b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java
@@ -278,6 +278,7 @@ public class DefaultMQPullConsumerImpl implements MQConsumerInner {
this.executeHookBefore(consumeMessageContext);
consumeMessageContext.setStatus(ConsumeConcurrentlyStatus.CONSUME_SUCCESS.toString());
consumeMessageContext.setSuccess(true);
+ consumeMessageContext.setAccessChannel(defaultMQPullConsumer.getAccessChannel());
this.executeHookAfter(consumeMessageContext);
}
return pullResult;
diff --git a/client/src/main/java/org/apache/rocketmq/client/trace/TraceContext.java b/client/src/main/java/org/apache/rocketmq/client/trace/TraceContext.java
index 96dc1df18..a1f632e02 100644
--- a/client/src/main/java/org/apache/rocketmq/client/trace/TraceContext.java
+++ b/client/src/main/java/org/apache/rocketmq/client/trace/TraceContext.java
@@ -16,6 +16,7 @@
*/
package org.apache.rocketmq.client.trace;
+import org.apache.rocketmq.client.AccessChannel;
import org.apache.rocketmq.common.message.MessageClientIDSetter;
import java.util.List;
@@ -34,6 +35,7 @@ public class TraceContext implements Comparable<TraceContext> {
private boolean isSuccess = true;
private String requestId = MessageClientIDSetter.createUniqID();
private int contextCode = 0;
+ private AccessChannel accessChannel;
private List<TraceBean> traceBeans;
public int getContextCode() {
@@ -116,6 +118,14 @@ public class TraceContext implements Comparable<TraceContext> {
this.regionName = regionName;
}
+ public AccessChannel getAccessChannel() {
+ return accessChannel;
+ }
+
+ public void setAccessChannel(AccessChannel accessChannel) {
+ this.accessChannel = accessChannel;
+ }
+
@Override
public int compareTo(TraceContext o) {
return Long.compare(this.timeStamp, o.getTimeStamp());
diff --git a/client/src/main/java/org/apache/rocketmq/client/trace/TraceDataEncoder.java b/client/src/main/java/org/apache/rocketmq/client/trace/TraceDataEncoder.java
index 918422264..0fdd95243 100644
--- a/client/src/main/java/org/apache/rocketmq/client/trace/TraceDataEncoder.java
+++ b/client/src/main/java/org/apache/rocketmq/client/trace/TraceDataEncoder.java
@@ -16,6 +16,7 @@
*/
package org.apache.rocketmq.client.trace;
+import org.apache.rocketmq.client.AccessChannel;
import org.apache.rocketmq.client.producer.LocalTransactionState;
import org.apache.rocketmq.common.message.MessageConst;
import org.apache.rocketmq.common.message.MessageType;
@@ -190,9 +191,11 @@ public class TraceDataEncoder {
.append(ctx.getCostTime()).append(TraceConstants.CONTENT_SPLITOR)//
.append(ctx.isSuccess()).append(TraceConstants.CONTENT_SPLITOR)//
.append(bean.getKeys()).append(TraceConstants.CONTENT_SPLITOR)//
- .append(ctx.getContextCode()).append(TraceConstants.CONTENT_SPLITOR)
- .append(ctx.getTimeStamp()).append(TraceConstants.CONTENT_SPLITOR)
- .append(ctx.getGroupName()).append(TraceConstants.FIELD_SPLITOR);
+ .append(ctx.getContextCode()).append(TraceConstants.CONTENT_SPLITOR);
+ if (!ctx.getAccessChannel().equals(AccessChannel.CLOUD)) {
+ sb.append(ctx.getTimeStamp()).append(TraceConstants.CONTENT_SPLITOR)
+ .append(ctx.getGroupName()).append(TraceConstants.FIELD_SPLITOR);
+ }
}
}
break;
diff --git a/client/src/main/java/org/apache/rocketmq/client/trace/hook/ConsumeMessageTraceHookImpl.java b/client/src/main/java/org/apache/rocketmq/client/trace/hook/ConsumeMessageTraceHookImpl.java
index 6db8a177f..f23a4ff0a 100644
--- a/client/src/main/java/org/apache/rocketmq/client/trace/hook/ConsumeMessageTraceHookImpl.java
+++ b/client/src/main/java/org/apache/rocketmq/client/trace/hook/ConsumeMessageTraceHookImpl.java
@@ -99,6 +99,7 @@ public class ConsumeMessageTraceHookImpl implements ConsumeMessageHook {
subAfterContext.setRegionId(subBeforeContext.getRegionId());//
subAfterContext.setGroupName(NamespaceUtil.withoutNamespace(subBeforeContext.getGroupName()));//
subAfterContext.setRequestId(subBeforeContext.getRequestId());//
+ subAfterContext.setAccessChannel(context.getAccessChannel());
subAfterContext.setSuccess(context.isSuccess());//
// Calculate the cost time for processing messages
diff --git a/client/src/test/java/org/apache/rocketmq/client/trace/TraceDataEncoderTest.java b/client/src/test/java/org/apache/rocketmq/client/trace/TraceDataEncoderTest.java
index 763de9f3b..26b7bda59 100644
--- a/client/src/test/java/org/apache/rocketmq/client/trace/TraceDataEncoderTest.java
+++ b/client/src/test/java/org/apache/rocketmq/client/trace/TraceDataEncoderTest.java
@@ -17,6 +17,7 @@
package org.apache.rocketmq.client.trace;
+import org.apache.rocketmq.client.AccessChannel;
import org.apache.rocketmq.client.producer.LocalTransactionState;
import org.apache.rocketmq.common.message.MessageType;
import org.junit.Assert;
@@ -195,6 +196,7 @@ public class TraceDataEncoderTest {
subAfterContext.setTimeStamp(1625883640000L);
subAfterContext.setGroupName("GroupName-test");
subAfterContext.setContextCode(98623046);
+ subAfterContext.setAccessChannel(AccessChannel.LOCAL);
TraceBean bean = new TraceBean();
bean.setMsgId("AC1415116D1418B4AAC217FE1B4E0000");
bean.setKeys("keys");
--
2.32.0.windows.2
From fa8f256b50361c401922f0d11b8e26fed2f31ce7 Mon Sep 17 00:00:00 2001
From: wenbin yao <67348866+yao-wenbin@users.noreply.github.com>
Date: Sun, 25 Jun 2023 20:20:40 +0800
Subject: [PATCH 03/11] [ISSUE #6943] fix docs typo in
docs/cn/controller/design.md #6943
---
docs/cn/controller/design.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/cn/controller/design.md b/docs/cn/controller/design.md
index a8d18dd67..563a624ed 100644
--- a/docs/cn/controller/design.md
+++ b/docs/cn/controller/design.md
@@ -125,7 +125,7 @@ nextTransferFromWhere + size > currentTransferEpochEndOffset，则将 selectMapp
- Current state 代表当前的 HAConnectionState，也即 HANDSHAKE。
-- Two falgs 是两个状态标志位，其中，isSyncFromLastFile 代表是否要从 Master 的最后一个文件开始复制，isAsyncLearner 代表该 Slave 是否是异步复制，并以 Learner 的形式接入 Master。
+- Two flags 是两个状态标志位，其中，isSyncFromLastFile 代表是否要从 Master 的最后一个文件开始复制，isAsyncLearner 代表该 Slave 是否是异步复制，并以 Learner 的形式接入 Master。
- slaveAddressLength 与 slaveAddress 代表了该 Slave 的地址，用于后续加入 SyncStateSet 。
--
2.32.0.windows.2
From f3ce3e8fb96bbd618ae8d1fa56ce075051758270 Mon Sep 17 00:00:00 2001
From: yuz10 <845238369@qq.com>
Date: Mon, 26 Jun 2023 17:10:26 +0800
Subject: [PATCH 04/11] [ISSUE #6940] change dataReadAheadEnable default to
false (#6944)
* [ISSUE #6390] Add break to the exception of WHEEL_TIMER_NOT_ENABLE.
* fix broker start fail if mapped file size is 0
* log
* only delete the last empty file
* change dataReadAheadEnable default to true
---
.../org/apache/rocketmq/store/config/MessageStoreConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/store/src/main/java/org/apache/rocketmq/store/config/MessageStoreConfig.java b/store/src/main/java/org/apache/rocketmq/store/config/MessageStoreConfig.java
index d7b7b8c08..4f204d742 100644
--- a/store/src/main/java/org/apache/rocketmq/store/config/MessageStoreConfig.java
+++ b/store/src/main/java/org/apache/rocketmq/store/config/MessageStoreConfig.java
@@ -381,7 +381,7 @@ public class MessageStoreConfig {
private boolean coldDataFlowControlEnable = false;
private boolean coldDataScanEnable = false;
- private boolean dataReadAheadEnable = false;
+ private boolean dataReadAheadEnable = true;
private int timerColdDataCheckIntervalMs = 60 * 1000;
private int sampleSteps = 32;
private int accessMessageInMemoryHotRatio = 26;
--
2.32.0.windows.2
From dd27e8b77ca4296b2983349a67c6ac914f269000 Mon Sep 17 00:00:00 2001
From: mxsm <ljbmxsm@gmail.com>
Date: Tue, 27 Jun 2023 17:50:43 +0800
Subject: [PATCH 05/11] [ISSUE #6945] Add doc issue template (#6946)
---
.github/ISSUE_TEMPLATE/config.yml | 18 ++++++
.github/ISSUE_TEMPLATE/doc.yml | 55 +++++++++++++++++++
.../ISSUE_TEMPLATE/enhancement_request.yml | 18 ++++++
.github/ISSUE_TEMPLATE/feature_request.yml | 18 ++++++
4 files changed, 109 insertions(+)
create mode 100644 .github/ISSUE_TEMPLATE/doc.yml
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 26e931535..870c2b1d0 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
blank_issues_enabled: false
contact_links:
- name: Ask Question
diff --git a/.github/ISSUE_TEMPLATE/doc.yml b/.github/ISSUE_TEMPLATE/doc.yml
new file mode 100644
index 000000000..e68928464
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/doc.yml
@@ -0,0 +1,55 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: Documentation Related
+title: "[Doc] Documentation Related "
+description: I find some issues related to the documentation.
+labels: [ "module/doc" ]
+body:
+ - type: checkboxes
+ attributes:
+ label: Search before creation
+ description: >
+ Please make sure to search in the [issues](https://github.com/apache/rocketmq/issues)
+ first to see whether the same issue was reported already.
+ options:
+ - label: >
+ I had searched in the [issues](https://github.com/apache/rocketmq/issues) and found
+ no similar issues.
+ required: true
+
+ - type: textarea
+ attributes:
+ label: Documentation Related
+ description: Describe the suggestion about document.
+ placeholder: >
+ e.g There is a typo
+ validations:
+ required: true
+
+ - type: checkboxes
+ attributes:
+ label: Are you willing to submit PR?
+ description: >
+ This is absolutely not required, but we are happy to guide you in the contribution process
+ especially if you already have a good understanding of how to implement the fix.
+ options:
+ - label: Yes I am willing to submit a PR!
+
+ - type: markdown
+ attributes:
+ value: "Thanks for completing our form!"
diff --git a/.github/ISSUE_TEMPLATE/enhancement_request.yml b/.github/ISSUE_TEMPLATE/enhancement_request.yml
index 0d15db864..cac503d17 100644
--- a/.github/ISSUE_TEMPLATE/enhancement_request.yml
+++ b/.github/ISSUE_TEMPLATE/enhancement_request.yml
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
name: Enhancement Request
title: "[Enhancement] Enhancement title"
description: Suggest an enhancement for this project
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index c894e6d44..8361b8aee 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
name: Feature Request
title: "[Feature] New feature title"
description: Suggest an idea for this project.
--
2.32.0.windows.2
From c96a0b56658b48b17b762a1d2894e6d0576acad1 Mon Sep 17 00:00:00 2001
From: lizhimins <707364882@qq.com>
Date: Tue, 27 Jun 2023 17:53:43 +0800
Subject: [PATCH 06/11] [ISSUE #6933] Support delete expired or damaged file in
Subject: [PATCH 1/6] [ISSUE #6933] Support delete expired or damaged file in
tiered storage and optimize fetch code (#6952)
If cq dispatch smaller than local store min offset, do self-healing logic for storage and rebuild automatically
@ -1498,7 +781,7 @@ index 209afbbfc..df3720bab 100644
From 8ab99aceb704e4c8906b9d6d57c97143a59b04c7 Mon Sep 17 00:00:00 2001
From: lk <xdkxlk@outlook.com>
Date: Tue, 27 Jun 2023 18:41:50 +0800
Subject: [PATCH 07/11] [ISSUE #6754] Support reentrant orderly consumption for
Subject: [PATCH 2/6] [ISSUE #6754] Support reentrant orderly consumption for
proxy (#6755)
---
@ -2098,8 +1381,8 @@ index 7206e6b79..c76f40f92 100644
From 87075c26623c2c40486c4189e2fb1855426a8ae9 Mon Sep 17 00:00:00 2001
From: lk <xdkxlk@outlook.com>
Date: Wed, 28 Jun 2023 15:26:39 +0800
Subject: [PATCH 08/11] [ISSUE #6955] add removeOne method for
ReceiptHandleGroup (#6955)
Subject: [PATCH 3/6] [ISSUE #6955] add removeOne method for ReceiptHandleGroup
(#6955)
---
.../proxy/common/ReceiptHandleGroup.java | 36 +++++++++++++++++++
@ -2231,7 +1514,7 @@ index d3e8645ef..0a7e2f757 100644
From bbbe737e4e57ebc32581220fa8766cf32f7833eb Mon Sep 17 00:00:00 2001
From: lk <xdkxlk@outlook.com>
Date: Thu, 29 Jun 2023 15:27:30 +0800
Subject: [PATCH 09/11] [ISSUE #6964] use the correct context in telemetry;
Subject: [PATCH 4/6] [ISSUE #6964] use the correct context in telemetry;
polish the code structure (#6965)
---
@ -3077,7 +2360,7 @@ index 39aaa0117..e16d38a7a 100644
From 79967c00b2028acf0a707fe09435848f0acf8e6d Mon Sep 17 00:00:00 2001
From: lizhimins <707364882@qq.com>
Date: Fri, 30 Jun 2023 15:54:32 +0800
Subject: [PATCH 10/11] [ISSUE #6933] Optimize delete topic in tiered storage
Subject: [PATCH 5/6] [ISSUE #6933] Optimize delete topic in tiered storage
(#6973)
---
@ -3203,7 +2486,7 @@ index 1a2f65c00..5fe511f68 100644
From f07f93b3cf93ad56d921a911f3c3aabc4f9bbad1 Mon Sep 17 00:00:00 2001
From: mxsm <ljbmxsm@gmail.com>
Date: Mon, 3 Jul 2023 08:21:38 +0800
Subject: [PATCH 11/11] [ISSUE #6982] Update the version in the README.md
Subject: [PATCH 6/6] [ISSUE #6982] Update the version in the README.md
document to 5.1.3 (#6983)
---

9
rocketmq.spec
View File

@ -5,13 +5,13 @@
Summary: Cloud-Native, Distributed Messaging and Streaming
Name: rocketmq
Version: 5.1.3
Release: 2
Release: 3
License: Apache-2.0
Group: Applications/Message
URL: https://rocketmq.apache.org/
Source0: https://archive.apache.org/dist/%{name}/%{version}/%{name}-all-%{version}-source-release.zip
Patch0001: backport_some_typo_fixes.patch
BuildRoot: /root/rpmbuild/BUILDROOT/
Patch0001: patch001-backport-some-typo-fixes.patch
Patch0002: patch002-backport-some-enhancement.patch
BuildRequires: java-1.8.0-openjdk-devel, maven, maven-local, git
Requires: java-1.8.0-openjdk-devel
@ -46,6 +46,9 @@ exit 0
%changelog
* Wed Sep 13 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-3
- backport some enhancement
* Fri Sep 08 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-2
- fix some bugs