SERVER-115716 Fix concurrency issue in server_status_multiplanner.js (#45500)

GitOrigin-RevId: ed7eb3925fd9095845396625635123254c5f7545
This commit is contained in:
Ivan Fefer 2025-12-19 11:54:07 +01:00 committed by MongoDB Bot
parent dd9d82c6da
commit 3a9ddf5e84

View File

@ -72,20 +72,31 @@ assertClassicMultiPlannerMetrics(multiPlannerMetrics, 0);
assertClassicMultiPlannerMetrics(multiPlannerMetrics, 2);
}
assert.soon(() => {
// Verify FTDC includes aggregate metrics.
const multiPlannerMetricsFtdc =
verifyGetDiagnosticData(conn.getDB("admin")).serverStatus.metrics.query.multiPlanner;
assert.soon(
() => {
// Verify FTDC includes aggregate metrics.
const multiPlannerMetricsFtdc =
verifyGetDiagnosticData(conn.getDB("admin")).serverStatus.metrics.query.multiPlanner;
const expectedClassicCount = 2;
if (multiPlannerMetricsFtdc.classicCount != expectedClassicCount) {
// This is an indication we haven't retrieve the expected serverStatus metrics yet.
return false;
}
const expectedClassicCount = 2;
if (multiPlannerMetricsFtdc.classicCount != expectedClassicCount) {
// This is an indication we haven't retrieve the expected serverStatus metrics yet.
return false;
}
assertClassicMultiPlannerMetrics(multiPlannerMetricsFtdc, expectedClassicCount);
return true;
}, "FTDC output should eventually reflect observed serverStatus metrics.");
try {
assertClassicMultiPlannerMetrics(multiPlannerMetricsFtdc, expectedClassicCount);
} catch (e) {
// All counters are updated individually, so it is possible that classicCount is
// updated, but histograms are not.
return false;
}
return true;
},
() => "FTDC output should eventually reflect observed serverStatus metrics. Current FTDC: " +
tojson(
verifyGetDiagnosticData(conn.getDB("admin")).serverStatus.metrics.query.multiPlanner),
);
// Test 'stoppingConditions.hitWorksLimit'.
{