已开启
修复rocketmq堆内存不足问题 #50
AtomGit-Bot创建于 2024年10月21日
修复rocketmq堆内存不足问题 #50
已开启
AtomGit-Bot创建于 2024年10月21日
从refs/pull/50/head合入到master
共 2 个文件变更+44-24
@@ -0,0 +1,15 @@
1+diff --git a/pom.xml b/pom.xml
2+index a3f7c22..70e44f7 100644
3+--- a/pom.xml
4++++ b/pom.xml
5+@@ -418,7 +418,9 @@
6+ <spotbugsXmlOutput>true</spotbugsXmlOutput>
7+ <excludeFilterFile>${project.root}/style/spotbugs-suppressions.xml</excludeFilterFile>
8+ <threshold>High</threshold>
9+- <effort>Max</effort>
10++ <effort>Max</effort>
11++ <timeout>12000000</timeout>
12++ <maxHeap>2048</maxHeap>
13+ </configuration>
14+ </plugin>
15+ </plugins>
@@ -5,7 +5,7 @@
5Summary: Cloud-Native, Distributed Messaging and Streaming5Summary: Cloud-Native, Distributed Messaging and Streaming
6Name: rocketmq6Name: rocketmq
7Version: 5.1.57Version: 5.1.5
8-Release: 448+Release: 22
9License: Apache-2.09License: Apache-2.0
10Group: Applications/Message10Group: Applications/Message
11URL: https://rocketmq.apache.org/11URL: https://rocketmq.apache.org/
@@ -53,6 +53,7 @@ Patch0040: patch040-backport-add-some-test-cases.patch
53Patch0041: patch041-backport-improve-performance.patch53Patch0041: patch041-backport-improve-performance.patch
54Patch0042: patch042-backport-Support-message-filtering.patch54Patch0042: patch042-backport-Support-message-filtering.patch
55Patch0043: patch043-backport-fix-some-bugs.patch55Patch0043: patch043-backport-fix-some-bugs.patch
56+Patch0044: patch044-add-maxheapValue.patch
56BuildRequires: java-1.8.0-openjdk-devel, maven, maven-local, git57BuildRequires: java-1.8.0-openjdk-devel, maven, maven-local, git
57Requires: java-1.8.0-openjdk-devel58Requires: java-1.8.0-openjdk-devel
58 59 
@@ -69,7 +70,8 @@ Apache RocketMQ is a cloud native messaging and streaming platform, making it si
69%autopatch -m 2470%autopatch -m 24
70 71 
71%build72%build
72-mvn -Prelease-all -DskipTests clean package -U73+export MAVEN_OPTS='-Xmx2G '
74+mvn -Prelease-all -DskipTests clean package -U
73 75 
74%install76%install
75cd %{_builddir}/rocketmq-all-5.1.5-source-release/distribution/target77cd %{_builddir}/rocketmq-all-5.1.5-source-release/distribution/target
@@ -93,67 +95,70 @@ exit 0
93 95 
94 96 
95%changelog97%changelog
96-* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-4498+* Mon Oct 21 2024 pSomng <pisong.oerv@isrc.iscas.ac.cn> - 5.1.5-22
CDingli Zhang
Ccpntroller2024年10月22日

这里应该和spec中的 Version: 5.1.5对应,为 5.1.5 从 https://gitee.com/src-openeuler/rocketmq/commit/cd6b2c 这里开始 changelog 以及 Release: 45 都是有问题的,看看maintainer的意见,要不要统一修改一下?

那我先统一修改一下,然后看最终意见

likedislike
Dingli ZhangDingli Zhang2024年10月22日

这里应该和spec中的 Version: 5.1.5对应,为 5.1.5 从 https://gitee.com/src-openeuler/rocketmq/commit/cd6b2c 这里开始 changelog 以及 Release: 45 都是有问题的,看看maintainer的意见,要不要统一修改一下?

likedislike
99+- fix some bugs: Out of Memory (OOM) and timeout during compilation.
laokzC
laokzlaokz2024年10月21日

5.1.3 删除前面的空白行

likedislike
Ccpntroller2024年10月21日

好的

likedislike
100+ 
101+* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-21
97- backport fix some bugs102- backport fix some bugs
98 103 
99-* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-43104+* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-20
100- backport Support message filtering105- backport Support message filtering
101 106 
102-* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-42107+* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-19
103- backport add improve performance108- backport add improve performance
104 109 
105-* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-41110+* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-18
106- backport add some test cases111- backport add some test cases
107 112 
108-* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-40113+* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-17
109- backport add some validations114- backport add some validations
110 115 
111-* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-39116+* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-16
112- backport SlaveActingMaster Timer Message retry without escape logic117- backport SlaveActingMaster Timer Message retry without escape logic
113 118 
114-* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-38119+* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-15
115- backport Retry topic v2 in pop120- backport Retry topic v2 in pop
116 121 
117-* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-37122+* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-14
118- backport rip 65123- backport rip 65
119 124 
120-* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-36125+* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-13
121- backport fix some bugs126- backport fix some bugs
122 127 
123-* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-35128+* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-12
124- backport Let consumer be aware of message queue assignment change129- backport Let consumer be aware of message queue assignment change
125 130 
126-* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-34131+* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-11
127- backport Lock granularity issue causing LMQ message loss132- backport Lock granularity issue causing LMQ message loss
128 133 
129-* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-33134+* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-10
130- backport Clear POP_CK when sending messages135- backport Clear POP_CK when sending messages
131 136 
132-* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-32137+* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-9
133- backport Add the CRC check of commitlog138- backport Add the CRC check of commitlog
134 139 
135-* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-31140+* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-8
136- backport remove some code141- backport remove some code
137 142 
138-* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-30143+* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-7
139- backport Introduce a new event NettyEventType.ACTIVE144- backport Introduce a new event NettyEventType.ACTIVE
140 145 
141-* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-29146+* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-6
142- backport fix proxy client language error147- backport fix proxy client language error
143 148 
144-* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-28149+* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-5
145- backport Utilizing cache to avoid duplicate parsing150- backport Utilizing cache to avoid duplicate parsing
146 151 
147-* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-27152+* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-4
148- backport AddBroker removes parsing configuration from body153- backport AddBroker removes parsing configuration from body
149 154 
150-* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-26155+* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-3
151- backport Fix channel connect issue156- backport Fix channel connect issue
152 157 
153-* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-25158+* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-2
154- backport some format and doc159- backport some format and doc
155 160 
156-* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-24161+* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-1
157- backport some bugfixes162- backport some bugfixes
158 163 
159* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-23164* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-23
@@ -223,4 +228,4 @@ exit 0
223- fix some bugs228- fix some bugs
224 229 
225* Thu Aug 17 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-1230* Thu Aug 17 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-1
226-- init rocketmq spec231+- init rocketmq spec