Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
106 changes: 83 additions & 23 deletions cloud/src/meta-service/meta_service.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3920,7 +3920,51 @@ static bool check_delete_bitmap_point_delete(MetaServiceCode& code, std::string&
return true;
}

void _write_delete_bitmap_kvs(MetaServiceCode& code, std::string& msg, std::stringstream& ss,
// False stops the whole request, including cleanup. An obsolete aggregation is a successful no-op.
static bool check_pre_rowset_aggregation(MetaServiceCode& code, std::string& msg, Transaction* txn,
const UpdateDeleteBitmapRequest* request,
const std::string& instance_id) {
if (!request->without_lock() ||
request->lock_id() != COMPACTION_WITHOUT_LOCK_DELETE_BITMAP_LOCK_ID ||
!request->has_pre_rowset_agg_start_version() ||
!request->has_pre_rowset_agg_end_version()) {
return true;
}

auto tablet_id = request->tablet_id();
auto start = request->pre_rowset_agg_start_version();
auto end = request->pre_rowset_agg_end_version();
auto key = meta_rowset_key({instance_id, tablet_id, end});
std::string value;
// Compaction removes/replaces this live key even with versioned metadata enabled.
// A non-snapshot read conflicts with a compaction that invalidates the output rowset
// before this transaction commits. Historical versioned rowsets cannot establish liveness.
auto err = txn->get(key, &value);
if (err != TxnErrorCode::TXN_OK && err != TxnErrorCode::TXN_KEY_NOT_FOUND) {
code = cast_as<ErrCategory::READ>(err);
msg = fmt::format("failed to get aggregation output rowset, tablet_id={}, key={}, err={}",
tablet_id, hex(key), err);
return false;
}
RowsetMetaCloudPB rowset;
if (err == TxnErrorCode::TXN_OK && !rowset.ParseFromString(value)) {
code = MetaServiceCode::PROTOBUF_PARSE_ERR;
msg = fmt::format("malformed aggregation output rowset, tablet_id={}, key={}", tablet_id,
hex(key));
return false;
}
if (err == TxnErrorCode::TXN_KEY_NOT_FOUND || rowset.start_version() != start ||
rowset.end_version() != end) {
LOG(INFO) << "skip obsolete pre rowset delete bitmap aggregation, instance_id="
<< instance_id << " tablet_id=" << tablet_id << " start_version=" << start
<< " end_version=" << end;
return false;
}
TEST_SYNC_POINT_CALLBACK("update_delete_bitmap:check_pre_rowset_aggregation", request);
return true;
}

bool _write_delete_bitmap_kvs(MetaServiceCode& code, std::string& msg, std::stringstream& ss,
std::shared_ptr<TxnKv> txn_kv, std::unique_ptr<Transaction>& txn,
std::string& use_version, std::set<std::string>& non_exist_rowset_ids,
size_t i, std::string& log, KVStats& stats,
Expand Down Expand Up @@ -3954,7 +3998,7 @@ void _write_delete_bitmap_kvs(MetaServiceCode& code, std::string& msg, std::stri
<< " txn_size=" << txn->approximate_bytes();
msg = ss.str();
g_bvar_update_delete_bitmap_fail_counter << 1;
return;
return false;
}
stats.get_bytes += txn->get_bytes();
stats.put_bytes += txn->put_bytes();
Expand All @@ -3968,7 +4012,10 @@ void _write_delete_bitmap_kvs(MetaServiceCode& code, std::string& msg, std::stri
if (err != TxnErrorCode::TXN_OK) {
code = cast_as<ErrCategory::CREATE>(err);
msg = "failed to init txn";
return;
return false;
}
if (!check_pre_rowset_aggregation(code, msg, txn.get(), request, instance_id)) {
return false;
}
if (!without_lock) {
std::string lock_key = meta_delete_bitmap_update_lock_key({instance_id, table_id, -1});
Expand All @@ -3979,7 +4026,7 @@ void _write_delete_bitmap_kvs(MetaServiceCode& code, std::string& msg, std::stri
LOG(WARNING) << "failed to check delete bitmap lock, table_id=" << table_id
<< " request lock_id=" << request->lock_id()
<< " request initiator=" << request->initiator() << " msg " << msg;
return;
return false;
}
}
}
Expand All @@ -3988,7 +4035,7 @@ void _write_delete_bitmap_kvs(MetaServiceCode& code, std::string& msg, std::stri
if (config::enable_update_delete_bitmap_kv_check) {
if (!check_delete_bitmap_kv_exists(code, msg, txn, key, instance_id, tablet_id,
request->lock_id())) {
return;
return false;
}
}
#endif
Expand All @@ -4000,7 +4047,7 @@ void _write_delete_bitmap_kvs(MetaServiceCode& code, std::string& msg, std::stri
LOG(INFO) << "skip update delete bitmap, rowset_id=" << request->rowset_ids(i)
<< " version=" << request->pre_rowset_versions(i)
<< " tablet_id=" << tablet_id << " because the rowset does not exist";
return;
return true;
}

TxnErrorCode err = TxnErrorCode::TXN_OK;
Expand All @@ -4016,15 +4063,15 @@ void _write_delete_bitmap_kvs(MetaServiceCode& code, std::string& msg, std::stri
<< " err=" << err;
msg = ss.str();
code = cast_as<ErrCategory::READ>(err);
return;
return false;
}
if (err == TxnErrorCode::TXN_OK &&
!rs.ParseFromArray(rowset_val.data(), rowset_val.size())) {
code = MetaServiceCode::PROTOBUF_PARSE_ERR;
ss << "malformed rowset meta, unable to deserialize, tablet_id=" << tablet_id
<< " key=" << hex(rowset_key);
msg = ss.str();
return;
return false;
}
} else {
CloneChainReader reader(instance_id, resource_mgr);
Expand All @@ -4035,22 +4082,22 @@ void _write_delete_bitmap_kvs(MetaServiceCode& code, std::string& msg, std::stri
<< " version=" << request->pre_rowset_versions(i);
msg = ss.str();
code = cast_as<ErrCategory::READ>(err);
return;
return false;
}
}
if (err == TxnErrorCode::TXN_KEY_NOT_FOUND) {
non_exist_rowset_ids.emplace(request->rowset_ids(i));
LOG(INFO) << "skip update delete bitmap, rowset_id=" << request->rowset_ids(i)
<< " version=" << request->pre_rowset_versions(i)
<< " tablet_id=" << tablet_id << " because the rowset is not exist";
return;
return true;
}
if (rs.rowset_id_v2() != request->rowset_ids(i)) {
LOG(INFO) << "skip update delete bitmap, rowset_id=" << request->rowset_ids(i)
<< " version=" << request->pre_rowset_versions(i)
<< " tablet_id=" << tablet_id << " because the rowset is not exist";
non_exist_rowset_ids.emplace(request->rowset_ids(i));
return;
return true;
}
}
// remove first
Expand All @@ -4060,7 +4107,7 @@ void _write_delete_bitmap_kvs(MetaServiceCode& code, std::string& msg, std::stri
std::optional<uint16_t> max_blob_sequence;
if (!check_delete_bitmap_point_delete(code, msg, txn, key, request, i, point_delete,
delete_bitmap_exists, max_blob_sequence)) {
return;
return false;
}
if (point_delete) {
if (delete_bitmap_exists) {
Expand Down Expand Up @@ -4096,12 +4143,15 @@ void _write_delete_bitmap_kvs(MetaServiceCode& code, std::string& msg, std::stri
VLOG_DEBUG << "xxx update delete bitmap put delete_bitmap_key=" << hex(key)
<< " lock_id=" << request->lock_id() << " initiator=" << request->initiator()
<< " key_size: " << key.size() << " value_size: " << val.size();
return true;
}

static bool commit_pre_rowset_delete_bitmap_removal(
MetaServiceCode& code, std::string& msg, std::stringstream& ss,
const std::shared_ptr<TxnKv>& txn_kv, std::unique_ptr<Transaction>& txn, KVStats& stats,
UpdateDeleteBitmapTxnStats& txn_stats, int64_t tablet_id, const std::string& rowset_id) {
UpdateDeleteBitmapTxnStats& txn_stats, const UpdateDeleteBitmapRequest* request,
const std::string& instance_id, const std::string& rowset_id) {
auto tablet_id = request->tablet_id();
auto txn_size = txn->approximate_bytes();
LOG(INFO) << "commit delete bitmap point deletes before transaction size exceeds limit, "
"tablet_id="
Expand Down Expand Up @@ -4134,7 +4184,7 @@ static bool commit_pre_rowset_delete_bitmap_removal(
msg = "failed to init txn when removing pre rowsets delete bitmap";
return false;
}
return true;
return check_pre_rowset_aggregation(code, msg, txn.get(), request, instance_id);
}

static bool remove_pre_rowset_delete_bitmap(
Expand Down Expand Up @@ -4198,7 +4248,7 @@ static bool remove_pre_rowset_delete_bitmap(
if (txn_size > 0 &&
txn_size + key.size() * 3 > static_cast<size_t>(config::max_txn_commit_byte) &&
!commit_pre_rowset_delete_bitmap_removal(code, msg, ss, txn_kv, txn, stats,
txn_stats, tablet_id,
txn_stats, request, instance_id,
rowset_stats.rowset_id())) {
return false;
}
Expand Down Expand Up @@ -4298,6 +4348,10 @@ void MetaServiceImpl::update_delete_bitmap(google::protobuf::RpcController* cont
return;
}

if (!check_pre_rowset_aggregation(code, msg, txn.get(), request, instance_id)) {
return;
}

bool is_explicit_txn = (request->has_is_explicit_txn() && request->is_explicit_txn());
bool is_first_sub_txn = (is_explicit_txn && request->txn_id() == request->lock_id());
std::string log = ", update delete bitmap for tablet " + std::to_string(tablet_id);
Expand Down Expand Up @@ -4424,10 +4478,13 @@ void MetaServiceImpl::update_delete_bitmap(google::protobuf::RpcController* cont
auto& key = delete_bitmap_keys_v1[i];
auto& val = request->segment_delete_bitmaps(i);
bool is_versioned_read = is_version_read_enabled(instance_id);
_write_delete_bitmap_kvs(code, msg, ss, txn_kv_, txn, use_version, non_exist_rowset_ids, i,
log, stats, request, instance_id, key, val, txn_stats,
is_versioned_read, resource_mgr_.get());
if (code != MetaServiceCode::OK) return;
if (!_write_delete_bitmap_kvs(code, msg, ss, txn_kv_, txn, use_version,
non_exist_rowset_ids, i, log, stats, request, instance_id,
key, val, txn_stats, is_versioned_read,
resource_mgr_.get()) ||
code != MetaServiceCode::OK) {
return;
}
}
// write v2 kvs
for (size_t i = 0; i < delete_bitmap_keys_v2.size(); ++i) {
Expand All @@ -4443,10 +4500,13 @@ void MetaServiceImpl::update_delete_bitmap(google::protobuf::RpcController* cont
<< request->delete_bitmap_storages(i).delete_bitmap().rowset_ids_size()
<< ". key=" << hex(key) << ", value_size=" << val.size();
bool is_versioned_read = is_version_read_enabled(instance_id);
_write_delete_bitmap_kvs(code, msg, ss, txn_kv_, txn, use_version, non_exist_rowset_ids, i,
log, stats, request, instance_id, key, val, txn_stats,
is_versioned_read, resource_mgr_.get());
if (code != MetaServiceCode::OK) return;
if (!_write_delete_bitmap_kvs(code, msg, ss, txn_kv_, txn, use_version,
non_exist_rowset_ids, i, log, stats, request, instance_id,
key, val, txn_stats, is_versioned_read,
resource_mgr_.get()) ||
code != MetaServiceCode::OK) {
return;
}
}

if (!remove_pre_rowset_delete_bitmap(code, msg, ss, txn_kv_, txn, stats, request, instance_id,
Expand Down
Loading
Loading