This is an automated email from the ASF dual-hosted git repository. jinrongtong pushed a commit to branch develop-merge-5.0.0 in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 833e9e0e07485489a5522262b0a9862c7f0df46c Author: RongtongJin <[email protected]> AuthorDate: Fri Jul 8 15:16:18 2022 +0800 Polish conf/container directory --- .../2container-2m-2s/broker-a-in-container1.conf | 3 +- .../2container-2m-2s/broker-a-in-container2.conf | 3 +- .../2container-2m-2s/broker-b-in-container1.conf | 3 +- .../2container-2m-2s/broker-b-in-container2.conf | 3 +- distribution/conf/container/broker-a.conf | 34 ---------------------- distribution/conf/container/broker-b.conf | 34 ---------------------- distribution/conf/container/broker-container.conf | 24 --------------- docs/cn/BrokerContainer.md | 2 +- 8 files changed, 5 insertions(+), 101 deletions(-) diff --git a/distribution/conf/container/2container-2m-2s/broker-a-in-container1.conf b/distribution/conf/container/2container-2m-2s/broker-a-in-container1.conf index 6bf68f8ba..8da6011a5 100644 --- a/distribution/conf/container/2container-2m-2s/broker-a-in-container1.conf +++ b/distribution/conf/container/2container-2m-2s/broker-a-in-container1.conf @@ -31,5 +31,4 @@ slaveReadEnable=true brokerHeartbeatInterval=1000 brokerNotActiveTimeoutMillis=5000 sendHeartbeatTimeoutMillis=1000 -enableSlaveActingMaster=true -isolateLogEnable=true \ No newline at end of file +enableSlaveActingMaster=true \ No newline at end of file diff --git a/distribution/conf/container/2container-2m-2s/broker-a-in-container2.conf b/distribution/conf/container/2container-2m-2s/broker-a-in-container2.conf index d1654dd4d..c654bf8c6 100644 --- a/distribution/conf/container/2container-2m-2s/broker-a-in-container2.conf +++ b/distribution/conf/container/2container-2m-2s/broker-a-in-container2.conf @@ -31,5 +31,4 @@ slaveReadEnable=true brokerHeartbeatInterval=1000 brokerNotActiveTimeoutMillis=5000 sendHeartbeatTimeoutMillis=1000 -enableSlaveActingMaster=true -isolateLogEnable=true \ No newline at end of file +enableSlaveActingMaster=true \ No newline at end of file diff --git a/distribution/conf/container/2container-2m-2s/broker-b-in-container1.conf b/distribution/conf/container/2container-2m-2s/broker-b-in-container1.conf index 46f15b4fd..6e8f896d1 100644 --- a/distribution/conf/container/2container-2m-2s/broker-b-in-container1.conf +++ b/distribution/conf/container/2container-2m-2s/broker-b-in-container1.conf @@ -31,5 +31,4 @@ slaveReadEnable=true brokerHeartbeatInterval=1000 brokerNotActiveTimeoutMillis=5000 sendHeartbeatTimeoutMillis=1000 -enableSlaveActingMaster=true -isolateLogEnable=true \ No newline at end of file +enableSlaveActingMaster=true \ No newline at end of file diff --git a/distribution/conf/container/2container-2m-2s/broker-b-in-container2.conf b/distribution/conf/container/2container-2m-2s/broker-b-in-container2.conf index caa2b18a7..cf9f803ea 100644 --- a/distribution/conf/container/2container-2m-2s/broker-b-in-container2.conf +++ b/distribution/conf/container/2container-2m-2s/broker-b-in-container2.conf @@ -31,5 +31,4 @@ slaveReadEnable=true brokerHeartbeatInterval=1000 brokerNotActiveTimeoutMillis=5000 sendHeartbeatTimeoutMillis=1000 -enableSlaveActingMaster=true -isolateLogEnable=true \ No newline at end of file +enableSlaveActingMaster=true \ No newline at end of file diff --git a/distribution/conf/container/broker-a.conf b/distribution/conf/container/broker-a.conf deleted file mode 100644 index e67b9590d..000000000 --- a/distribution/conf/container/broker-a.conf +++ /dev/null @@ -1,34 +0,0 @@ -# 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. - -#Master配置 -brokerClusterName=DefaultCluster -brokerName=broker-a -brokerId=0 -brokerRole=SYNC_MASTER -flushDiskType=ASYNC_FLUSH -storePathRootDir=/disk1/rocketmq/broker-a/store -storePathCommitLog=/disk1/rocketmq/broker-a/store/commitlog -listenPort=10911 -haListenPort=10912 -totalReplicas=2 -inSyncReplicas=2 -minInSyncReplicas=1 -enableAutoInSyncReplicas=true -slaveReadEnable=true -brokerHeartbeatInterval=1000 -brokerNotActiveTimeoutMillis=5000 -sendHeartbeatTimeoutMillis=1000 -enableSlaveActingMaster=true \ No newline at end of file diff --git a/distribution/conf/container/broker-b.conf b/distribution/conf/container/broker-b.conf deleted file mode 100644 index 7a009f504..000000000 --- a/distribution/conf/container/broker-b.conf +++ /dev/null @@ -1,34 +0,0 @@ -# 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. - -#Slave配置 -brokerClusterName=DefaultCluster -brokerName=broker-b -brokerId=1 -brokerRole=SLAVE -flushDiskType=ASYNC_FLUSH -storePathRootDir=/disk2/rocketmq/broker-b/store -storePathCommitLog=/disk2/rocketmq/broker-b/store/commitlog -listenPort=20911 -haListenPort=20912 -totalReplicas=2 -inSyncReplicas=2 -minInSyncReplicas=1 -enableAutoInSyncReplicas=true -slaveReadEnable=true -brokerHeartbeatInterval=1000 -brokerNotActiveTimeoutMillis=5000 -sendHeartbeatTimeoutMillis=1000 -enableSlaveActingMaster=true \ No newline at end of file diff --git a/distribution/conf/container/broker-container.conf b/distribution/conf/container/broker-container.conf deleted file mode 100644 index d0b4fdc42..000000000 --- a/distribution/conf/container/broker-container.conf +++ /dev/null @@ -1,24 +0,0 @@ -# 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. - -#配置端口，用于接收mqadmin命令 -listenPort=10811 -#指定namesrv -namesrvAddr=127.0.0.1:9876 -#或指定自动获取namesrv -fetchNamesrvAddrByAddressServer=true -#指定要向BrokerContainer内添加的brokerConfig路径，多个config间用“:”分隔； -#不指定则只启动BrokerConainer，具体broker可通过mqadmin工具添加 -brokerConfigPaths=/home/admin/broker-a.conf:/home/admin/broker-b.conf \ No newline at end of file diff --git a/docs/cn/BrokerContainer.md b/docs/cn/BrokerContainer.md index 94a235523..c641014a9 100644 --- a/docs/cn/BrokerContainer.md +++ b/docs/cn/BrokerContainer.md @@ -128,7 +128,7 @@ eg.假设broker获取到的配额是500g（根据replicasPerDiskPartition计算 **开发者需要注意!** -在BrokerContainer模式下，多个broker会在同一个BrokerContainer进程中，因此所有broker的日志将会输出到同一个日志文件中，BrokerContainer模式下将提供broker日志分离功能，通过BrokerConfig配置isolateLogEnable=true进行开启，开启后不同broker的日志将会输出到不同文件中。 +在BrokerContainer模式下，多个broker会在同一个BrokerContainer进程中，BrokerContainer模式下将提供broker日志分离功能，不同broker的日志将会输出到不同文件中。 主要通过线程名（ThreadName）或者通过设置线程本地变量（ThreadLocal）来区分不同broker线程，并且hack logback的logAppender将日志重定向到不同的文件中。
