SERVER-61186 Remove ReshardingTest#isMixedVersionCluster() method.

Also removes the require_fcv_51 tag from the
resharding_histogram_metrics.js test and instead has it excluded from
the implicit multiversion testing until SERVER 57700 is backported to
the 5.0 branch.

(cherry picked from commit 9804c87ef41f0b161338b3c99c9415fe239519e5)

4 files changed, 11 insertions, 16 deletions

diff --git a/etc/backports_required_for_multiversion_tests.yml b/etc/backports_required_for_multiversion_tests.yml
index e653da6ee97..2040437d763 100644
--- a/etc/backports_required_for_multiversion_tests.yml
+++ b/etc/backports_required_for_multiversion_tests.yml
@@ -102,6 +102,8 @@ last-continuous:
       test_file: jstests/sharding/test_resharding_test_fixture_shutdown_retry_needed.js
     - ticket: SERVER-59505
       test_file: jstests/core/timeseries/timeseries_find.js
+    - ticket: SERVER-57700
+      test_file: jstests/sharding/resharding_histogram_metrics.js
 
   # Tests that should only be excluded from particular suites should be listed under that suite.
   suites:
@@ -364,6 +366,8 @@ last-lts:
       test_file: jstests/aggregation/range.js
     - ticket: SERVER-59923
       test_file: jstests/sharding/test_resharding_test_fixture_shutdown_retry_needed.js
+    - ticket: SERVER-57700
+      test_file: jstests/sharding/resharding_histogram_metrics.js
 
   # Tests that should only be excluded from particular suites should be listed under that suite.
   suites:
diff --git a/jstests/sharding/libs/resharding_test_fixture.js b/jstests/sharding/libs/resharding_test_fixture.js
index 924b59a6ab4..80010620013 100644
--- a/jstests/sharding/libs/resharding_test_fixture.js
+++ b/jstests/sharding/libs/resharding_test_fixture.js
@@ -899,9 +899,4 @@ var ReshardingTest = class {
 
         return cloneTimestamp;
     }
-
-    isMixedVersionCluster() {
-        const clusterVersionInfo = this._st.getClusterVersionInfo();
-        return clusterVersionInfo.isMixedVersion;
-    }
 };
diff --git a/jstests/sharding/resharding_histogram_metrics.js b/jstests/sharding/resharding_histogram_metrics.js
index aa7b236a9be..c474db95d96 100644
--- a/jstests/sharding/resharding_histogram_metrics.js
+++ b/jstests/sharding/resharding_histogram_metrics.js
@@ -2,7 +2,6 @@
 // during resharding.
 //
 // @tags: [
-//   requires_fcv_51,
 //   uses_atclustertime,
 // ]
 //
@@ -60,7 +59,7 @@ function getReshardingMetricsReport(mongo, role) {
     } else {
         const report = getCurrentOpReport(mongo, role);
         assert(report.inprog.length === 1,
-               `expected report.inprog.length === 1, 
+               `expected report.inprog.length === 1,
             instead found ${report.inprog.length}`);
         return report.inprog[0];
     }
@@ -125,14 +124,14 @@ reshardingTest.withReshardingInBackground(
                 const expectedBatchInserts = reshardingMetrics[kDocumentsCopied] + 1;
                 const receivedBatchInserts = collClonerFillBatchForInsertHist["ops"];
                 assert(expectedBatchInserts == receivedBatchInserts,
-                       `expected ${expectedBatchInserts} batch inserts, 
+                       `expected ${expectedBatchInserts} batch inserts,
                        received ${receivedBatchInserts}`);
 
                 firstReshardBatchApplies += oplogApplierApplyBatchHist["ops"];
             });
 
             assert(firstReshardBatchApplies > 0,
-                   `Expected greater than 0 recorded batch applies, 
+                   `Expected greater than 0 recorded batch applies,
                     got ${firstReshardBatchApplies} instead.`);
         }
     });
@@ -184,8 +183,8 @@ recipientShardNames.forEach(function(shardName) {
 // copied during cloning plus one empty batch for each recipient for both resharding operations.
 const expectedCumulativeBatchInserts = totalDocumentsCopied + 2 * recipientShardNames.length;
 
-assert(cumulativeBatchApplies > firstReshardBatchApplies, `Expected batch oplog applies 
-       to accumluate. Instead found ${cumulativeBatchApplies} cumulative applies, 
+assert(cumulativeBatchApplies > firstReshardBatchApplies, `Expected batch oplog applies
+       to accumluate. Instead found ${cumulativeBatchApplies} cumulative applies,
        compared to ${firstReshardBatchApplies} from first reshard operation.`);
 assert(cumulativeBatchInserts == expectedCumulativeBatchInserts, `Expected
        ${expectedCumulativeBatchInserts} cumulative batch inserts. Instead found
diff --git a/jstests/sharding/resharding_metrics.js b/jstests/sharding/resharding_metrics.js
index 97834ff0d9c..9da0235711d 100644
--- a/jstests/sharding/resharding_metrics.js
+++ b/jstests/sharding/resharding_metrics.js
@@ -140,13 +140,10 @@ function verifyCurrentOpOutput(reshardingTest, inputCollection) {
         "totalApplyTimeElapsedSecs": undefined,
         "recipientState": undefined,
         "opStatus": "running",
+        "oplogApplierApplyBatchLatencyMillis": undefined,
+        "collClonerFillBatchForInsertLatencyMillis": undefined,
     };
 
-    if (!reshardingTest.isMixedVersionCluster()) {
-        expectedRecipientMetrics.oplogApplierApplyBatchLatencyMillis = undefined;
-        expectedRecipientMetrics.collClonerFillBatchForInsertLatencyMillis = undefined;
-    }
-
     reshardingTest.recipientShardNames.forEach(function(shardName) {
         checkCurrentOp(new Mongo(topology.shards[shardName].primary),
                        shardName,