-
Notifications
You must be signed in to change notification settings - Fork 113
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
[ISSUE #2223]💫Remove BrokerRuntime unused code and enhancement code🧑💻 #2224
Conversation
WalkthroughThe pull request modifies the Changes
Assessment against linked issues
Possibly related issues
Possibly related PRs
Suggested labels
Suggested reviewers
Poem
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
Documentation and Community
|
🔊@mxsm 🚀Thanks for your contribution🎉! 💡CodeRabbit(AI) will review your code first🔥! Note 🚨The code review suggestions from CodeRabbit are to be used as a reference only, and the PR submitter can decide whether to make changes based on their own judgment. Ultimately, the project management personnel will conduct the final code review💥. |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2224 +/- ##
==========================================
+ Coverage 28.35% 28.37% +0.01%
==========================================
Files 498 498
Lines 72058 72012 -46
==========================================
Hits 20435 20435
+ Misses 51623 51577 -46 ☔ View full report in Codecov by Sentry. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 1
🔭 Outside diff range comments (1)
rocketmq-broker/src/broker_runtime.rs (1)
Line range hint
184-208
: Assign the initializedshould_start_time
toinner
to ensure consistencyAt lines 184-208, you initialize
should_start_time
withArc::new(AtomicU64::new(0))
, but when constructinginner
, you setshould_start_time
toDefault::default()
instead of the initialized value. This can lead to inconsistencies, especially sincepop_inflight_message_counter
relies on the initializedshould_start_time
. Consider assigning the initializedshould_start_time
toinner.should_start_time
to maintain consistency.Apply this diff to fix the issue:
let should_start_time = Arc::new(AtomicU64::new(0)); let pop_inflight_message_counter = PopInflightMessageCounter::new(should_start_time.clone()); let mut inner = ArcMut::new(BrokerRuntimeInner::<DefaultMessageStore> { store_host, broker_config, message_store_config, server_config, topic_config_manager: None, topic_queue_mapping_manager, consumer_offset_manager: Default::default(), subscription_group_manager: None, consumer_filter_manager: Some(Default::default()), consumer_order_info_manager: None, message_store: None, broker_stats: None, schedule_message_service: Default::default(), timer_message_store: None, broker_outer_api, producer_manager, consumer_manager, broadcast_offset_manager: Default::default(), - broker_stats_manager: None, - topic_queue_mapping_clean_service: None, - update_master_haserver_addr_periodically: false, - should_start_time: Default::default(), + broker_stats_manager: None, + topic_queue_mapping_clean_service: None, + update_master_haserver_addr_periodically: false, + should_start_time: should_start_time.clone(), is_isolated: Default::default(), pull_request_hold_service: None, rebalance_lock_manager: Default::default(), broker_member_group, transactional_message_check_listener: None, transactional_message_check_service: None, transaction_metrics_flush_service: None, topic_route_info_manager: None, escape_bridge: None, pop_inflight_message_counter, });
🧹 Nitpick comments (1)
rocketmq-broker/src/broker_runtime.rs (1)
223-230
: Avoid unnecessary cloning ofinner
to improve performanceIn lines 224-229,
inner
is cloned multiple times when setting upstats_manager
. Cloninginner
can be expensive if it contains large data structures. Consider using references (&inner
) orArc
to avoid unnecessary cloning and improve performance.Apply this diff to optimize the code:
let mut stats_manager = BrokerStatsManager::new(Arc::new(inner.broker_config.clone())); stats_manager.set_producer_state_getter(Arc::new(ProducerStateGetter { - broker_runtime_inner: inner.clone(), + broker_runtime_inner: inner.clone(), // Use Arc or reference if possible })); stats_manager.set_consumer_state_getter(Arc::new(ConsumerStateGetter { - broker_runtime_inner: inner.clone(), + broker_runtime_inner: inner.clone(), // Use Arc or reference if possible }));Consider changing the
ProducerStateGetter
andConsumerStateGetter
to accept references orArc
to avoid cloninginner
.
📜 Review details
Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
rocketmq-broker/src/broker_runtime.rs
(7 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (9)
- GitHub Check: build (windows-latest, nightly)
- GitHub Check: build (windows-latest, stable)
- GitHub Check: build (macos-latest, nightly)
- GitHub Check: build (macos-latest, stable)
- GitHub Check: test
- GitHub Check: build (ubuntu-latest, nightly)
- GitHub Check: build
- GitHub Check: auto-approve
- GitHub Check: build (ubuntu-latest, stable)
🔇 Additional comments (2)
rocketmq-broker/src/broker_runtime.rs (2)
329-329
:⚠️ Potential issueEnsure
broker_stats_manager
is initialized before usage to preventNone
errorsAt line 329,
self.inner.broker_stats_manager.clone()
is used in initializingDefaultMessageStore
. Sincebroker_stats_manager
is anOption
, there is a risk of it beingNone
, which could lead to a runtime error. Ensure thatbroker_stats_manager
is properly initialized before this point.
1291-1294
: 🛠️ Refactor suggestion
⚠️ Potential issueImplement or remove the unimplemented
broker_stats_manager_mut
methodThe method
broker_stats_manager_mut
at lines 1291-1294 is currently unimplemented and will panic if called. If this method is intended for future use, provide an implementation. Otherwise, consider removing it to prevent accidental usage that could cause a panic.#[inline] pub fn broker_stats_manager_mut(&mut self) -> &mut BrokerStatsManager { - /* &mut self.broker_stats_manager */ - unimplemented!("broker_stats_manager_mut") + self.broker_stats_manager.as_mut().expect("broker_stats_manager is not initialized") }Alternatively, if
broker_stats_manager
should always be initialized, you can implement the method to return the mutable reference safely.Likely invalid or redundant comment.
self.broker_stats_manager.as_ref().unwrap() | ||
} | ||
|
||
#[inline] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Handle potential None
value to prevent panic in broker_stats_manager
method
In the accessor method at lines 1576-1579, broker_stats_manager
unconditionally unwraps the Option
without checking for None
. This can cause a panic if broker_stats_manager
is not initialized. Consider using expect
with a descriptive message or handling the None
case appropriately.
Apply this diff to improve the error handling:
#[inline]
pub fn broker_stats_manager(&self) -> &BrokerStatsManager {
- self.broker_stats_manager.as_ref().unwrap()
+ self.broker_stats_manager.as_ref().expect("broker_stats_manager is not initialized")
}
This provides a clearer message in case of a panic and helps with debugging.
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
self.broker_stats_manager.as_ref().unwrap() | |
} | |
#[inline] | |
self.broker_stats_manager.as_ref().expect("broker_stats_manager is not initialized") | |
} | |
#[inline] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Which Issue(s) This PR Fixes(Closes)
Fixes #2223
Brief Description
How Did You Test This Change?
Summary by CodeRabbit
Refactor
Changes