mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

SERVER-74283: fix broken test

Browse Source
This commit is contained in:
joshua 2023-03-11 00:49:37 +00:00 committed by Evergreen Agent
parent 45e7d2fef5
commit 889dfd8f27
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jstests/telemetry/telemetry_server_status_metrics.js
View File

@ -29,13 +29,9 @@ function runTestWithMongodOptions(mongodOptions, test, testOptions) {
function evictionTest(conn, testDB, coll, testOptions) {
const evictedBefore = testDB.serverStatus().metrics.telemetry.numEvicted;
assert.eq(evictedBefore, 0);
for (var i = 0; i < 100; i++) {
for (var i = 0; i < 4000; i++) {
let query = {};
for (var j = 0; j < 25; ++j) {
query["foo.field.xyz." + i + "." + j] = 1;
query["bar.field.xyz." + i + "." + j] = 2;
query["baz.field.xyz." + i + "." + j] = 3;
}
query["foo" + i] = "bar";
coll.aggregate([{$match: query}]).itcount();
}
if (!testOptions.resetCacheSize) {
@ -47,7 +43,7 @@ function evictionTest(conn, testDB, coll, testOptions) {
// least recently used entries to meet the new, smaller size requirement.
assert.eq(testDB.serverStatus().metrics.telemetry.numEvicted, 0);
assert.commandWorked(
testDB.adminCommand({setParameter: 1, internalQueryConfigureTelemetryCacheSize: "2MB"}));
testDB.adminCommand({setParameter: 1, internalQueryConfigureTelemetryCacheSize: "1MB"}));
const evictedAfter = testDB.serverStatus().metrics.telemetry.numEvicted;
assert.gt(evictedAfter, 0);
}
@ -89,28 +85,23 @@ function countRateLimitedRequestsTest(conn, testDB, coll, testOptions) {
}
/**
* In this configuration, every query is sampled. Each query has a key(~2200 - 2300 bytes) and
* value(208 bytes). With a cache size of 3MB, there are 1024 partitions, each of max size ~ 3072
* bytes. Each partition will only be able to fit one entry, eg a partition with one entry will be
* considered full. When a second query shape/key falls into an already full partition, it will have
* to evict the original entry.
* In this configuration, we insert enough entries into the telemetry store to trigger LRU eviction.
*
* */
runTestWithMongodOptions({
setParameter: {
internalQueryConfigureTelemetryCacheSize: "3MB",
internalQueryConfigureTelemetryCacheSize: "1MB",
internalQueryConfigureTelemetrySamplingRate: 2147483647
},
},
evictionTest,
{resetCacheSize: false});
/**
* In this configuration, every query is sampled. Due to the large initial cache size, entries
* should only be evicted once the cache is reset after telemetry metric collecting, is finished.
* In this configuration, eviction is triggered only when the telemetry store size is reset.
* */
runTestWithMongodOptions({
setParameter: {
internalQueryConfigureTelemetryCacheSize: "10MB",
internalQueryConfigureTelemetryCacheSize: "2MB",
internalQueryConfigureTelemetrySamplingRate: 2147483647
},
},
@ -135,4 +126,4 @@ runTestWithMongodOptions({
},
countRateLimitedRequestsTest,
{samplingRate: 10, numRequests: 20});
}());
}());

6
src/mongo/db/query/telemetry.cpp
View File

@ -49,6 +49,7 @@
#include "mongo/rpc/metadata/client_metadata.h"
#include "mongo/util/assert_util.h"
#include "mongo/util/md5.hpp"
#include "mongo/util/processinfo.h"
#include "mongo/util/system_clock_source.h"
#include <array>
#include <optional>
@ -437,8 +438,9 @@ ServiceContext::ConstructorActionRegisterer telemetryStoreManagerRegisterer{
std::make_unique<TelemetryOnParamChangeUpdaterImpl>();
size_t size = getTelemetryStoreSize();
auto&& globalTelemetryStoreManager = telemetryStoreDecoration(serviceCtx);
// Many partitions reduces lock contention on both reading and write telemetry data.
size_t numPartitions = 1024;
// The plan cache and telemetry store should use the same number of partitions.
// That is, the number of cpu cores.
size_t numPartitions = ProcessInfo::getNumCores();
size_t partitionBytes = size / numPartitions;
size_t metricsSize = sizeof(TelemetryMetrics);
if (partitionBytes < metricsSize * 10) {