From 5bfab3626c2b319bba488f9bf2efff5a54a14026 Mon Sep 17 00:00:00 2001 From: Rui Liu Date: Tue, 4 Jan 2022 19:01:03 +0000 Subject: SERVER-62192 Check feature flag for sharding timeseries collection on shards in implicit sharding accessed collections (cherry picked from commit ab91beea0deb3f4ca5929066b9ba23a0cfc7796c) --- .../override_methods/implicitly_shard_accessed_collections.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'jstests') diff --git a/jstests/libs/override_methods/implicitly_shard_accessed_collections.js b/jstests/libs/override_methods/implicitly_shard_accessed_collections.js index 07355dc7126..cdcd06b501e 100644 --- a/jstests/libs/override_methods/implicitly_shard_accessed_collections.js +++ b/jstests/libs/override_methods/implicitly_shard_accessed_collections.js @@ -37,6 +37,7 @@ const ImplicitlyShardAccessCollSettings = (function() { 'use strict'; load("jstests/libs/override_methods/override_helpers.js"); // For 'OverrideHelpers'. +load("jstests/libs/fixture_helpers.js"); // For 'FixtureHelpers'. // Save a reference to the original methods in the IIFE's scope. // This scoping allows the original methods to be called by the overrides below. @@ -135,9 +136,12 @@ DB.prototype.createCollection = function() { return createCollResult; } - const parameterResult = this.adminCommand({getParameter: 1, featureFlagShardedTimeSeries: 1}); + const parameterResults = FixtureHelpers.runCommandOnEachPrimary({ + db: this.getSiblingDB('admin'), + cmdObj: {getParameter: 1, featureFlagShardedTimeSeries: 1} + }); const isTimeseriesShardingEnabled = - parameterResult.ok && parameterResult.featureFlagShardedTimeSeries.value; + parameterResults.every(result => result.ok && result.featureFlagShardedTimeSeries.value); if (!isTimeseriesShardingEnabled) { return createCollResult; } -- cgit v1.2.1