SERVER-64241: Make ttlMonitorSleepSecs change effective immediately. …

…Speedup timeseries_expire.js
HyaZz · Mar 30, 2022 · 84befbc · 84befbc
1 parent b52ac90
commit 84befbc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/buildscripts/resmokeconfig/suites/cst_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/cst_jscore_passthrough.yml
@@ -783,10 +783,6 @@ selector:
  - jstests/core/exists9.js
  - jstests/core/exists8.js
 
- # Timeseries collection expireAfterSeconds option requires the TTL Monitor,
- # which is disabled in this test configuration.
- - jstests/core/timeseries/timeseries_expire.js
-
  # TODO SERVER-54042 Time-series collection queries
  - jstests/core/timeseries/timeseries_bucket_limit_count.js
  - jstests/core/timeseries/timeseries_min_max.js

diff --git a/jstests/core/timeseries/timeseries_expire.js → jstests/noPassthrough/timeseries_expire.js b/jstests/core/timeseries/timeseries_expire.js → jstests/noPassthrough/timeseries_expire.js
@@ -10,20 +10,25 @@
 (function() {
 "use strict";
 
+load('jstests/libs/fixture_helpers.js'); // For 'FixtureHelpers'
 load("jstests/core/timeseries/libs/timeseries.js");
 
+const conn = MongoRunner.runMongod({setParameter: 'ttlMonitorSleepSecs=1'});
+const testDB = conn.getDB(jsTestName());
+assert.commandWorked(testDB.dropDatabase());
+
 TimeseriesTest.run((insert) => {
- const coll = db.timeseries_expire;
- const bucketsColl = db.getCollection('system.buckets.' + coll.getName());
+ const coll = testDB.timeseries_expire;
+ const bucketsColl = testDB.getCollection('system.buckets.' + coll.getName());
 
  coll.drop();
 
  const timeFieldName = 'time';
- const expireAfterSeconds = NumberLong(5);
- assert.commandWorked(db.createCollection(
+ const expireAfterSeconds = NumberLong(1);
+ assert.commandWorked(testDB.createCollection(
  coll.getName(),
  {timeseries: {timeField: timeFieldName}, expireAfterSeconds: expireAfterSeconds}));
- assert.contains(bucketsColl.getName(), db.getCollectionNames());
+ assert.contains(bucketsColl.getName(), testDB.getCollectionNames());
 
  // Inserts a measurement with a time in the past to ensure the measurement will be removed
  // immediately.
@@ -46,4 +51,6 @@ TimeseriesTest.run((insert) => {
  const bucketDocs = bucketsColl.find().sort({'control.min._id': 1}).toArray();
  assert.eq(0, bucketDocs.length, bucketDocs);
 });
+
+MongoRunner.stopMongod(conn);
 })();