From 9896960b0b1b9ddb3212b38406620208c49b2857 Mon Sep 17 00:00:00 2001 From: mxsm Date: Tue, 14 Jan 2025 14:50:51 +0800 Subject: [PATCH] =?UTF-8?q?[ISSUE=20#2234]=E2=9A=A1=EF=B8=8FOptimize=20Bro?= =?UTF-8?q?kerRuntimeInner=20register=5Fbroker=5Fall=20method=20paramters?= =?UTF-8?q?=F0=9F=A6=BA=20(#2235)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rocketmq-broker/src/broker_runtime.rs | 12 +++++++----- rocketmq-common/src/common/broker/broker_config.rs | 4 ++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/rocketmq-broker/src/broker_runtime.rs b/rocketmq-broker/src/broker_runtime.rs index 6885e1ad..df0da72a 100644 --- a/rocketmq-broker/src/broker_runtime.rs +++ b/rocketmq-broker/src/broker_runtime.rs @@ -1093,11 +1093,13 @@ impl BrokerRuntimeInner { topic_config_wrapper, vec![], oneway, - 10000, - false, - false, - None, - Default::default(), + this.broker_config.register_broker_timeout_mills as u64, + this.broker_config.enable_slave_acting_master, + this.broker_config.compressed_register, + this.broker_config + .enable_slave_acting_master + .then_some(this.broker_config.broker_not_active_timeout_millis), + Default::default(), //optimize this.clone(), ) .await; diff --git a/rocketmq-common/src/common/broker/broker_config.rs b/rocketmq-common/src/common/broker/broker_config.rs index 059d8671..108e780a 100644 --- a/rocketmq-common/src/common/broker/broker_config.rs +++ b/rocketmq-common/src/common/broker/broker_config.rs @@ -197,6 +197,8 @@ pub struct BrokerConfig { pub revive_scan_time: u64, pub enable_skip_long_awaiting_ack: bool, pub skip_when_ck_re_put_reach_max_times: bool, + pub compressed_register: bool, + pub broker_not_active_timeout_millis: i64, } impl Default for BrokerConfig { @@ -299,6 +301,8 @@ impl Default for BrokerConfig { revive_scan_time: 10_000, enable_skip_long_awaiting_ack: false, skip_when_ck_re_put_reach_max_times: false, + compressed_register: false, + broker_not_active_timeout_millis: 10_000, } } }