Skip to content

[ISSUE #1277]⚡️Optimize name server DefaultRequestProcessor#wipe_write_perm_of_broker_by_lock #1278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rocketmq-namesrv/src/processor/default_request_processor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
.expect("decode WipeWritePermOfBrokerRequestHeader failed");
let wipe_topic_cnt = self
.route_info_manager
.wipe_write_perm_of_broker_by_lock(request_header.broker_name.as_str());
.wipe_write_perm_of_broker_by_lock(&request_header.broker_name);

Check warning on line 323 in rocketmq-namesrv/src/processor/default_request_processor.rs

View check run for this annotation

Codecov / codecov/patch

rocketmq-namesrv/src/processor/default_request_processor.rs#L323

Added line #L323 was not covered by tests
RemotingCommand::create_response_command()
.set_command_custom_header(WipeWritePermOfBrokerResponseHeader::new(wipe_topic_cnt))
}
Expand All @@ -331,7 +331,7 @@
.expect("decode AddWritePermOfBrokerRequestHeader failed");
let add_topic_cnt = self
.route_info_manager
.add_write_perm_of_broker_by_lock(request_header.broker_name.as_str());
.add_write_perm_of_broker_by_lock(&request_header.broker_name);

Check warning on line 334 in rocketmq-namesrv/src/processor/default_request_processor.rs

View check run for this annotation

Codecov / codecov/patch

rocketmq-namesrv/src/processor/default_request_processor.rs#L334

Added line #L334 was not covered by tests
RemotingCommand::create_response_command()
.set_command_custom_header(AddWritePermOfBrokerResponseHeader::new(add_topic_cnt))
}
Expand Down
29 changes: 21 additions & 8 deletions rocketmq-namesrv/src/route/route_info_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -675,22 +675,35 @@
Some(group_member)
}

pub(crate) fn wipe_write_perm_of_broker_by_lock(&mut self, broker_name: &str) -> i32 {
self.operate_write_perm_of_broker(broker_name, RequestCode::WipeWritePermOfBroker)
#[inline]
pub(crate) fn wipe_write_perm_of_broker_by_lock(&self, broker_name: &CheetahString) -> i32 {
let lock = self.lock.write();
let cnt =
self.operate_write_perm_of_broker(broker_name, RequestCode::WipeWritePermOfBroker);
drop(lock);
cnt

Check warning on line 684 in rocketmq-namesrv/src/route/route_info_manager.rs

View check run for this annotation

Codecov / codecov/patch

rocketmq-namesrv/src/route/route_info_manager.rs#L679-L684

Added lines #L679 - L684 were not covered by tests
}

pub(crate) fn add_write_perm_of_broker_by_lock(&mut self, broker_name: &str) -> i32 {
self.operate_write_perm_of_broker(broker_name, RequestCode::AddWritePermOfBroker)
#[inline]
pub(crate) fn add_write_perm_of_broker_by_lock(&self, broker_name: &CheetahString) -> i32 {
let lock = self.lock.write();
let cnt = self.operate_write_perm_of_broker(broker_name, RequestCode::AddWritePermOfBroker);
drop(lock);
cnt

Check warning on line 692 in rocketmq-namesrv/src/route/route_info_manager.rs

View check run for this annotation

Codecov / codecov/patch

rocketmq-namesrv/src/route/route_info_manager.rs#L688-L692

Added lines #L688 - L692 were not covered by tests
}

fn operate_write_perm_of_broker(
&mut self,
broker_name: &str,
&self,
broker_name: &CheetahString,

Check warning on line 697 in rocketmq-namesrv/src/route/route_info_manager.rs

View check run for this annotation

Codecov / codecov/patch

rocketmq-namesrv/src/route/route_info_manager.rs#L696-L697

Added lines #L696 - L697 were not covered by tests
request_code: RequestCode,
) -> i32 {
let mut topic_cnt = 0;
for (_topic, qd_map) in self.topic_queue_table.iter_mut() {
let qd = qd_map.get_mut(broker_name).unwrap();
for (_topic, qd_map) in self.topic_queue_table.mut_from_ref().iter_mut() {
let qd = qd_map.get_mut(broker_name);
if qd.is_none() {
continue;
}
let qd = qd.unwrap();

Check warning on line 706 in rocketmq-namesrv/src/route/route_info_manager.rs

View check run for this annotation

Codecov / codecov/patch

rocketmq-namesrv/src/route/route_info_manager.rs#L701-L706

Added lines #L701 - L706 were not covered by tests
let mut perm = qd.perm;
match request_code {
RequestCode::WipeWritePermOfBroker => {
Expand Down
Loading