Skip to content

Commit e6be8b9

Browse files
LiuRuoyu01yuhaijun999
authored andcommitted
[fix][coordinator]Fixup scheam_id and raw_engine was not saved when backup data
1 parent 42e4ebe commit e6be8b9

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

src/client_v2/coordinator.cc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "common/logging.h"
2525
#include "common/version.h"
2626
#include "document/codec.h"
27+
#include "proto/common.pb.h"
2728
#include "proto/coordinator.pb.h"
2829

2930
namespace client_v2 {
@@ -210,9 +211,10 @@ void RunGetRegionMap(GetRegionMapCommandOptions const &opt) {
210211
<< dingodb::pb::common::RegionHeartbeatState_Name(region.status().heartbeat_status()) << ","
211212
<< dingodb::pb::common::ReplicaStatus_Name(region.status().replica_status()) << ","
212213
<< dingodb::pb::common::RegionRaftStatus_Name(region.status().raft_status())
213-
<< " leader=" << region.leader_store_id() << " create=" << region.create_timestamp()
214-
<< " update=" << region.status().last_update_timestamp() << " range=[0x"
215-
<< dingodb::Helper::StringToHex(region.definition().range().start_key()) << ",0x"
214+
<< " engine=" << dingodb::pb::common::RawEngine_Name(region.definition().raw_engine())
215+
<< " schema_id=" << region.definition().schema_id() << " leader=" << region.leader_store_id()
216+
<< " create=" << region.create_timestamp() << " update=" << region.status().last_update_timestamp()
217+
<< " range=[0x" << dingodb::Helper::StringToHex(region.definition().range().start_key()) << ",0x"
216218
<< dingodb::Helper::StringToHex(region.definition().range().end_key()) << "]\n";
217219

218220
if (region.metrics().has_vector_index_status()) {

src/coordinator/coordinator_control_coor.cc

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -809,22 +809,11 @@ void CoordinatorControl::GenRegionFull(const pb::coordinator_internal::RegionInt
809809
void CoordinatorControl::GenRegionSlim(const pb::coordinator_internal::RegionInternal& region_internal,
810810
pb::common::Region& region) {
811811
region.set_id(region_internal.id());
812-
region.mutable_definition()->set_id(region_internal.id());
813-
region.mutable_definition()->set_name(region_internal.definition().name());
814-
region.mutable_definition()->mutable_epoch()->set_conf_version(region_internal.definition().epoch().conf_version());
815-
region.mutable_definition()->mutable_epoch()->set_version(region_internal.definition().epoch().version());
816-
region.mutable_definition()->mutable_range()->set_start_key(region_internal.definition().range().start_key());
817-
region.mutable_definition()->mutable_range()->set_end_key(region_internal.definition().range().end_key());
818-
if (region_internal.definition().has_index_parameter()) {
819-
*region.mutable_definition()->mutable_index_parameter() = region_internal.definition().index_parameter();
820-
}
821-
region.mutable_definition()->set_tenant_id(region_internal.definition().tenant_id());
822-
region.mutable_definition()->set_table_id(region_internal.definition().table_id());
823-
region.mutable_definition()->set_index_id(region_internal.definition().index_id());
824-
region.mutable_definition()->set_part_id(region_internal.definition().part_id());
812+
region.set_region_type(region_internal.region_type());
813+
region.mutable_definition()->CopyFrom(region_internal.definition());
825814
region.set_state(region_internal.state());
826815
region.set_create_timestamp(region_internal.create_timestamp());
827-
region.set_region_type(region_internal.region_type());
816+
region.set_deleted_timestamp(region_internal.deleted_timestamp());
828817

829818
pb::common::RegionMetrics region_metrics;
830819
auto ret = region_metrics_map_.Get(region_internal.id(), region_metrics);
@@ -2185,6 +2174,7 @@ butil::Status CoordinatorControl::CreateRegionFinal(
21852174
pb::coordinator_internal::MetaIncrement& meta_increment) {
21862175
DINGO_LOG(INFO) << "CreateRegion replica_num=" << replica_num << ", region_name=" << region_name
21872176
<< ", store_engine=" << pb::common::StorageEngine_Name(store_engine)
2177+
<< ", raw_engine=" << pb::common::RawEngine_Name(raw_engine)
21882178
<< ", region_type=" << pb::common::RegionType_Name(region_type) << ", resource_tag=" << resource_tag
21892179
<< ", store_ids.size=" << store_ids.size() << ", region_range=" << region_range.ShortDebugString()
21902180
<< ", schema_id=" << schema_id << ", table_id=" << table_id << ", index_id=" << index_id

0 commit comments

Comments
 (0)