Skip to content

O
oceanbase

Metz / oceanbase
与 Fork 源项目一致

Fork自 oceanbase / oceanbase

通知 1
Star 0
Fork 0
O
oceanbase
提交 b307e664 编写于 作者: H HaHaJeff 提交者： wangzelin.wzl
浏览文件
操作

Support rebuild in leader reconfirm

上级 4acae240
隐藏空白更改
内联 并排
Showing with 16 addition and 15 deletion
src/storage/ob_partition_migrator.cpp
浏览文件 @ b307e664
...@@ -5914,18 +5914,17 @@ int ObMigratePrepareTask::try_hold_local_partition() ...@@ -5914,18 +5914,17 @@ int ObMigratePrepareTask::try_hold_local_partition()
LOG_WARN("failed to get leader", K(ret), "arg", ctx_->replica_op_arg_); LOG_WARN("failed to get leader", K(ret), "arg", ctx_->replica_op_arg_);
} else if (OB_FAIL(partition->get_role(role))) { } else if (OB_FAIL(partition->get_role(role))) {
LOG_WARN("failed to get partition role", K(ret), "arg", ctx_->replica_op_arg_); LOG_WARN("failed to get partition role", K(ret), "arg", ctx_->replica_op_arg_);
} else if (leader.is_valid() } else if (leader.is_valid() &&
&& leader == MYADDR leader == MYADDR
// support rebuild in leader reconfirm // support rebuild in leader reconfirm
&& is_strong_leader(role) && partition->get_log_service()->is_leader_active()
//TODO(wait yanmu) // TODO(wait yanmu)
//&& is_strong_leader(role) //&& is_strong_leader(role)
&& (ADD_REPLICA_OP == ctx_->replica_op_arg_.type_ && (ADD_REPLICA_OP == ctx_->replica_op_arg_.type_ || MIGRATE_REPLICA_OP == ctx_->replica_op_arg_.type_ ||
|| MIGRATE_REPLICA_OP == ctx_->replica_op_arg_.type_ FAST_MIGRATE_REPLICA_OP == ctx_->replica_op_arg_.type_ ||
|| FAST_MIGRATE_REPLICA_OP == ctx_->replica_op_arg_.type_ REBUILD_REPLICA_OP == ctx_->replica_op_arg_.type_ ||
|| REBUILD_REPLICA_OP == ctx_->replica_op_arg_.type_ CHANGE_REPLICA_OP == ctx_->replica_op_arg_.type_ ||
|| CHANGE_REPLICA_OP == ctx_->replica_op_arg_.type_ LINK_SHARE_MAJOR_OP == ctx_->replica_op_arg_.type_)) {
|| LINK_SHARE_MAJOR_OP == ctx_->replica_op_arg_.type_)) {
if (REBUILD_REPLICA_OP == ctx_->replica_op_arg_.type_) { if (REBUILD_REPLICA_OP == ctx_->replica_op_arg_.type_) {
if (OB_FAIL(MIGRATOR.get_partition_service()->turn_off_rebuild_flag(ctx_->replica_op_arg_))) { if (OB_FAIL(MIGRATOR.get_partition_service()->turn_off_rebuild_flag(ctx_->replica_op_arg_))) {
LOG_WARN("Failed to report_rebuild_replica off", K(ret), "arg", ctx_->replica_op_arg_); LOG_WARN("Failed to report_rebuild_replica off", K(ret), "arg", ctx_->replica_op_arg_);
...@@ -8112,9 +8111,11 @@ int ObMigratePostPrepareTask::deal_with_rebuild_partition() ...@@ -8112,9 +8111,11 @@ int ObMigratePostPrepareTask::deal_with_rebuild_partition()
LOG_WARN("failed to get leader", K(ret), "arg", ctx_->replica_op_arg_); LOG_WARN("failed to get leader", K(ret), "arg", ctx_->replica_op_arg_);
} else if (OB_FAIL(partition->get_role(role))) { } else if (OB_FAIL(partition->get_role(role))) {
LOG_WARN("failed to get real role", K(ret), "arg", ctx_->replica_op_arg_); LOG_WARN("failed to get real role", K(ret), "arg", ctx_->replica_op_arg_);
} else if (leader.is_valid() && leader == MYADDR } else if (leader.is_valid() &&
// support rebuild in leader reconfirm leader == MYADDR
&& is_strong_leader(role)) { // support rebuild in leader reconfirm
&&
partition->get_log_service()->is_leader_active()) { // TODO(wait for yanmu) //&& is_strong_leader(role)) {
if (OB_FAIL(MIGRATOR.get_partition_service()->turn_off_rebuild_flag(ctx_->replica_op_arg_))) { if (OB_FAIL(MIGRATOR.get_partition_service()->turn_off_rebuild_flag(ctx_->replica_op_arg_))) {
LOG_WARN("Failed to report_rebuild_replica off", K(ret), "arg", ctx_->replica_op_arg_); LOG_WARN("Failed to report_rebuild_replica off", K(ret), "arg", ctx_->replica_op_arg_);
} else { } else {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或