diff options
| author | Daniel Gómez Ferro <daniel.gomezferro@mongodb.com> | 2022-02-03 15:29:16 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-02-03 16:23:56 +0000 |
| commit | 882ebf1ad73b1c39af8b0cd82de7c648b8a860d2 (patch) | |
| tree | 02c171b2450e563b69bb3b1f2a016aa165b8e950 | |
| parent | c81c668189f7c7a933661d1e225aacfdbc33840d (diff) | |
| download | mongo-882ebf1ad73b1c39af8b0cd82de7c648b8a860d2.tar.gz | |
SERVER-62874 Fix and enable tests from clustered/sharding suite
| -rw-r--r-- | buildscripts/resmokeconfig/suites/sharding_clustered_collections.yml | 5 | ||||
| -rw-r--r-- | jstests/sharding/change_stream_show_migration_events.js | 29 |
2 files changed, 26 insertions, 8 deletions
diff --git a/buildscripts/resmokeconfig/suites/sharding_clustered_collections.yml b/buildscripts/resmokeconfig/suites/sharding_clustered_collections.yml index 3d7d857a009..621da32369a 100644 --- a/buildscripts/resmokeconfig/suites/sharding_clustered_collections.yml +++ b/buildscripts/resmokeconfig/suites/sharding_clustered_collections.yml @@ -15,9 +15,7 @@ selector: - jstests/sharding/shard6.js # Expects hint(_id) to yield an index scan instead of a table scan. - jstests/sharding/shard2.js - # TODO (SERVER-62874): Investigate the following test failures. - - jstests/sharding/internal_sessions_partial_index.js - - jstests/sharding/change_stream_show_migration_events.js + # Expects the collection creation options not to change. - jstests/sharding/move_primary_with_writes.js exclude_with_any_tags: - expects_explicit_underscore_id_index @@ -31,5 +29,4 @@ executor: setParameters: featureFlagClusteredIndexes: true enableTestCommands: 1 - internalQueryForceClassicEngine: 1 failpoint.clusterAllCollectionsByDefault: "{mode: 'alwaysOn'}" diff --git a/jstests/sharding/change_stream_show_migration_events.js b/jstests/sharding/change_stream_show_migration_events.js index bab29387828..61d3c7267fd 100644 --- a/jstests/sharding/change_stream_show_migration_events.js +++ b/jstests/sharding/change_stream_show_migration_events.js @@ -154,17 +154,29 @@ assert.commandWorked(mongosColl.insert({_id: -4}, {writeConcern: {w: "majority"} assert.commandWorked(mongosColl.insert({_id: 4}, {writeConcern: {w: "majority"}})); assert.commandWorked(mongosColl.insert({_id: 24}, {writeConcern: {w: "majority"}})); +// Inserts for a given migration are ordered by `RecordId` in the recipient shard. For normal +// collections that's the insertion order but for clustered colls that's the cluster key order. +const clustered = mongosColl.getIndexes()[0].clustered; + // Check that each change stream returns the expected events. shardZeroEvents = [ makeEvent(-3, "insert"), makeEvent(-3, "delete"), makeEvent(-2, "delete"), ]; -shardOneEvents = [ +shardOneEvents = clustered ? [ makeEvent(3, "insert"), makeEvent(23, "insert"), + makeEvent(-3, "insert"), // Clustered order. makeEvent(-2, "insert"), - makeEvent(-3, "insert"), + makeEvent(-4, "insert"), + makeEvent(4, "insert"), + makeEvent(24, "insert"), +] : [ + makeEvent(3, "insert"), + makeEvent(23, "insert"), + makeEvent(-2, "insert"), + makeEvent(-3, "insert"), // Non-clustered order. makeEvent(-4, "insert"), makeEvent(4, "insert"), makeEvent(24, "insert"), @@ -224,14 +236,23 @@ let shardOneEventsAfterNewShard = [ makeEvent(-6, "insert"), makeEvent(6, "insert"), ]; -let newShardEvents = [ +let newShardEvents = clustered ? [ + makeEvent(16, "insert"), // Clustered order. makeEvent(20, "insert"), makeEvent(21, "insert"), makeEvent(22, "insert"), makeEvent(23, "insert"), makeEvent(24, "insert"), makeEvent(25, "insert"), - makeEvent(16, "insert"), + makeEvent(26, "insert"), +] : [ + makeEvent(20, "insert"), + makeEvent(21, "insert"), + makeEvent(22, "insert"), + makeEvent(23, "insert"), + makeEvent(24, "insert"), + makeEvent(25, "insert"), + makeEvent(16, "insert"), // Non-clustered order. makeEvent(26, "insert"), ]; |