Skip to content

[fix][store] Fixed a bug where regions could not be deleted during the merging process. #1433

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

Merged
rock-git merged 1 commit into from
Dec 30, 2025
Merged

[fix][store] Fixed a bug where regions could not be deleted during the merging process. #1433

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
5 changes: 3 additions & 2 deletions src/coordinator/coordinator_control.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,8 @@ class CoordinatorControl : public MetaControl {
pb::coordinator_internal::MetaIncrement &meta_increment);
void AddSnapshotVectorIndexTask(pb::coordinator::Task *region_save_vector_task, int64_t store_id, int64_t region_id,
int64_t snapshot_log_id, pb::coordinator_internal::MetaIncrement &meta_increment);
static void AddCheckSplitResultTask(pb::coordinator::Task *check_split_result_task, int64_t store_id, int64_t split_to_region_id);
static void AddCheckSplitResultTask(pb::coordinator::Task *check_split_result_task, int64_t store_id,
int64_t split_to_region_id);
static void AddCheckStoreVectorIndexTask(pb::coordinator::Task *check_vector_task, int64_t store_id,
int64_t region_id, int64_t vector_index_version);
static void AddCheckVectorIndexSnapshotLogIdTask(pb::coordinator::Job *job, int64_t store_id, int64_t region_id,
Expand Down Expand Up @@ -1012,9 +1013,9 @@ class CoordinatorControl : public MetaControl {

butil::Status GetAllPresentId(std::vector<std::pair<pb::coordinator::IdEpochType, int64_t>> &id_epoch_type_values);

private:
butil::Status ValidateJobConflict(int64_t region_id, int64_t second_region_id);

private:
butil::Status GenerateTableIdAndPartIds(int64_t schema_id, int64_t part_count, pb::meta::EntityType entity_type,
pb::coordinator_internal::MetaIncrement &meta_increment,
pb::meta::TableIdWithPartIds *ids);
Expand Down
7 changes: 0 additions & 7 deletions src/coordinator/coordinator_control_coor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2446,13 +2446,6 @@ butil::Status CoordinatorControl::DropRegion(int64_t region_id,
butil::Status CoordinatorControl::DropRegionFinal(int64_t region_id,
std::vector<pb::coordinator::StoreOperation>& store_operations,
pb::coordinator_internal::MetaIncrement& meta_increment) {
auto validate_ret = ValidateJobConflict(region_id, region_id);
if (!validate_ret.ok()) {
DINGO_LOG(ERROR) << fmt::format("validate task list conflict failed, region_id:{}, error_code:{}, error_msg:{}",
region_id, validate_ret.error_code(), validate_ret.error_str());
return validate_ret;
}

// set region state to DELETE
bool need_update_epoch = false;
{
Expand Down
10 changes: 10 additions & 0 deletions src/server/coordinator_service.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1424,6 +1424,16 @@ void DoDropRegion(google::protobuf::RpcController * /*controller*/, const pb::co

auto region_id = request->region_id();

auto validate_ret = coordinator_control->ValidateJobConflict(region_id, region_id);
if (!validate_ret.ok()) {
std::string s = fmt::format("validate task list conflict failed, region_id:{}, error_code:{}, error_msg:{}",
region_id, validate_ret.error_code(), validate_ret.error_str());
DINGO_LOG(ERROR) << s;
response->mutable_error()->set_errcode(static_cast<pb::error::Errno>(validate_ret.error_code()));
response->mutable_error()->set_errmsg(s);
return;
}

// auto ret = coordinator_control->DropRegion(region_id, true, meta_increment);
auto ret = coordinator_control->DropRegion(region_id, meta_increment);
if (!ret.ok()) {
Expand Down
Loading