Skip to content
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.

Sign up for GitHub

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

Add BrokerOperatorResult and RollbackStats #1505

Closed
wants to merge 1 commit into from
Closed

Add BrokerOperatorResult and RollbackStats #1505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions rocketmq-broker/src/processor/admin_broker_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ use crate::processor::pop_inflight_message_counter::PopInflightMessageCounter;
use crate::schedule::schedule_message_service::ScheduleMessageService;
use crate::topic::manager::topic_config_manager::TopicConfigManager;
use crate::topic::manager::topic_queue_mapping_manager::TopicQueueMappingManager;
use rocketmq_remoting::protocol::admin::broker_operator_result::BrokerOperatorResult;
use rocketmq_remoting::protocol::admin::rollback_stats::RollbackStats;

mod batch_mq_handler;
mod broker_config_request_handler;
Expand Down
14 changes: 8 additions & 6 deletions rocketmq-tools/src/admin/mq_admin_ext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ use rocketmq_remoting::protocol::heartbeat::subscription_data::SubscriptionData;
use rocketmq_remoting::protocol::route::topic_route_data::TopicRouteData;
use rocketmq_remoting::protocol::static_topic::topic_queue_mapping_detail::TopicQueueMappingDetail;
use rocketmq_remoting::protocol::subscription::subscription_group_config::SubscriptionGroupConfig;
use rocketmq_remoting::protocol::admin::broker_operator_result::BrokerOperatorResult;
use rocketmq_remoting::protocol::admin::rollback_stats::RollbackStats;

use crate::admin::common::admin_tool_result::AdminToolResult;
use crate::Result;
Expand Down Expand Up @@ -205,11 +207,11 @@ pub trait MQAdminExt {
topic: CheetahString,
) -> Result<()>;

/*fn delete_topic_in_broker_concurrent(
fn delete_topic_in_broker_concurrent(
&self,
addrs: HashSet<CheetahString>,
topic: CheetahString,
) -> AdminToolResult<BrokerOperatorResult>;*/
) -> AdminToolResult<BrokerOperatorResult>;

fn delete_topic_in_name_server(
&self,
Expand All @@ -234,13 +236,13 @@ pub trait MQAdminExt {

fn delete_kv_config(&self, namespace: CheetahString, key: CheetahString) -> Result<()>;

/*fn reset_offset_by_timestamp_old(
fn reset_offset_by_timestamp_old(
&self,
consumer_group: CheetahString,
topic: CheetahString,
timestamp: u64,
force: bool,
) -> Result<Vec<RollbackStats>>;*/
) -> Result<Vec<RollbackStats>>;

fn reset_offset_by_timestamp(
&self,
Expand All @@ -258,12 +260,12 @@ pub trait MQAdminExt {
timestamp: u64,
) -> Result<()>;

/*fn reset_offset_new_concurrent(
fn reset_offset_new_concurrent(
&self,
group: CheetahString,
topic: CheetahString,
timestamp: u64,
) -> AdminToolResult<BrokerOperatorResult>;*/
) -> AdminToolResult<BrokerOperatorResult>;

fn get_consume_status(
&self,
Expand Down
14 changes: 8 additions & 6 deletions rocketmq-tools/src/admin/mq_admin_ext_async.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ use rocketmq_remoting::protocol::heartbeat::subscription_data::SubscriptionData;
use rocketmq_remoting::protocol::route::topic_route_data::TopicRouteData;
use rocketmq_remoting::protocol::static_topic::topic_queue_mapping_detail::TopicQueueMappingDetail;
use rocketmq_remoting::protocol::subscription::subscription_group_config::SubscriptionGroupConfig;
use rocketmq_remoting::protocol::admin::broker_operator_result::BrokerOperatorResult;
use rocketmq_remoting::protocol::admin::rollback_stats::RollbackStats;

use crate::admin::common::admin_tool_result::AdminToolResult;
use crate::Result;
Expand Down Expand Up @@ -220,11 +222,11 @@ pub trait MQAdminExtLocal: Sync {
topic: CheetahString,
) -> Result<()>;

/*async fn delete_topic_in_broker_concurrent(
async fn delete_topic_in_broker_concurrent(
&self,
addrs: HashSet<CheetahString>,
topic: CheetahString,
) -> AdminToolResult<BrokerOperatorResult>;*/
) -> AdminToolResult<BrokerOperatorResult>;

async fn delete_topic_in_name_server(
&self,
Expand All @@ -249,13 +251,13 @@ pub trait MQAdminExtLocal: Sync {

async fn delete_kv_config(&self, namespace: CheetahString, key: CheetahString) -> Result<()>;

/*async fn reset_offset_by_timestamp_old(
async fn reset_offset_by_timestamp_old(
&self,
consumer_group: CheetahString,
topic: CheetahString,
timestamp: u64,
force: bool,
) -> Result<Vec<RollbackStats>>;*/
) -> Result<Vec<RollbackStats>>;

async fn reset_offset_by_timestamp(
&self,
Expand All @@ -273,12 +275,12 @@ pub trait MQAdminExtLocal: Sync {
timestamp: u64,
) -> Result<()>;

/*async fn reset_offset_new_concurrent(
async fn reset_offset_new_concurrent(
&self,
group: CheetahString,
topic: CheetahString,
timestamp: u64,
) -> AdminToolResult<BrokerOperatorResult>;*/
) -> AdminToolResult<BrokerOperatorResult>;

async fn get_consume_status(
&self,
Expand Down
Loading