Skip to content

branch-3.0: [fix](cloud) Fix roll-backed cumulative point of new tablet when doing schema change #53402 #53446

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
dataroaring merged 1 commit into from
Jul 18, 2025
Merged

branch-3.0: [fix](cloud) Fix roll-backed cumulative point of new tablet when doing schema change #53402 #53446

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
3 changes: 2 additions & 1 deletion cloud/src/meta-service/meta_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1816,8 +1816,9 @@ void MetaServiceImpl::get_rowset(::google::protobuf::RpcController* controller,
code = MetaServiceCode::INVALID_ARGUMENT;
ss << "no valid compaction_cnt or cumulative_point given. req_bc_cnt=" << req_bc_cnt
<< ", bc_cnt=" << bc_cnt << ", req_cc_cnt=" << req_cc_cnt << ", cc_cnt=" << cc_cnt
<< ", req_cp=" << req_cp << ", cp=" << cp;
<< ", req_cp=" << req_cp << ", cp=" << cp << " tablet_id=" << tablet_id;
msg = ss.str();
LOG(WARNING) << msg;
return;
}
auto versions = calc_sync_versions(req_bc_cnt, bc_cnt, req_cc_cnt, cc_cnt, req_cp, cp,
Expand Down
9 changes: 7 additions & 2 deletions cloud/src/meta-service/meta_service_job.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,7 @@ void process_schema_change_job(MetaServiceCode& code, std::string& msg, std::str
//==========================================================================
if (!schema_change.has_alter_version()) {
code = MetaServiceCode::INVALID_ARGUMENT;
msg = "invalid alter_version";
msg = "no alter_version for schema change job, tablet_id=" + std::to_string(tablet_id);
return;
}
if (schema_change.alter_version() < 2) {
Expand Down Expand Up @@ -1304,7 +1304,12 @@ void process_schema_change_job(MetaServiceCode& code, std::string& msg, std::str
internal_get_tablet_stats(code, msg, txn.get(), instance_id, new_tablet_idx, *stats,
detached_stats, config::snapshot_get_tablet_stats);
// clang-format off
stats->set_cumulative_point(schema_change.output_cumulative_point());
// ATTN: cumu point in job is from base tablet which may be fetched long time ago
// since the new tablet may have done cumu compactions with alter_version as initial cumu point
// current cumu point of new tablet may be larger than job.alter_version
// we need to keep the larger one in case of cumu point roll-back to
// break the basic assumptions of non-decreasing cumu point
stats->set_cumulative_point(std::max(schema_change.output_cumulative_point(), stats->cumulative_point()));
stats->set_num_rows(stats->num_rows() + (schema_change.num_output_rows() - num_remove_rows));
stats->set_data_size(stats->data_size() + (schema_change.size_output_rowsets() - size_remove_rowsets));
stats->set_num_rowsets(stats->num_rowsets() + (schema_change.num_output_rowsets() - num_remove_rowsets));
Expand Down
Loading