已开启
修复rocketmq堆内存不足问题 #50
AtomGit-Bot创建于 2024年10月21日
修复rocketmq堆内存不足问题 #50
已开启
从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 @@ | |||
| 5 | Summary: Cloud-Native, Distributed Messaging and Streaming | 5 | Summary: Cloud-Native, Distributed Messaging and Streaming |
| 6 | Name: rocketmq | 6 | Name: rocketmq |
| 7 | Version: 5.1.5 | 7 | Version: 5.1.5 |
| 8 | -Release: 44 | 8 | +Release: 22 |
| 9 | License: Apache-2.0 | 9 | License: Apache-2.0 |
| 10 | Group: Applications/Message | 10 | Group: Applications/Message |
| 11 | URL: https://rocketmq.apache.org/ | 11 | URL: https://rocketmq.apache.org/ |
| @@ -53,6 +53,7 @@ Patch0040: patch040-backport-add-some-test-cases.patch | |||
| 53 | Patch0041: patch041-backport-improve-performance.patch | 53 | Patch0041: patch041-backport-improve-performance.patch |
| 54 | Patch0042: patch042-backport-Support-message-filtering.patch | 54 | Patch0042: patch042-backport-Support-message-filtering.patch |
| 55 | Patch0043: patch043-backport-fix-some-bugs.patch | 55 | Patch0043: patch043-backport-fix-some-bugs.patch |
| 56 | +Patch0044: patch044-add-maxheapValue.patch | ||
| 56 | BuildRequires: java-1.8.0-openjdk-devel, maven, maven-local, git | 57 | BuildRequires: java-1.8.0-openjdk-devel, maven, maven-local, git |
| 57 | Requires: java-1.8.0-openjdk-devel | 58 | Requires: 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 24 | 70 | %autopatch -m 24 |
| 70 | 71 | ||
| 71 | %build | 72 | %build |
| 72 | -mvn -Prelease-all -DskipTests clean package -U | 73 | +export MAVEN_OPTS='-Xmx2G ' |
| 74 | +mvn -Prelease-all -DskipTests clean package -U | ||
| 73 | 75 | ||
| 74 | %install | 76 | %install |
| 75 | cd %{_builddir}/rocketmq-all-5.1.5-source-release/distribution/target | 77 | cd %{_builddir}/rocketmq-all-5.1.5-source-release/distribution/target |
| @@ -93,67 +95,70 @@ exit 0 | |||
| 93 | 95 | ||
| 94 | 96 | ||
| 95 | %changelog | 97 | %changelog |
| 96 | -* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-44 | 98 | +* Mon Oct 21 2024 pSomng <pisong.oerv@isrc.iscas.ac.cn> - 5.1.5-22 |
C 这里应该和spec中的 ![]() ![]() | |||
| 99 | +- fix some bugs: Out of Memory (OOM) and timeout during compilation. | ||
5.1.3 删除前面的空白行 ![]() ![]() 好的 ![]() ![]() | |||
| 100 | + | ||
| 101 | +* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-21 | ||
| 97 | - backport fix some bugs | 102 | - backport fix some bugs |
| 98 | 103 | ||
| 99 | -* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-43 | 104 | +* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-20 |
| 100 | - backport Support message filtering | 105 | - backport Support message filtering |
| 101 | 106 | ||
| 102 | -* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-42 | 107 | +* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-19 |
| 103 | - backport add improve performance | 108 | - backport add improve performance |
| 104 | 109 | ||
| 105 | -* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-41 | 110 | +* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-18 |
| 106 | - backport add some test cases | 111 | - backport add some test cases |
| 107 | 112 | ||
| 108 | -* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-40 | 113 | +* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-17 |
| 109 | - backport add some validations | 114 | - backport add some validations |
| 110 | 115 | ||
| 111 | -* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-39 | 116 | +* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-16 |
| 112 | - backport SlaveActingMaster Timer Message retry without escape logic | 117 | - backport SlaveActingMaster Timer Message retry without escape logic |
| 113 | 118 | ||
| 114 | -* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-38 | 119 | +* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-15 |
| 115 | - backport Retry topic v2 in pop | 120 | - backport Retry topic v2 in pop |
| 116 | 121 | ||
| 117 | -* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-37 | 122 | +* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-14 |
| 118 | - backport rip 65 | 123 | - backport rip 65 |
| 119 | 124 | ||
| 120 | -* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-36 | 125 | +* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-13 |
| 121 | - backport fix some bugs | 126 | - backport fix some bugs |
| 122 | 127 | ||
| 123 | -* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-35 | 128 | +* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-12 |
| 124 | - backport Let consumer be aware of message queue assignment change | 129 | - 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-34 | 131 | +* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-11 |
| 127 | - backport Lock granularity issue causing LMQ message loss | 132 | - backport Lock granularity issue causing LMQ message loss |
| 128 | 133 | ||
| 129 | -* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-33 | 134 | +* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-10 |
| 130 | - backport Clear POP_CK when sending messages | 135 | - backport Clear POP_CK when sending messages |
| 131 | 136 | ||
| 132 | -* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-32 | 137 | +* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-9 |
| 133 | - backport Add the CRC check of commitlog | 138 | - backport Add the CRC check of commitlog |
| 134 | 139 | ||
| 135 | -* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-31 | 140 | +* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-8 |
| 136 | - backport remove some code | 141 | - backport remove some code |
| 137 | 142 | ||
| 138 | -* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-30 | 143 | +* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-7 |
| 139 | - backport Introduce a new event NettyEventType.ACTIVE | 144 | - backport Introduce a new event NettyEventType.ACTIVE |
| 140 | 145 | ||
| 141 | -* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-29 | 146 | +* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-6 |
| 142 | - backport fix proxy client language error | 147 | - backport fix proxy client language error |
| 143 | 148 | ||
| 144 | -* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-28 | 149 | +* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-5 |
| 145 | - backport Utilizing cache to avoid duplicate parsing | 150 | - backport Utilizing cache to avoid duplicate parsing |
| 146 | 151 | ||
| 147 | -* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-27 | 152 | +* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-4 |
| 148 | - backport AddBroker removes parsing configuration from body | 153 | - backport AddBroker removes parsing configuration from body |
| 149 | 154 | ||
| 150 | -* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-26 | 155 | +* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-3 |
| 151 | - backport Fix channel connect issue | 156 | - backport Fix channel connect issue |
| 152 | 157 | ||
| 153 | -* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-25 | 158 | +* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-2 |
| 154 | - backport some format and doc | 159 | - backport some format and doc |
| 155 | 160 | ||
| 156 | -* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-24 | 161 | +* Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.5-1 |
| 157 | - backport some bugfixes | 162 | - backport some bugfixes |
| 158 | 163 | ||
| 159 | * Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-23 | 164 | * Fri Dec 8 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-23 |
| @@ -223,4 +228,4 @@ exit 0 | |||
| 223 | - fix some bugs | 228 | - fix some bugs |
| 224 | 229 | ||
| 225 | * Thu Aug 17 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-1 | 230 | * Thu Aug 17 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-1 |
| 226 | -- init rocketmq spec | 231 | +- init rocketmq spec |


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