Skip to content

Commit f8a7451

Browse files
trondnBenHuddleston
authored andcommitted
MB-58654: Return bucket name as the key stat name
And disable validation for that stat Change-Id: Ic84cffb7e543df51f41b8b8a7d15b2fef23175f2 Reviewed-on: https://review.couchbase.org/c/kv_engine/+/197180 Tested-by: Ben Huddleston <[email protected]> Reviewed-by: Ben Huddleston <[email protected]>
1 parent 634386a commit f8a7451

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

daemon/protocol/mcbp/stats_context.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,7 @@ static cb::engine_errc stat_bucket_details_executor(const std::string& arg,
245245
Bucket& bucket = BucketManager::instance().at(ii);
246246
auto json = bucket.to_json();
247247
if (!json.empty() && json["name"] == arg) {
248-
const auto stats_str = json.dump();
249-
append_stats(
250-
fmt::format("bucket details:{}", arg), stats_str, cookie);
248+
append_stats(arg, json.dump(), cookie);
251249
return cb::engine_errc::success;
252250
}
253251
}

tests/testapp/testapp_stats.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,11 +505,12 @@ TEST_P(StatsTest, TestBucketDetailsSingleBucket) {
505505
nlohmann::json json;
506506
size_t ncallback = 0;
507507

508+
adminConnection->setUserValidateReceivedFrameCallback({});
508509
adminConnection->stats(
509510
[this, &json, &ncallback](const auto& k, const auto& v) {
510511
++ncallback;
511512
if (!k.empty()) {
512-
ASSERT_EQ(fmt::format("bucket details:{}", bucketName), k);
513+
ASSERT_EQ(bucketName, k);
513514
ASSERT_FALSE(v.empty());
514515
json = nlohmann::json::parse(v);
515516
} else {

0 commit comments

Comments
 (0)