diff options
| author | Henrik Edin <henrik.edin@mongodb.com> | 2021-09-21 08:58:41 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-09-21 15:59:38 +0000 |
| commit | 22a0ad7427e583e286712a10e42e938bbc5fcf34 (patch) | |
| tree | b1d2fdf5a949c22d9fc3b53b74b661c4d055f8e2 | |
| parent | bf407b88c0641ba62d7dd29b2bfd973bfbe67667 (diff) | |
| download | mongo-22a0ad7427e583e286712a10e42e938bbc5fcf34.tar.gz | |
SERVER-60060 Take FCV into account when checking TimeseriesBucketCompression feature flag
| -rw-r--r-- | jstests/core/timeseries/libs/timeseries.js | 7 | ||||
| -rw-r--r-- | jstests/libs/feature_flag_util.js | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/jstests/core/timeseries/libs/timeseries.js b/jstests/core/timeseries/libs/timeseries.js index 88a3d38d705..7ec3969e972 100644 --- a/jstests/core/timeseries/libs/timeseries.js +++ b/jstests/core/timeseries/libs/timeseries.js @@ -1,5 +1,7 @@ // Helper functions for testing time-series collections. +load("jstests/libs/feature_flag_util.js"); + var TimeseriesTest = class { /** * Returns whether time-series collections are supported. @@ -14,10 +16,7 @@ var TimeseriesTest = class { * Returns whether time-series bucket compression are supported. */ static timeseriesBucketCompressionEnabled(conn) { - return assert - .commandWorked( - conn.adminCommand({getParameter: 1, featureFlagTimeseriesBucketCompression: 1})) - .featureFlagTimeseriesBucketCompression.value; + return FeatureFlagUtil.isEnabled(conn, "TimeseriesBucketCompression"); } /** diff --git a/jstests/libs/feature_flag_util.js b/jstests/libs/feature_flag_util.js index 6f4db466650..1fe8f4b75c0 100644 --- a/jstests/libs/feature_flag_util.js +++ b/jstests/libs/feature_flag_util.js @@ -12,8 +12,9 @@ var FeatureFlagUtil = class { const fcvDoc = admin.runCommand({getParameter: 1, featureCompatibilityVersion: 1}); flagDoc.hasOwnProperty("featureFlag${featureFlag}") && flagDoc.featureFlag${featureFlag}.value && + (!fcvDoc.hasOwnProperty("featureCompatibilityVersion") || MongoRunner.compareBinVersions(fcvDoc.featureCompatibilityVersion.version, - flagDoc.featureFlag${featureFlag}.fcv) >= 0;` + flagDoc.featureFlag${featureFlag}.fcv) >= 0);` ); } }; |