diff options
| author | A. Jesse Jiryu Davis <jesse@mongodb.com> | 2021-09-02 18:47:22 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-09-03 02:35:01 +0000 |
| commit | aec3ea814683689780a122a4b95c8b23794e59e7 (patch) | |
| tree | 1d3b7e7298720d4fd1e8e47942f7cde2e4f8e242 /jstests/replsets/libs | |
| parent | 3d43fc9b257186fdc6e11bd73f1c50c0a3baaccd (diff) | |
| download | mongo-aec3ea814683689780a122a4b95c8b23794e59e7.tar.gz | |
SERVER-57895 Cleaner FCV test
Diffstat (limited to 'jstests/replsets/libs')
| -rw-r--r-- | jstests/replsets/libs/tenant_migration_util.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/jstests/replsets/libs/tenant_migration_util.js b/jstests/replsets/libs/tenant_migration_util.js index 8b50429ed0e..618761bba10 100644 --- a/jstests/replsets/libs/tenant_migration_util.js +++ b/jstests/replsets/libs/tenant_migration_util.js @@ -10,11 +10,12 @@ var TenantMigrationUtil = (function() { */ function isSliceMergeEnabled(db) { const admin = db.getSiblingDB("admin"); - const getParam = admin.runCommand({getParameter: 1, featureFlagSliceMerge: 1}); - const fcv = admin.system.version.findOne({_id: "featureCompatibilityVersion"}).version; - return getParam.hasOwnProperty("featureFlagSliceMerge") && - getParam.featureFlagSliceMerge.value && - MongoRunner.compareBinVersions(fcv, getParam.featureFlagSliceMerge.fcv) >= 0; + const flagDoc = admin.runCommand({getParameter: 1, featureFlagSliceMerge: 1}); + const fcvDoc = admin.runCommand({getParameter: 1, featureCompatibilityVersion: 1}); + return flagDoc.hasOwnProperty("featureFlagSliceMerge") && + flagDoc.featureFlagSliceMerge.value && + MongoRunner.compareBinVersions(fcvDoc.featureCompatibilityVersion.version, + flagDoc.featureFlagSliceMerge.fcv) >= 0; } /** |