This is an automated email from the ASF dual-hosted git repository.
lizhimins pushed a commit to branch rocketmq-studio
in repository https://gitbox.apache.org/repos/asf/rocketmq-dashboard.git
The following commit(s) were added to refs/heads/rocketmq-studio by this push:
new e012ecc6 refactor: use dedicated listenPort for broker-1 and fix test
package path (#671)
e012ecc6 is described below
commit e012ecc69bd7cd4ad80a7028fa1385e97828fc16
Author: lizhimins <[email protected]>
AuthorDate: Wed Jul 29 19:38:12 2026 +0800
refactor: use dedicated listenPort for broker-1 and fix test package path
(#671)
- broker-1 listens on 20909/20911/20912 via listenPort=20911 with 1:1 host
port mapping
- move NameServerControllerTest to match org.apache.rocketmq.studio package
---
.claude/skills/deploy-rocketmq/SKILL.md | 7 ++++---
deploy/rocketmq/README.md | 2 +-
deploy/rocketmq/conf/broker-1.conf | 2 ++
deploy/rocketmq/docker-compose.yml | 8 ++++----
.../studio/cluster/nameserver/NameServerControllerTest.java | 0
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/.claude/skills/deploy-rocketmq/SKILL.md
b/.claude/skills/deploy-rocketmq/SKILL.md
index 6097df84..0447a18e 100644
--- a/.claude/skills/deploy-rocketmq/SKILL.md
+++ b/.claude/skills/deploy-rocketmq/SKILL.md
@@ -16,7 +16,7 @@ description: 部署 studio 测试集群。从 Apache RocketMQ 开源 develop 分
- 已安装 `docker`（含 `docker compose`）。
- 网络可访问 `github.com`（构建阶段 git clone）；国内环境由 `build.sh` 自动切换
apt / Maven 阿里源。
-- 宿主机端口 9876、10909、10911、10912、10919、10921、10922、8080、8081 未被占用
+- 宿主机端口 9876、10909、10911、10912、20909、20911、20912、8080、8081 未被占用
（与 studio 主 compose 的端口约定一致，不冲突）。
## 执行步骤
@@ -51,8 +51,9 @@ docker compose up -d
| producer | 编译并运行 `clients/TraceProducer.java`，1 TPS 发送到 `StudioTest`（带 Key
`studio-key-<n>`），`enableMsgTrace=true`，接入点 `proxy:8080`（流量经 proxy 转发） |
| consumer | 编译并运行 `clients/TraceConsumer.java`，Push 消费
`StudioTest`，`enableMsgTrace=true`，接入点 `proxy:8080` |
-- 两个 broker 容器内都监听 10909/10911/10912，broker-1 的宿主机端口错开为
- 10919/10921/10922 避免冲突；容器网络内互访始终走 `broker-{0,1}:10911`。
+- broker-0 监听 10909/10911/10912，broker-1 在 broker-1.conf 里通过 `listenPort=20911`
+ 直接监听 20909/20911/20912（fast/ha 端口自动 -2/+1），容器与宿主机端口 1:1 映射，
+ 容器网络内访问 `broker-0:10911` / `broker-1:20911`。
- 堆内存通过 `JAVA_OPT_EXT` 环境变量收敛（开源启动脚本会将其追加到 JVM 参数末尾，
覆盖脚本内置的大堆默认值），适合本地小内存环境。
- producer / consumer 直接用运行镜像自带 JDK + `lib/*` 依赖现场编译，无需额外构建。
diff --git a/deploy/rocketmq/README.md b/deploy/rocketmq/README.md
index b72c1151..c46f45f9 100644
--- a/deploy/rocketmq/README.md
+++ b/deploy/rocketmq/README.md
@@ -56,7 +56,7 @@ docker compose exec broker-0 sh bin/mqadmin consumeMessage \
|------|-----------|-----------|
| NameServer | nameserver:9876 | localhost:9876 |
| Broker-0 | broker-0:10911 | localhost:10911 |
-| Broker-1 | broker-1:10911 | localhost:10921（宿主机端口错开） |
+| Broker-1 | broker-1:20911 | localhost:20911 |
| Proxy remoting | proxy:8080 | localhost:8080 |
| Proxy gRPC | proxy:8081 | localhost:8081 |
diff --git a/deploy/rocketmq/conf/broker-1.conf
b/deploy/rocketmq/conf/broker-1.conf
index b8afc2d6..b26d6b72 100644
--- a/deploy/rocketmq/conf/broker-1.conf
+++ b/deploy/rocketmq/conf/broker-1.conf
@@ -1,6 +1,8 @@
brokerClusterName=rocketmq-studio
brokerName=rocketmq-studio-1
brokerId=0
+# 与 broker-0 端口错开：listenPort=20911，fastListenPort 自动为 20909，haListenPort 自动为
20912
+listenPort=20911
brokerRole=ASYNC_MASTER
flushDiskType=ASYNC_FLUSH
deleteWhen=04
diff --git a/deploy/rocketmq/docker-compose.yml
b/deploy/rocketmq/docker-compose.yml
index 9e9a2f8a..76889124 100644
--- a/deploy/rocketmq/docker-compose.yml
+++ b/deploy/rocketmq/docker-compose.yml
@@ -47,11 +47,11 @@ services:
- ./conf/broker-1.conf:/etc/rocketmq/broker-1.conf:ro
- broker-1-store:/home/rocketmq/store
- broker-1-logs:/home/rocketmq/logs
- # 容器内仍监听 10911，宿主机端口错开避免冲突
+ # broker-1 在配置里直接监听 20909/20911/20912，宿主机 1:1 映射
ports:
- - "10919:10909"
- - "10921:10911"
- - "10922:10912"
+ - "20909:20909"
+ - "20911:20911"
+ - "20912:20912"
depends_on:
- nameserver
diff --git
a/server/src/test/java/com/rocketmq/studio/cluster/nameserver/NameServerControllerTest.java
b/server/src/test/java/org/apache/rocketmq/studio/cluster/nameserver/NameServerControllerTest.java
similarity index 100%
rename from
server/src/test/java/com/rocketmq/studio/cluster/nameserver/NameServerControllerTest.java
rename to
server/src/test/java/org/apache/rocketmq/studio/cluster/nameserver/NameServerControllerTest.java
