Skip to content

branch-4.1: [fix](cloud) Preserve clone source mappings for deleted instances #68343 #68570

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
yiguolei merged 1 commit into from
Sep 29, 2026
Merged

branch-4.1: [fix](cloud) Preserve clone source mappings for deleted instances #68343 #68570

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
9 changes: 0 additions & 9 deletions cloud/src/resource-manager/resource_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,6 @@ int ResourceManager::init() {

std::unique_lock l(mtx_);
for (auto& [inst_id, inst] : instances) {
if (inst.status() == InstanceInfoPB::DELETED) {
continue;
}
for (auto& c : inst.clusters()) {
add_cluster_to_index_no_lock(inst_id, c);
}
Expand Down Expand Up @@ -1442,12 +1439,6 @@ void ResourceManager::refresh_instance(const std::string& instance_id,
}
}

if (instance.status() == InstanceInfoPB::DELETED) {
instance_multi_version_status_.erase(instance_id);
instance_source_snapshot_info_.erase(instance_id);
return;
}

// If successor_instance_id is set, it means this instance has a successor instance,
// so we do not need to add its clusters to the index again.
if (!instance.has_successor_instance_id()) {
Expand Down
62 changes: 62 additions & 0 deletions cloud/test/clone_chain_reader_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2134,6 +2134,68 @@ TEST_F(CloneChainReaderTest, GetTabletMeta) {
}
}

TEST_F(CloneChainReaderTest, GetTabletMetaThroughDeletedIntermediateClone) {
ResourceManager resource_mgr(txn_kv_);

InstanceInfoPB instance_b;
instance_b.set_instance_id(instance_ids_[1]);
instance_b.set_status(InstanceInfoPB::NORMAL);
instance_b.set_source_instance_id(instance_ids_[0]);
instance_b.set_source_snapshot_id(Versionstamp(snapshot_versions_[0]).to_string());
resource_mgr.refresh_instance(instance_ids_[1], instance_b);

InstanceInfoPB instance_c;
instance_c.set_instance_id(instance_ids_[2]);
instance_c.set_status(InstanceInfoPB::NORMAL);
instance_c.set_source_instance_id(instance_ids_[1]);
instance_c.set_source_snapshot_id(Versionstamp(snapshot_versions_[1]).to_string());
resource_mgr.refresh_instance(instance_ids_[2], instance_c);

constexpr int64_t tablet_id = 16002;
{
std::unique_ptr<Transaction> txn;
ASSERT_EQ(txn_kv_->create_txn(&txn), TxnErrorCode::TXN_OK);
std::string tablet_meta_key = versioned::meta_tablet_key({instance_ids_[0], tablet_id});
doris::TabletMetaCloudPB tablet_meta;
tablet_meta.set_tablet_id(tablet_id);
tablet_meta.set_table_id(1001);
ASSERT_TRUE(versioned::document_put(txn.get(), tablet_meta_key, std::move(tablet_meta)));
ASSERT_EQ(txn->commit(), TxnErrorCode::TXN_OK);
}

// Single-level clone lookup remains unchanged.
{
CloneChainReader reader(instance_ids_[1], Versionstamp(snapshot_versions_[1]),
txn_kv_.get(), &resource_mgr);
doris::TabletMetaCloudPB tablet_meta;
Versionstamp versionstamp;
ASSERT_EQ(reader.get_tablet_meta(tablet_id, &tablet_meta, &versionstamp),
TxnErrorCode::TXN_OK);
EXPECT_EQ(tablet_meta.table_id(), 1001);
}

instance_b.set_status(InstanceInfoPB::DELETED);
resource_mgr.refresh_instance(instance_ids_[1], instance_b);

// B's tombstone still carries B -> A lineage, so C can continue to A.
CloneChainReader reader(instance_ids_[2], Versionstamp(snapshot_versions_[2]), txn_kv_.get(),
&resource_mgr);
doris::TabletMetaCloudPB tablet_meta;
Versionstamp versionstamp;
ASSERT_EQ(reader.get_tablet_meta(tablet_id, &tablet_meta, &versionstamp), TxnErrorCode::TXN_OK);
EXPECT_EQ(tablet_meta.table_id(), 1001);

// Decoupling the deleted intermediate clone clears both lineage fields and its mapping.
instance_b.clear_source_instance_id();
instance_b.clear_source_snapshot_id();
resource_mgr.refresh_instance(instance_ids_[1], instance_b);

std::string source_instance_id;
Versionstamp source_snapshot_version;
EXPECT_FALSE(resource_mgr.get_source_snapshot_info(instance_ids_[1], &source_instance_id,
&source_snapshot_version));
}

TEST_F(CloneChainReaderTest, GetTabletSchema) {
std::string instance_id = instance_ids_[2]; // C
Versionstamp snapshot_version = snapshot_versions_[2];
Expand Down
10 changes: 5 additions & 5 deletions cloud/test/resource_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,11 +446,11 @@ TEST(ResourceTest, RefreshDeletedInstanceClearsRuntimeCaches) {
resource_mgr.refresh_instance(instance_id, instance);

nodes.clear();
EXPECT_EQ(resource_mgr.get_node(cloud_unique_id, &nodes), "cloud_unique_id not found");
EXPECT_TRUE(nodes.empty());
EXPECT_FALSE(resource_mgr.is_version_read_enabled(instance_id));
EXPECT_FALSE(resource_mgr.get_source_snapshot_info(instance_id, &source_instance_id,
&source_snapshot_version));
EXPECT_EQ(resource_mgr.get_node(cloud_unique_id, &nodes), "");
ASSERT_TRUE(!nodes.empty());
EXPECT_TRUE(resource_mgr.is_version_read_enabled(instance_id));
EXPECT_TRUE(resource_mgr.get_source_snapshot_info(instance_id, &source_instance_id,
&source_snapshot_version));
}

// test add/drop cluster
Expand Down
Loading