SERVER-60911 Remove FCV references for secondary indexes on time-series measurements for kLastContinuous

1 files changed, 13 insertions, 12 deletions

diff --git a/jstests/noPassthrough/timeseries_measurement_indexes_downgrade.js b/jstests/noPassthrough/timeseries_measurement_indexes_downgrade.js
index d1b913832a2..4889af415e6 100644
--- a/jstests/noPassthrough/timeseries_measurement_indexes_downgrade.js
+++ b/jstests/noPassthrough/timeseries_measurement_indexes_downgrade.js
@@ -37,7 +37,10 @@ function checkIndexForDowngrade(withFCV, isCompatible, createdOnBucketsCollectio
     const index = bucketsColl.getIndexes()[0];
 
     if (isCompatible) {
-        assert(!index.hasOwnProperty("originalSpec"));
+        // All time-series indexes are downgrade compatible to the last continuous FCV as of v5.3.
+        if (withFCV != lastContinuousFCV) {
+            assert(!index.hasOwnProperty("originalSpec"));
+        }
     } else {
         if (createdOnBucketsCollection) {
             // Indexes created directly on the buckets collection do not have the original user
@@ -58,8 +61,6 @@ function checkIndexForDowngrade(withFCV, isCompatible, createdOnBucketsCollectio
     assert.commandWorked(coll.dropIndexes("*"));
 }
 
-// TODO SERVER-60911: Remove downgrade checks for lastContinuousFCV once kLatest is 5.3.
-
 assert.commandWorked(coll.createIndex({[timeFieldName]: 1}));
 checkIndexForDowngrade(lastLTSFCV, true, false);
 
@@ -76,31 +77,31 @@ assert.commandWorked(coll.createIndex({[metaFieldName]: 1, a: 1}));
 checkIndexForDowngrade(lastLTSFCV, false, false);
 
 assert.commandWorked(coll.createIndex({[metaFieldName]: 1, a: 1}));
-checkIndexForDowngrade(lastContinuousFCV, false, false);
+checkIndexForDowngrade(lastContinuousFCV, true, false);
 
 assert.commandWorked(coll.createIndex({b: 1}));
 checkIndexForDowngrade(lastLTSFCV, false, false);
 
 assert.commandWorked(coll.createIndex({b: 1}));
-checkIndexForDowngrade(lastContinuousFCV, false, false);
+checkIndexForDowngrade(lastContinuousFCV, true, false);
 
 assert.commandWorked(bucketsColl.createIndex({"control.min.c.d": 1, "control.max.c.d": 1}));
 checkIndexForDowngrade(lastLTSFCV, false, true);
 
 assert.commandWorked(bucketsColl.createIndex({"control.min.c.d": 1, "control.max.c.d": 1}));
-checkIndexForDowngrade(lastContinuousFCV, false, true);
+checkIndexForDowngrade(lastContinuousFCV, true, true);
 
 assert.commandWorked(bucketsColl.createIndex({"control.min.e": 1, "control.min.f": 1}));
 checkIndexForDowngrade(lastLTSFCV, false, true);
 
 assert.commandWorked(bucketsColl.createIndex({"control.min.e": 1, "control.min.f": 1}));
-checkIndexForDowngrade(lastContinuousFCV, false, true);
+checkIndexForDowngrade(lastContinuousFCV, true, true);
 
 assert.commandWorked(coll.createIndex({g: "2dsphere"}));
 checkIndexForDowngrade(lastLTSFCV, false, false);
 
 assert.commandWorked(coll.createIndex({g: "2dsphere"}));
-checkIndexForDowngrade(lastContinuousFCV, false, false);
+checkIndexForDowngrade(lastContinuousFCV, true, false);
 
 assert.commandWorked(coll.createIndex({[metaFieldName]: "2d"}));
 checkIndexForDowngrade(lastLTSFCV, true, false);
@@ -121,7 +122,7 @@ checkIndexForDowngrade(lastLTSFCV, false, false);
 
 assert.commandWorked(
     coll.createIndex({[timeFieldName]: 1}, {partialFilterExpression: {x: {$type: "number"}}}));
-checkIndexForDowngrade(lastContinuousFCV, false, false);
+checkIndexForDowngrade(lastContinuousFCV, true, false);
 
 assert.commandWorked(
     coll.createIndex({[metaFieldName]: 1}, {partialFilterExpression: {x: {$type: "number"}}}));
@@ -129,13 +130,13 @@ checkIndexForDowngrade(lastLTSFCV, false, false);
 
 assert.commandWorked(
     coll.createIndex({[metaFieldName]: 1}, {partialFilterExpression: {x: {$type: "number"}}}));
-checkIndexForDowngrade(lastContinuousFCV, false, false);
+checkIndexForDowngrade(lastContinuousFCV, true, false);
 
 assert.commandWorked(coll.createIndex({x: 1}, {partialFilterExpression: {x: {$type: "number"}}}));
 checkIndexForDowngrade(lastLTSFCV, false, false);
 
 assert.commandWorked(coll.createIndex({x: 1}, {partialFilterExpression: {x: {$type: "number"}}}));
-checkIndexForDowngrade(lastContinuousFCV, false, false);
+checkIndexForDowngrade(lastContinuousFCV, true, false);
 
 assert.commandWorked(coll.createIndex({[metaFieldName]: 1, x: 1},
                                       {partialFilterExpression: {x: {$type: "number"}}}));
@@ -143,7 +144,7 @@ checkIndexForDowngrade(lastLTSFCV, false, false);
 
 assert.commandWorked(coll.createIndex({x: 1, [metaFieldName]: 1},
                                       {partialFilterExpression: {x: {$type: "number"}}}));
-checkIndexForDowngrade(lastContinuousFCV, false, false);
+checkIndexForDowngrade(lastContinuousFCV, true, false);
 
 MongoRunner.stopMongod(conn);
 }());