This is an automated email from the ASF dual-hosted git repository.
gavinchou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new e993b0fdec1 [fix](cloud) Fix incorrect log for detached tablet stats
kv (#41119)
e993b0fdec1 is described below
commit e993b0fdec1452772db5f75eed2da76bb719d472
Author: Gavin Chou <gavineaglec...@gmail.com>
AuthorDate: Mon Sep 23 16:01:39 2024 +0800
[fix](cloud) Fix incorrect log for detached tablet stats kv (#41119)
---
cloud/src/meta-service/meta_service_tablet_stats.cpp | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/cloud/src/meta-service/meta_service_tablet_stats.cpp
b/cloud/src/meta-service/meta_service_tablet_stats.cpp
index 572ee6ebb68..501cecbab76 100644
--- a/cloud/src/meta-service/meta_service_tablet_stats.cpp
+++ b/cloud/src/meta-service/meta_service_tablet_stats.cpp
@@ -82,9 +82,16 @@ void internal_get_tablet_stats(MetaServiceCode& code,
std::string& msg, Transact
int get_detached_tablet_stats(const std::vector<std::pair<std::string,
std::string>>& stats_kvs,
TabletStats& detached_stats) {
- if (stats_kvs.size() != 5 && stats_kvs.size() != 1) {
- LOG(WARNING) << "incorrect tablet stats_kvs, it should be 1 or 5
size=" << stats_kvs.size();
+ bool unexpected_size = false;
+ // clang-format off
+ if (stats_kvs.size() != 5 // aggregated stats and 4 splitted stats:
num_rowsets num_segs data_size num_rows
+ && stats_kvs.size() != 2 // aggregated stats and 1 splitted stats:
num_rowsets
+ && stats_kvs.size() != 1 // aggregated stats only (nothing has been
imported since created)
+ ) {
+ unexpected_size = true;
}
+ // clang-format on
+ std::stringstream ss;
for (size_t i = 1; i < stats_kvs.size(); ++i) {
std::string_view k(stats_kvs[i].first), v(stats_kvs[i].second);
k.remove_prefix(1);
@@ -111,6 +118,8 @@ int get_detached_tablet_stats(const
std::vector<std::pair<std::string, std::stri
val = bswap_64(val);
}
+ if (unexpected_size) ss << *suffix << " ";
+
if (*suffix == STATS_KEY_SUFFIX_DATA_SIZE) {
detached_stats.data_size = val;
} else if (*suffix == STATS_KEY_SUFFIX_NUM_ROWS) {
@@ -120,10 +129,15 @@ int get_detached_tablet_stats(const
std::vector<std::pair<std::string, std::stri
} else if (*suffix == STATS_KEY_SUFFIX_NUM_SEGS) {
detached_stats.num_segs = val;
} else {
- LOG(WARNING) << "unknown suffix=" << *suffix << " key=" << hex(k);
+ LOG(WARNING) << "unknown tablet stats suffix=" << *suffix << "
key=" << hex(k);
}
}
+ if (unexpected_size) {
+ LOG_EVERY_N(WARNING, 100) << "unexpected tablet stats_kvs, it should
be 1 or 2 or 5, size="
+ << stats_kvs.size() << " suffix=" <<
ss.str();
+ }
+
return 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
