This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 997903b047f branch-3.1: [improve](cloud-mow) batch get tablet stats
when get_delete_bitmap_update_lock #47281 (#52151)
997903b047f is described below
commit 997903b047f67683cd7b06a7072c6442988952a9
Author: meiyi <[email protected]>
AuthorDate: Tue Jun 24 10:52:52 2025 +0800
branch-3.1: [improve](cloud-mow) batch get tablet stats when
get_delete_bitmap_update_lock #47281 (#52151)
Cherry-pick from #47281
---
cloud/src/common/config.h | 3 +
cloud/src/meta-service/meta_service.cpp | 383 ++++++++++++++++----------------
cloud/src/meta-service/meta_service.h | 6 +
cloud/test/meta_service_test.cpp | 87 +++++---
4 files changed, 256 insertions(+), 223 deletions(-)
diff --git a/cloud/src/common/config.h b/cloud/src/common/config.h
index bbf40cd3826..725542236f4 100644
--- a/cloud/src/common/config.h
+++ b/cloud/src/common/config.h
@@ -301,6 +301,9 @@ CONF_mBool(use_delete_bitmap_lock_random_version, "false");
// Comma seprated list: recycler_storage_vault_white_list="aaa,bbb,ccc"
CONF_Strings(recycler_storage_vault_white_list, "");
+// for get_delete_bitmap_update_lock
+CONF_mBool(enable_batch_get_mow_tablet_stats_and_meta, "true");
+
// aws sdk log level
// Off = 0,
// Fatal = 1,
diff --git a/cloud/src/meta-service/meta_service.cpp
b/cloud/src/meta-service/meta_service.cpp
index eaa93199e17..8f1c56ffc03 100644
--- a/cloud/src/meta-service/meta_service.cpp
+++ b/cloud/src/meta-service/meta_service.cpp
@@ -2562,6 +2562,200 @@ static bool
put_delete_bitmap_update_lock_key(MetaServiceCode& code, std::string
return true;
}
+bool MetaServiceImpl::get_mow_tablet_stats_and_meta(MetaServiceCode& code,
std::string& msg,
+ const
GetDeleteBitmapUpdateLockRequest* request,
+
GetDeleteBitmapUpdateLockResponse* response,
+ std::string& instance_id,
std::string& lock_key,
+ std::string
lock_use_version) {
+ bool require_tablet_stats =
+ request->has_require_compaction_stats() ?
request->require_compaction_stats() : false;
+ if (!require_tablet_stats) return true;
+ // this request is from fe when it commits txn for MOW table, we send the
compaction stats
+ // along with the GetDeleteBitmapUpdateLockResponse which will be sent to
BE later to let
+ // BE eliminate unnecessary sync_rowsets() calls if possible
+ // 1. hold the delete bitmap update lock in MS(update lock_info.lock_id to
current load's txn id)
+ // 2. read tablets' stats
+ // 3. check whether we still hold the delete bitmap update lock
+ // these steps can be done in different fdb txns
+
+ StopWatch read_stats_sw;
+ std::unique_ptr<Transaction> txn;
+ TxnErrorCode err = txn_kv_->create_txn(&txn);
+ if (err != TxnErrorCode::TXN_OK) {
+ code = cast_as<ErrCategory::CREATE>(err);
+ msg = "failed to init txn";
+ return false;
+ }
+ auto table_id = request->table_id();
+ std::stringstream ss;
+ if (!config::enable_batch_get_mow_tablet_stats_and_meta) {
+ for (const auto& tablet_idx : request->tablet_indexes()) {
+ // 1. get compaction cnts
+ TabletStatsPB tablet_stat;
+ std::string stats_key =
+ stats_tablet_key({instance_id, tablet_idx.table_id(),
tablet_idx.index_id(),
+ tablet_idx.partition_id(),
tablet_idx.tablet_id()});
+ std::string stats_val;
+ TxnErrorCode err = txn->get(stats_key, &stats_val);
+ TEST_SYNC_POINT_CALLBACK(
+
"get_delete_bitmap_update_lock.get_compaction_cnts_inject_error", &err);
+ if (err == TxnErrorCode::TXN_TOO_OLD) {
+ code = MetaServiceCode::OK;
+ err = txn_kv_->create_txn(&txn);
+ if (err != TxnErrorCode::TXN_OK) {
+ code = cast_as<ErrCategory::CREATE>(err);
+ ss << "failed to init txn when get tablet stats";
+ msg = ss.str();
+ return false;
+ }
+ err = txn->get(stats_key, &stats_val);
+ }
+ if (err != TxnErrorCode::TXN_OK) {
+ code = cast_as<ErrCategory::READ>(err);
+ msg = fmt::format("failed to get tablet stats, err={}
tablet_id={}", err,
+ tablet_idx.tablet_id());
+ return false;
+ }
+ if (!tablet_stat.ParseFromArray(stats_val.data(),
stats_val.size())) {
+ code = MetaServiceCode::PROTOBUF_PARSE_ERR;
+ msg = fmt::format("marformed tablet stats value, key={}",
hex(stats_key));
+ return false;
+ }
+
response->add_base_compaction_cnts(tablet_stat.base_compaction_cnt());
+
response->add_cumulative_compaction_cnts(tablet_stat.cumulative_compaction_cnt());
+ response->add_cumulative_points(tablet_stat.cumulative_point());
+
+ // 2. get tablet states
+ std::string tablet_meta_key =
+ meta_tablet_key({instance_id, tablet_idx.table_id(),
tablet_idx.index_id(),
+ tablet_idx.partition_id(),
tablet_idx.tablet_id()});
+ std::string tablet_meta_val;
+ err = txn->get(tablet_meta_key, &tablet_meta_val);
+ if (err != TxnErrorCode::TXN_OK) {
+ ss << "failed to get tablet meta"
+ << (err == TxnErrorCode::TXN_KEY_NOT_FOUND ? " (not found)"
: "")
+ << " instance_id=" << instance_id << " tablet_id=" <<
tablet_idx.tablet_id()
+ << " key=" << hex(tablet_meta_key) << " err=" << err;
+ msg = ss.str();
+ code = err == TxnErrorCode::TXN_KEY_NOT_FOUND ?
MetaServiceCode::TABLET_NOT_FOUND
+ :
cast_as<ErrCategory::READ>(err);
+ return false;
+ }
+ doris::TabletMetaCloudPB tablet_meta;
+ if (!tablet_meta.ParseFromString(tablet_meta_val)) {
+ code = MetaServiceCode::PROTOBUF_PARSE_ERR;
+ msg = "malformed tablet meta";
+ return false;
+ }
+ response->add_tablet_states(
+
static_cast<std::underlying_type_t<TabletStatePB>>(tablet_meta.tablet_state()));
+ }
+ } else {
+ // 1. get compaction cnts
+ std::vector<std::string> stats_tablet_keys;
+ for (const auto& tablet_idx : request->tablet_indexes()) {
+ stats_tablet_keys.push_back(
+ stats_tablet_key({instance_id, tablet_idx.table_id(),
tablet_idx.index_id(),
+ tablet_idx.partition_id(),
tablet_idx.tablet_id()}));
+ }
+ std::vector<std::optional<std::string>> stats_tablet_values;
+ err = txn->batch_get(&stats_tablet_values, stats_tablet_keys);
+
TEST_SYNC_POINT_CALLBACK("get_delete_bitmap_update_lock.get_compaction_cnts_inject_error",
+ &err);
+ if (err != TxnErrorCode::TXN_OK) {
+ code = cast_as<ErrCategory::READ>(err);
+ msg = fmt::format("failed to get tablet stats, err={} table_id={}
lock_id={}", err,
+ table_id, request->lock_id());
+ return false;
+ }
+ for (size_t i = 0; i < stats_tablet_keys.size(); i++) {
+ if (!stats_tablet_values[i].has_value()) {
+ code = cast_as<ErrCategory::READ>(err);
+ msg = fmt::format("failed to get tablet stats, err={}
tablet_id={}", err,
+ request->tablet_indexes(i).tablet_id());
+ return false;
+ }
+ TabletStatsPB tablet_stat;
+ if (!tablet_stat.ParseFromString(stats_tablet_values[i].value())) {
+ code = MetaServiceCode::PROTOBUF_PARSE_ERR;
+ msg = fmt::format("marformed tablet stats value");
+ return false;
+ }
+
response->add_base_compaction_cnts(tablet_stat.base_compaction_cnt());
+
response->add_cumulative_compaction_cnts(tablet_stat.cumulative_compaction_cnt());
+ response->add_cumulative_points(tablet_stat.cumulative_point());
+ }
+ stats_tablet_keys.clear();
+ stats_tablet_values.clear();
+ DCHECK(request->tablet_indexes_size() ==
response->base_compaction_cnts_size());
+ DCHECK(request->tablet_indexes_size() ==
response->cumulative_compaction_cnts_size());
+ DCHECK(request->tablet_indexes_size() ==
response->cumulative_points_size());
+
+ // 2. get tablet states
+ std::vector<std::string> tablet_meta_keys;
+ for (const auto& tablet_idx : request->tablet_indexes()) {
+ tablet_meta_keys.push_back(
+ meta_tablet_key({instance_id, tablet_idx.table_id(),
tablet_idx.index_id(),
+ tablet_idx.partition_id(),
tablet_idx.tablet_id()}));
+ }
+ std::vector<std::optional<std::string>> tablet_meta_values;
+ err = txn->batch_get(&tablet_meta_values, tablet_meta_keys);
+ if (err == TxnErrorCode::TXN_TOO_OLD) {
+ code = MetaServiceCode::OK;
+ err = txn_kv_->create_txn(&txn);
+ if (err != TxnErrorCode::TXN_OK) {
+ code = cast_as<ErrCategory::CREATE>(err);
+ ss << "failed to init txn when get tablet meta";
+ msg = ss.str();
+ return false;
+ }
+ err = txn->batch_get(&tablet_meta_values, tablet_meta_keys);
+ }
+ if (err != TxnErrorCode::TXN_OK) {
+ code = cast_as<ErrCategory::READ>(err);
+ msg = fmt::format("failed to get tablet meta, err={} table_id={}
lock_id={}", err,
+ table_id, request->lock_id());
+ return false;
+ }
+ for (size_t i = 0; i < tablet_meta_keys.size(); i++) {
+ if (!tablet_meta_values[i].has_value()) {
+ code = cast_as<ErrCategory::READ>(err);
+ msg = fmt::format("failed to get tablet meta, err={}
tablet_id={}", err,
+ request->tablet_indexes(i).tablet_id());
+ return false;
+ }
+ doris::TabletMetaCloudPB tablet_meta;
+ if (!tablet_meta.ParseFromString(tablet_meta_values[i].value())) {
+ code = MetaServiceCode::PROTOBUF_PARSE_ERR;
+ msg = fmt::format("marformed tablet meta value");
+ return false;
+ }
+ response->add_tablet_states(
+
static_cast<std::underlying_type_t<TabletStatePB>>(tablet_meta.tablet_state()));
+ }
+ DCHECK(request->tablet_indexes_size() ==
response->tablet_states_size());
+ }
+
+ read_stats_sw.pause();
+ LOG(INFO) << fmt::format(
+ "table_id={}, tablet_idxes.size()={}, read tablet compaction cnts
and tablet states "
+ "cost={} ms",
+ table_id, request->tablet_indexes().size(),
read_stats_sw.elapsed_us() / 1000);
+
+ DeleteBitmapUpdateLockPB lock_info_tmp;
+ if (!check_delete_bitmap_lock(code, msg, ss, txn, instance_id, table_id,
request->lock_id(),
+ request->initiator(), lock_key,
lock_info_tmp,
+ lock_use_version)) {
+ LOG(WARNING) << "failed to check delete bitmap lock after get tablet
stats and tablet "
+ "states, table_id="
+ << table_id << " request lock_id=" << request->lock_id()
+ << " request initiator=" << request->initiator() << "
code=" << code
+ << " msg=" << msg;
+ return false;
+ }
+ return true;
+}
+
void MetaServiceImpl::get_delete_bitmap_update_lock_v2(
google::protobuf::RpcController* controller,
const GetDeleteBitmapUpdateLockRequest* request,
@@ -2795,103 +2989,9 @@ void MetaServiceImpl::get_delete_bitmap_update_lock_v2(
}
}
- bool require_tablet_stats =
- request->has_require_compaction_stats() ?
request->require_compaction_stats() : false;
- if (!require_tablet_stats) return;
- // this request is from fe when it commits txn for MOW table, we send the
compaction stats
- // along with the GetDeleteBitmapUpdateLockResponse which will be sent to
BE later to let
- // BE eliminate unnecessary sync_rowsets() calls if possible
-
- // 1. hold the delete bitmap update lock in MS(update lock_info.lock_id to
current load's txn id)
- // 2. read tablets' stats
- // 3. check whether we still hold the delete bitmap update lock
- // these steps can be done in different fdb txns
-
- StopWatch read_stats_sw;
- std::unique_ptr<Transaction> txn;
- TxnErrorCode err = txn_kv_->create_txn(&txn);
- if (err != TxnErrorCode::TXN_OK) {
- code = cast_as<ErrCategory::CREATE>(err);
- msg = "failed to init txn";
+ if (!get_mow_tablet_stats_and_meta(code, msg, request, response,
instance_id, lock_key, "v2")) {
return;
}
-
- for (const auto& tablet_idx : request->tablet_indexes()) {
- // 1. get compaction cnts
- TabletStatsPB tablet_stat;
- std::string stats_key =
- stats_tablet_key({instance_id, tablet_idx.table_id(),
tablet_idx.index_id(),
- tablet_idx.partition_id(),
tablet_idx.tablet_id()});
- std::string stats_val;
- err = txn->get(stats_key, &stats_val);
-
TEST_SYNC_POINT_CALLBACK("get_delete_bitmap_update_lock.get_compaction_cnts_inject_error",
- &err);
- if (err == TxnErrorCode::TXN_TOO_OLD) {
- code = MetaServiceCode::OK;
- err = txn_kv_->create_txn(&txn);
- if (err != TxnErrorCode::TXN_OK) {
- code = cast_as<ErrCategory::CREATE>(err);
- ss << "failed to init txn when get tablet stats";
- msg = ss.str();
- return;
- }
- err = txn->get(stats_key, &stats_val);
- }
- if (err != TxnErrorCode::TXN_OK) {
- code = cast_as<ErrCategory::READ>(err);
- msg = fmt::format("failed to get tablet stats, err={}
tablet_id={}", err,
- tablet_idx.tablet_id());
- return;
- }
- if (!tablet_stat.ParseFromArray(stats_val.data(), stats_val.size())) {
- code = MetaServiceCode::PROTOBUF_PARSE_ERR;
- msg = fmt::format("marformed tablet stats value, key={}",
hex(stats_key));
- return;
- }
- response->add_base_compaction_cnts(tablet_stat.base_compaction_cnt());
-
response->add_cumulative_compaction_cnts(tablet_stat.cumulative_compaction_cnt());
- response->add_cumulative_points(tablet_stat.cumulative_point());
-
- // 2. get tablet states
- std::string tablet_meta_key =
- meta_tablet_key({instance_id, tablet_idx.table_id(),
tablet_idx.index_id(),
- tablet_idx.partition_id(),
tablet_idx.tablet_id()});
- std::string tablet_meta_val;
- err = txn->get(tablet_meta_key, &tablet_meta_val);
- if (err != TxnErrorCode::TXN_OK) {
- ss << "failed to get tablet meta"
- << (err == TxnErrorCode::TXN_KEY_NOT_FOUND ? " (not found)" :
"")
- << " instance_id=" << instance_id << " tablet_id=" <<
tablet_idx.tablet_id()
- << " key=" << hex(tablet_meta_key) << " err=" << err;
- msg = ss.str();
- code = err == TxnErrorCode::TXN_KEY_NOT_FOUND ?
MetaServiceCode::TABLET_NOT_FOUND
- :
cast_as<ErrCategory::READ>(err);
- return;
- }
- doris::TabletMetaCloudPB tablet_meta;
- if (!tablet_meta.ParseFromString(tablet_meta_val)) {
- code = MetaServiceCode::PROTOBUF_PARSE_ERR;
- msg = "malformed tablet meta";
- return;
- }
- response->add_tablet_states(
-
static_cast<std::underlying_type_t<TabletStatePB>>(tablet_meta.tablet_state()));
- }
-
- read_stats_sw.pause();
- LOG(INFO) << fmt::format(
- "tablet_idxes.size()={}, read tablet compaction cnts and tablet
states cost={} ms",
- request->tablet_indexes().size(), read_stats_sw.elapsed_us() /
1000);
-
- DeleteBitmapUpdateLockPB lock_info_tmp;
- if (!check_delete_bitmap_lock(code, msg, ss, txn, instance_id, table_id,
request->lock_id(),
- request->initiator(), lock_key,
lock_info_tmp, "v2")) {
- LOG(WARNING) << "failed to check delete bitmap lock after get tablet
stats and tablet "
- "states, table_id="
- << table_id << " request lock_id=" << request->lock_id()
- << " request initiator=" << request->initiator() << "
code=" << code
- << " msg=" << msg;
- }
}
void MetaServiceImpl::get_delete_bitmap_update_lock_v1(
@@ -2973,98 +3073,9 @@ void MetaServiceImpl::get_delete_bitmap_update_lock_v1(
return;
}
- bool require_tablet_stats =
- request->has_require_compaction_stats() ?
request->require_compaction_stats() : false;
- if (!require_tablet_stats) return;
- // this request is from fe when it commits txn for MOW table, we send the
compaction stats
- // along with the GetDeleteBitmapUpdateLockResponse which will be sent to
BE later to let
- // BE eliminate unnecessary sync_rowsets() calls if possible
- // 1. hold the delete bitmap update lock in MS(update lock_info.lock_id to
current load's txn id)
- // 2. read tablets' stats
- // 3. check whether we still hold the delete bitmap update lock
- // these steps can be done in different fdb txns
-
- StopWatch read_stats_sw;
- err = txn_kv_->create_txn(&txn);
- if (err != TxnErrorCode::TXN_OK) {
- code = cast_as<ErrCategory::CREATE>(err);
- msg = "failed to init txn";
+ if (!get_mow_tablet_stats_and_meta(code, msg, request, response,
instance_id, lock_key, "v1")) {
return;
- }
- for (const auto& tablet_idx : request->tablet_indexes()) {
- // 1. get compaction cnts
- TabletStatsPB tablet_stat;
- std::string stats_key =
- stats_tablet_key({instance_id, tablet_idx.table_id(),
tablet_idx.index_id(),
- tablet_idx.partition_id(),
tablet_idx.tablet_id()});
- std::string stats_val;
- TxnErrorCode err = txn->get(stats_key, &stats_val);
-
TEST_SYNC_POINT_CALLBACK("get_delete_bitmap_update_lock.get_compaction_cnts_inject_error",
- &err);
- if (err == TxnErrorCode::TXN_TOO_OLD) {
- code = MetaServiceCode::OK;
- err = txn_kv_->create_txn(&txn);
- if (err != TxnErrorCode::TXN_OK) {
- code = cast_as<ErrCategory::CREATE>(err);
- ss << "failed to init txn when get tablet stats";
- msg = ss.str();
- return;
- }
- err = txn->get(stats_key, &stats_val);
- }
- if (err != TxnErrorCode::TXN_OK) {
- code = cast_as<ErrCategory::READ>(err);
- msg = fmt::format("failed to get tablet stats, err={}
tablet_id={}", err,
- tablet_idx.tablet_id());
- return;
- }
- if (!tablet_stat.ParseFromArray(stats_val.data(), stats_val.size())) {
- code = MetaServiceCode::PROTOBUF_PARSE_ERR;
- msg = fmt::format("marformed tablet stats value, key={}",
hex(stats_key));
- return;
- }
- response->add_base_compaction_cnts(tablet_stat.base_compaction_cnt());
-
response->add_cumulative_compaction_cnts(tablet_stat.cumulative_compaction_cnt());
- response->add_cumulative_points(tablet_stat.cumulative_point());
- // 2. get tablet states
- std::string tablet_meta_key =
- meta_tablet_key({instance_id, tablet_idx.table_id(),
tablet_idx.index_id(),
- tablet_idx.partition_id(),
tablet_idx.tablet_id()});
- std::string tablet_meta_val;
- err = txn->get(tablet_meta_key, &tablet_meta_val);
- if (err != TxnErrorCode::TXN_OK) {
- ss << "failed to get tablet meta"
- << (err == TxnErrorCode::TXN_KEY_NOT_FOUND ? " (not found)" :
"")
- << " instance_id=" << instance_id << " tablet_id=" <<
tablet_idx.tablet_id()
- << " key=" << hex(tablet_meta_key) << " err=" << err;
- msg = ss.str();
- code = err == TxnErrorCode::TXN_KEY_NOT_FOUND ?
MetaServiceCode::TABLET_NOT_FOUND
- :
cast_as<ErrCategory::READ>(err);
- return;
- }
- doris::TabletMetaCloudPB tablet_meta;
- if (!tablet_meta.ParseFromString(tablet_meta_val)) {
- code = MetaServiceCode::PROTOBUF_PARSE_ERR;
- msg = "malformed tablet meta";
- return;
- }
- response->add_tablet_states(
-
static_cast<std::underlying_type_t<TabletStatePB>>(tablet_meta.tablet_state()));
- }
- read_stats_sw.pause();
- LOG(INFO) << fmt::format(
- "tablet_idxes.size()={}, read tablet compaction cnts and tablet
states cost={} ms",
- request->tablet_indexes().size(), read_stats_sw.elapsed_us() /
1000);
-
- DeleteBitmapUpdateLockPB lock_info_tmp;
- if (!check_delete_bitmap_lock(code, msg, ss, txn, instance_id, table_id,
request->lock_id(),
- request->initiator(), lock_key,
lock_info_tmp, "v1")) {
- LOG(WARNING) << "failed to check delete bitmap lock after get tablet
stats and tablet "
- "states, table_id="
- << table_id << " request lock_id=" << request->lock_id()
- << " request initiator=" << request->initiator() << "
code=" << code
- << " msg=" << msg;
- }
+ };
}
void MetaServiceImpl::remove_delete_bitmap_update_lock_v2(
diff --git a/cloud/src/meta-service/meta_service.h
b/cloud/src/meta-service/meta_service.h
index b537c35b32d..963c01015ea 100644
--- a/cloud/src/meta-service/meta_service.h
+++ b/cloud/src/meta-service/meta_service.h
@@ -332,6 +332,12 @@ private:
const AlterInstanceRequest* request,
std::function<std::pair<MetaServiceCode,
std::string>(InstanceInfoPB*)> action);
+ bool get_mow_tablet_stats_and_meta(MetaServiceCode& code, std::string& msg,
+ const GetDeleteBitmapUpdateLockRequest*
request,
+ GetDeleteBitmapUpdateLockResponse*
response,
+ std::string& instance_id, std::string&
lock_key,
+ std::string lock_use_version);
+
void get_delete_bitmap_update_lock_v2(google::protobuf::RpcController*
controller,
const
GetDeleteBitmapUpdateLockRequest* request,
GetDeleteBitmapUpdateLockResponse*
response,
diff --git a/cloud/test/meta_service_test.cpp b/cloud/test/meta_service_test.cpp
index 731bc8d78bf..03e03db85a9 100644
--- a/cloud/test/meta_service_test.cpp
+++ b/cloud/test/meta_service_test.cpp
@@ -4913,50 +4913,58 @@ TEST(MetaServiceTest,
GetDeleteBitmapUpdateLockNoReadStats) {
TEST(MetaServiceTest, GetDeleteBitmapUpdateLockTabletStatsNormal) {
auto meta_service = get_meta_service();
- std::string instance_id = "test_get_delete_bitmap_update_lock_normal";
- [[maybe_unused]] auto* sp = SyncPoint::get_instance();
- std::unique_ptr<int, std::function<void(int*)>> defer((int*)0x01, [](int*)
{
- SyncPoint::get_instance()->disable_processing();
- SyncPoint::get_instance()->clear_all_call_backs();
- });
- sp->set_call_back("get_instance_id", [&](auto&& args) {
- auto* ret = try_any_cast_ret<std::string>(args);
- ret->first = instance_id;
- ret->second = true;
- });
- sp->enable_processing();
+ bool enable_batch_get_mow_tablet_stats_and_meta_vals[] = {false, true};
+ for (bool val : enable_batch_get_mow_tablet_stats_and_meta_vals) {
+ config::enable_batch_get_mow_tablet_stats_and_meta = val;
- int64_t db_id = 1000;
- int64_t table_id = 2001;
- int64_t index_id = 3001;
- // [(partition_id, tablet_id)]
- std::vector<std::array<int64_t, 2>> tablet_idxes {{70001, 12345}, {80001,
3456}, {90001, 6789}};
+ std::string instance_id = "test_get_delete_bitmap_update_lock_normal";
+ [[maybe_unused]] auto* sp = SyncPoint::get_instance();
+ std::unique_ptr<int, std::function<void(int*)>> defer((int*)0x01,
[](int*) {
+ SyncPoint::get_instance()->disable_processing();
+ SyncPoint::get_instance()->clear_all_call_backs();
+ });
+ sp->set_call_back("get_instance_id", [&](auto&& args) {
+ auto* ret = try_any_cast_ret<std::string>(args);
+ ret->first = instance_id;
+ ret->second = true;
+ });
+ sp->enable_processing();
- add_tablet_metas(meta_service.get(), instance_id, table_id, index_id,
tablet_idxes);
+ int64_t db_id = 1000;
+ int64_t table_id = 2001;
+ int64_t index_id = 3001;
+ // [(partition_id, tablet_id)]
+ std::vector<std::array<int64_t, 2>> tablet_idxes {
+ {70001, 12345}, {80001, 3456}, {90001, 6789}};
- GetDeleteBitmapUpdateLockResponse res;
- get_delete_bitmap_update_lock(meta_service.get(), res, db_id, table_id,
index_id, tablet_idxes,
- 5, 999999, -1, true);
- ASSERT_EQ(res.status().code(), MetaServiceCode::OK);
+ add_tablet_metas(meta_service.get(), instance_id, table_id, index_id,
tablet_idxes);
- ASSERT_EQ(res.base_compaction_cnts().size(), tablet_idxes.size());
- for (const auto& base_compaction_cnt : res.base_compaction_cnts()) {
- ASSERT_EQ(base_compaction_cnt, 10);
- }
- ASSERT_EQ(res.cumulative_compaction_cnts().size(), tablet_idxes.size());
- for (const auto& cumu_compaction_cnt : res.cumulative_compaction_cnts()) {
- ASSERT_EQ(cumu_compaction_cnt, 20);
- }
- ASSERT_EQ(res.cumulative_points().size(), tablet_idxes.size());
- for (const auto& cumulative_point : res.cumulative_points()) {
- ASSERT_EQ(cumulative_point, 30);
+ GetDeleteBitmapUpdateLockResponse res;
+ get_delete_bitmap_update_lock(meta_service.get(), res, db_id,
table_id, index_id,
+ tablet_idxes, 5, 999999, -1, true);
+ ASSERT_EQ(res.status().code(), MetaServiceCode::OK);
+
+ ASSERT_EQ(res.base_compaction_cnts().size(), tablet_idxes.size());
+ for (const auto& base_compaction_cnt : res.base_compaction_cnts()) {
+ ASSERT_EQ(base_compaction_cnt, 10);
+ }
+ ASSERT_EQ(res.cumulative_compaction_cnts().size(),
tablet_idxes.size());
+ for (const auto& cumu_compaction_cnt :
res.cumulative_compaction_cnts()) {
+ ASSERT_EQ(cumu_compaction_cnt, 20);
+ }
+ ASSERT_EQ(res.cumulative_points().size(), tablet_idxes.size());
+ for (const auto& cumulative_point : res.cumulative_points()) {
+ ASSERT_EQ(cumulative_point, 30);
+ }
}
}
TEST(MetaServiceTest, GetDeleteBitmapUpdateLockTabletStatsLockExpired) {
auto meta_service = get_meta_service();
- {
+ bool enable_batch_get_mow_tablet_stats_and_meta_vals[] = {false, true};
+ for (bool val : enable_batch_get_mow_tablet_stats_and_meta_vals) {
+ config::enable_batch_get_mow_tablet_stats_and_meta = val;
// 2.1 abnormal path, lock has been expired and taken by another
load/compaction during
// the reading of tablet stats
std::string instance_id =
"test_get_delete_bitmap_update_lock_abnormal1";
@@ -4997,7 +5005,9 @@ TEST(MetaServiceTest,
GetDeleteBitmapUpdateLockTabletStatsLockExpired) {
ASSERT_EQ(res.cumulative_points().size(), 0);
}
- {
+ for (bool val : enable_batch_get_mow_tablet_stats_and_meta_vals) {
+ config::enable_batch_get_mow_tablet_stats_and_meta = val;
+
// 2.2 abnormal path, lock has been taken by another load/compaction
and been released during
// the reading of tablet stats
std::string instance_id =
"test_get_delete_bitmap_update_lock_abnormal2";
@@ -5039,7 +5049,9 @@ TEST(MetaServiceTest,
GetDeleteBitmapUpdateLockTabletStatsLockExpired) {
TEST(MetaServiceTest, GetDeleteBitmapUpdateLockTabletStatsError) {
auto meta_service = get_meta_service();
- {
+ bool enable_batch_get_mow_tablet_stats_and_meta_vals[] = {false, true};
+ for (bool val : enable_batch_get_mow_tablet_stats_and_meta_vals) {
+ config::enable_batch_get_mow_tablet_stats_and_meta = val;
// 2.3 abnormal path, meeting error when reading tablets' stats
std::string instance_id =
"test_get_delete_bitmap_update_lock_abnormal3";
[[maybe_unused]] auto* sp = SyncPoint::get_instance();
@@ -5077,7 +5089,8 @@ TEST(MetaServiceTest,
GetDeleteBitmapUpdateLockTabletStatsError) {
ASSERT_EQ(res.status().code(), MetaServiceCode::KV_TXN_GET_ERR);
}
- {
+ for (bool val : enable_batch_get_mow_tablet_stats_and_meta_vals) {
+ config::enable_batch_get_mow_tablet_stats_and_meta = val;
// 2.4 abnormal path, meeting TXN_TOO_OLD error when reading tablets'
stats,
// this should not fail if lock is not expired
std::string instance_id =
"test_get_delete_bitmap_update_lock_abnormal4";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
