diff options
| author | Lucas de Castro Borges <lucas@gnuabordo.com.br> | 2025-02-11 15:07:35 -0300 |
|---|---|---|
| committer | Lucas de Castro Borges <lucas@gnuabordo.com.br> | 2025-02-11 15:07:35 -0300 |
| commit | 4cb8841196d0625dfa3825aa326f071cd27c7b8b (patch) | |
| tree | 1682a647d4463397c119183369ae6f750d5fdcff /src/mongo/db/pipeline/memory_usage_tracker_test.cpp | |
| parent | aa03c6362cbaa767638e6eed9b031d86dd2643d1 (diff) | |
| parent | 8f0827553e09872941945a093b647a4211a9db7f (diff) | |
Update upstream source from tag 'upstream/6.0.0'master
Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322
Diffstat (limited to 'src/mongo/db/pipeline/memory_usage_tracker_test.cpp')
| -rw-r--r-- | src/mongo/db/pipeline/memory_usage_tracker_test.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/mongo/db/pipeline/memory_usage_tracker_test.cpp b/src/mongo/db/pipeline/memory_usage_tracker_test.cpp index f60933a4655..cc354e7fd69 100644 --- a/src/mongo/db/pipeline/memory_usage_tracker_test.cpp +++ b/src/mongo/db/pipeline/memory_usage_tracker_test.cpp @@ -99,28 +99,28 @@ TEST_F(MemoryUsageTrackerTest, UpdateUsageUpdatesGlobal) { ASSERT_EQ(_tracker.maxMemoryBytes(), 150LL); } -// TODO SERVER-61281: Switch to 'DEATH_TEST_F' checking the underflow case. -TEST_F(MemoryUsageTrackerTest, UpdateFunctionUsageToNegativeIsDisallowed) { - _funcTracker.set(50LL); - ASSERT_EQ(_funcTracker.currentMemoryBytes(), 50LL); - ASSERT_EQ(_funcTracker.maxMemoryBytes(), 50LL); +DEATH_TEST_F(MemoryUsageTrackerTest, + UpdateGlobalToNegativeIsDisallowed, + "Underflow on memory tracking") { + _tracker.set(50LL); ASSERT_EQ(_tracker.currentMemoryBytes(), 50LL); ASSERT_EQ(_tracker.maxMemoryBytes(), 50LL); - _funcTracker.update(-100); - ASSERT_EQ(_tracker.currentMemoryBytes(), 0LL); - ASSERT_EQ(_tracker.maxMemoryBytes(), 50LL); + _tracker.update(-100); } -// TODO SERVER-61281: Switch to 'DEATH_TEST_F' checking the underflow case. -TEST_F(MemoryUsageTrackerTest, UpdateMemUsageToNegativeIsDisallowed) { - _tracker.set(50LL); +TEST_F(MemoryUsageTrackerTest, UpdateFunctionUsageToNegativeIsDisallowed) { + _funcTracker.set(50LL); ASSERT_EQ(_tracker.currentMemoryBytes(), 50LL); ASSERT_EQ(_tracker.maxMemoryBytes(), 50LL); - _tracker.update(-100); + // TODO SERVER-61281: Temporarily disable the assert (and associated test) in + // PerFunctionMemoryTracker.update() to prevent inaccurate tracking to cause underflow errors + // Once accurate tracking is implemented and no underflow should happen, this negative test + // could be restored to verify that "Underflow on memory tracking" is reported. + + _funcTracker.update(-100); ASSERT_EQ(_tracker.currentMemoryBytes(), 0LL); - ASSERT_EQ(_tracker.maxMemoryBytes(), 50LL); } } // namespace |