-
Notifications
You must be signed in to change notification settings - Fork 119
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
[ISSUE #2265]🚀ScheduleMessageService and TopicRouteInfoManager add shutdown method #2266
Conversation
WalkthroughThis pull request adds a Changes
Assessment against linked 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💥. |
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: 2
🧹 Nitpick comments (1)
rocketmq-broker/src/schedule/schedule_message_service.rs (1)
44-46
: Consider relationship between shutdown() and stop() methodsThe struct already implements a
stop()
method from theConfigManager
trait. Consider:
- Implementing shutdown logic in
stop()
and havingshutdown()
callstop()
- Or document the difference between these methods if they serve different purposes
Additionally, consider implementing proper cleanup:
pub fn shutdown(&mut self) { - warn!("ScheduleMessageService shutdown not implemented"); + // Clean up broker config resources + // TODO: Add cleanup logic + warn!("ScheduleMessageService shutdown implementation pending"); }
📜 Review details
Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (2)
rocketmq-broker/src/schedule/schedule_message_service.rs
(2 hunks)rocketmq-broker/src/topic/manager/topic_route_info_manager.rs
(1 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: build (ubuntu-latest, nightly)
- GitHub Check: test
- GitHub Check: build (ubuntu-latest, stable)
- GitHub Check: build
- GitHub Check: auto-approve
pub fn shutdown(&mut self) { | ||
warn!("TopicRouteInfoManager shutdown not implemented"); | ||
} |
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.
🛠️ Refactor suggestion
Add shutdown state verification in public methods
To prevent usage after shutdown, add state checks in public methods:
fn verify_running(&self) -> Result<(), &'static str> {
match *self.state.as_ref() {
ServiceState::Running => Ok(()),
ServiceState::Shutdown => Err("Service is shutdown"),
}
}
This should be called at the start of methods like update_topic_route_info_from_name_server_ext
, try_to_find_topic_publish_info
, etc.
Implement proper resource cleanup in shutdown
The current implementation lacks critical shutdown logic:
- The tokio task spawned in
start()
needs to be cancelled - Shared resources (Arc/Mutex) should be properly cleaned up
- Consider adding shutdown synchronization
Here's a suggested implementation:
+#[derive(Default)]
+enum ServiceState {
+ #[default]
+ Running,
+ Shutdown,
+}
pub struct TopicRouteInfoManager<MS> {
+ state: ArcMut<ServiceState>,
+ shutdown_complete: Option<tokio::sync::oneshot::Sender<()>>,
// ... other fields ...
}
pub fn shutdown(&mut self) {
- warn!("TopicRouteInfoManager shutdown not implemented");
+ // Set state to shutdown to stop the background task
+ *self.state.mut_from_ref() = ServiceState::Shutdown;
+
+ // Signal shutdown
+ if let Some(shutdown) = self.shutdown_complete.take() {
+ let _ = shutdown.send(());
+ }
+
+ // Clear tables
+ self.topic_route_table.mut_from_ref().clear();
+ self.broker_addr_table.mut_from_ref().clear();
+ self.topic_publish_info_table.mut_from_ref().clear();
+ self.topic_subscribe_info_table.mut_from_ref().clear();
+
+ info!("TopicRouteInfoManager shutdown complete");
}
Committable suggestion skipped: line range outside the PR's diff.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2266 +/- ##
==========================================
- Coverage 28.30% 28.29% -0.01%
==========================================
Files 503 503
Lines 72215 72221 +6
==========================================
Hits 20437 20437
- Misses 51778 51784 +6 ☔ View full report in Codecov by Sentry. |
Which Issue(s) This PR Fixes(Closes)
Fixes #2265
Brief Description
How Did You Test This Change?
Summary by CodeRabbit
ScheduleMessageService
andTopicRouteInfoManager