commit cf6d117f6078424f2267e9b0115be984a5036812 Author: Charlie Swanson Date: Thu Sep 12 16:36:39 2019 -0400 New FSM workload doing chunk migrations during mapReduce diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml index 47e28bb7c4..bc415c6648 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml @@ -25,19 +25,6 @@ selector: - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled due to SERVER-20057, 'Concurrent, sharded mapReduces can fail when temporary - # namespaces collide across mongos processes' - - jstests/concurrency/fsm_workloads/map_reduce_drop.js - - jstests/concurrency/fsm_workloads/map_reduce_inline.js - - jstests/concurrency/fsm_workloads/map_reduce_interrupt.js - - jstests/concurrency/fsm_workloads/map_reduce_merge.js - - jstests/concurrency/fsm_workloads/map_reduce_merge_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_replace.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_nonexistent.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_remove.js - # Disabled due to MongoDB restrictions and/or workload restrictions # These workloads sometimes trigger 'Could not lock auth data update lock' diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml index a6694e7cce..a281dbe6b5 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml @@ -28,19 +28,6 @@ selector: - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled due to SERVER-20057, 'Concurrent, sharded mapReduces can fail when temporary - # namespaces collide across mongos processes' - - jstests/concurrency/fsm_workloads/map_reduce_drop.js - - jstests/concurrency/fsm_workloads/map_reduce_inline.js - - jstests/concurrency/fsm_workloads/map_reduce_interrupt.js - - jstests/concurrency/fsm_workloads/map_reduce_merge.js - - jstests/concurrency/fsm_workloads/map_reduce_merge_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_replace.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_nonexistent.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_remove.js - # Disabled due to MongoDB restrictions and/or workload restrictions # These workloads sometimes trigger 'Could not lock auth data update lock' diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml index c0c3fc9171..807dc078e2 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml @@ -26,19 +26,6 @@ selector: - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled due to SERVER-20057, 'Concurrent, sharded mapReduces can fail when temporary - # namespaces collide across mongos processes' - - jstests/concurrency/fsm_workloads/map_reduce_drop.js - - jstests/concurrency/fsm_workloads/map_reduce_inline.js - - jstests/concurrency/fsm_workloads/map_reduce_interrupt.js - - jstests/concurrency/fsm_workloads/map_reduce_merge.js - - jstests/concurrency/fsm_workloads/map_reduce_merge_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_replace.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_nonexistent.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_remove.js - # Disabled due to MongoDB restrictions and/or workload restrictions # These workloads sometimes trigger 'Could not lock auth data update lock' diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml index 1b5dedfcbb..8fcf968a6f 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml @@ -26,19 +26,6 @@ selector: - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled due to SERVER-20057, 'Concurrent, sharded mapReduces can fail when temporary - # namespaces collide across mongos processes' - - jstests/concurrency/fsm_workloads/map_reduce_drop.js - - jstests/concurrency/fsm_workloads/map_reduce_inline.js - - jstests/concurrency/fsm_workloads/map_reduce_interrupt.js - - jstests/concurrency/fsm_workloads/map_reduce_merge.js - - jstests/concurrency/fsm_workloads/map_reduce_merge_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_replace.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_nonexistent.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_remove.js - # Disabled due to MongoDB restrictions and/or workload restrictions # These workloads sometimes trigger 'Could not lock auth data update lock' diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml index b54b21e74a..d6c637b291 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml @@ -26,19 +26,6 @@ selector: - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled due to SERVER-20057, 'Concurrent, sharded mapReduces can fail when temporary - # namespaces collide across mongos processes' - - jstests/concurrency/fsm_workloads/map_reduce_drop.js - - jstests/concurrency/fsm_workloads/map_reduce_inline.js - - jstests/concurrency/fsm_workloads/map_reduce_interrupt.js - - jstests/concurrency/fsm_workloads/map_reduce_merge.js - - jstests/concurrency/fsm_workloads/map_reduce_merge_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_replace.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_nonexistent.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_remove.js - # Disabled due to MongoDB restrictions and/or workload restrictions # These workloads sometimes trigger 'Could not lock auth data update lock' diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml index 7f567b354d..b2fd1d5ef3 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml @@ -26,19 +26,6 @@ selector: - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled due to SERVER-20057, 'Concurrent, sharded mapReduces can fail when temporary - # namespaces collide across mongos processes' - - jstests/concurrency/fsm_workloads/map_reduce_drop.js - - jstests/concurrency/fsm_workloads/map_reduce_inline.js - - jstests/concurrency/fsm_workloads/map_reduce_interrupt.js - - jstests/concurrency/fsm_workloads/map_reduce_merge.js - - jstests/concurrency/fsm_workloads/map_reduce_merge_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_replace.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_nonexistent.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_remove.js - # Disabled due to MongoDB restrictions and/or workload restrictions # These workloads sometimes trigger 'Could not lock auth data update lock' diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml index dec72c7ce8..34b1d09820 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml @@ -31,19 +31,6 @@ selector: - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled due to SERVER-20057, 'Concurrent, sharded mapReduces can fail when temporary - # namespaces collide across mongos processes' - - jstests/concurrency/fsm_workloads/map_reduce_drop.js - - jstests/concurrency/fsm_workloads/map_reduce_inline.js - - jstests/concurrency/fsm_workloads/map_reduce_interrupt.js - - jstests/concurrency/fsm_workloads/map_reduce_merge.js - - jstests/concurrency/fsm_workloads/map_reduce_merge_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_replace.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_nonexistent.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_remove.js - # Disabled due to MongoDB restrictions and/or workload restrictions # These workloads sometimes trigger 'Could not lock auth data update lock' diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml index c77a60eb3a..022390913b 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml @@ -22,19 +22,6 @@ selector: - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled due to SERVER-20057, 'Concurrent, sharded mapReduces can fail when temporary - # namespaces collide across mongos processes' - - jstests/concurrency/fsm_workloads/map_reduce_drop.js - - jstests/concurrency/fsm_workloads/map_reduce_inline.js - - jstests/concurrency/fsm_workloads/map_reduce_interrupt.js - - jstests/concurrency/fsm_workloads/map_reduce_merge.js - - jstests/concurrency/fsm_workloads/map_reduce_merge_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_replace.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_nonexistent.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_remove.js - # Disabled due to MongoDB restrictions and/or workload restrictions # These workloads sometimes trigger 'Could not lock auth data update lock' diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml index 465dde0e94..06f789f1c3 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml @@ -25,19 +25,6 @@ selector: - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled due to SERVER-20057, 'Concurrent, sharded mapReduces can fail when temporary - # namespaces collide across mongos processes' - - jstests/concurrency/fsm_workloads/map_reduce_drop.js - - jstests/concurrency/fsm_workloads/map_reduce_inline.js - - jstests/concurrency/fsm_workloads/map_reduce_interrupt.js - - jstests/concurrency/fsm_workloads/map_reduce_merge.js - - jstests/concurrency/fsm_workloads/map_reduce_merge_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_replace.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_nonexistent.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_remove.js - # Disabled due to MongoDB restrictions and/or workload restrictions # These workloads sometimes trigger 'Could not lock auth data update lock' diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml index 335cda6de8..f1509976c1 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml @@ -22,19 +22,6 @@ selector: - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled due to SERVER-20057, 'Concurrent, sharded mapReduces can fail when temporary - # namespaces collide across mongos processes' - - jstests/concurrency/fsm_workloads/map_reduce_drop.js - - jstests/concurrency/fsm_workloads/map_reduce_inline.js - - jstests/concurrency/fsm_workloads/map_reduce_interrupt.js - - jstests/concurrency/fsm_workloads/map_reduce_merge.js - - jstests/concurrency/fsm_workloads/map_reduce_merge_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_replace.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_nonexistent.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_remove.js - # Disabled due to MongoDB restrictions and/or workload restrictions # These workloads sometimes trigger 'Could not lock auth data update lock' diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml index 6a6d1b5a09..8609e9cdef 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml @@ -25,19 +25,6 @@ selector: - jstests/concurrency/fsm_workloads/agg_graph_lookup.js - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js - # Disabled due to SERVER-20057, 'Concurrent, sharded mapReduces can fail when temporary - # namespaces collide across mongos processes' - - jstests/concurrency/fsm_workloads/map_reduce_drop.js - - jstests/concurrency/fsm_workloads/map_reduce_inline.js - - jstests/concurrency/fsm_workloads/map_reduce_interrupt.js - - jstests/concurrency/fsm_workloads/map_reduce_merge.js - - jstests/concurrency/fsm_workloads/map_reduce_merge_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce.js - - jstests/concurrency/fsm_workloads/map_reduce_reduce_nonatomic.js - - jstests/concurrency/fsm_workloads/map_reduce_replace.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_nonexistent.js - - jstests/concurrency/fsm_workloads/map_reduce_replace_remove.js - # Disabled due to MongoDB restrictions and/or workload restrictions # These workloads sometimes trigger 'Could not lock auth data update lock' diff --git a/jstests/concurrency/fsm_workloads/mapreduce_with_chunk_migrations.js b/jstests/concurrency/fsm_workloads/mapreduce_with_chunk_migrations.js new file mode 100644 index 0000000000..0dd8853301 --- /dev/null +++ b/jstests/concurrency/fsm_workloads/mapreduce_with_chunk_migrations.js @@ -0,0 +1,95 @@ +'use strict'; + +/** + * mapreduce_with_chunk_migrations.js + * + * This tests exercises mapReduce on a collection during chunk migrations. If extending this + * workload, consider overriding the following: + * + * $config.data.collWithMigrations: collection to run chunk migrations against (default is the + * input collection of the mapReduce). + * $config.state.mapReduce: function to execute the mapReduce. + * + * @tags: [requires_sharding, assumes_balancer_off, assumes_autosplit_off, + * requires_non_retryable_writes] + */ +load('jstests/concurrency/fsm_libs/extend_workload.js'); // for extendWorkload +load('jstests/concurrency/fsm_workloads/sharded_moveChunk_partitioned.js'); // for $config + +var $config = extendWorkload($config, function($config, $super) { + // The base setup will insert 'partitionSize' number of documents per thread, evenly + // distributing across the chunks. Documents will only have the "_id" field. + $config.data.partitionSize = 50; + $config.threadCount = 2; + $config.iterations = 100; + $config.data.numDocs = $config.data.partitionSize * $config.threadCount; + + // By default, the collection that will be sharded with concurrent chunk migrations will be the + // one that the aggregate is run against. + $config.data.collWithMigrations = $config.collName; + $config.data.resultsCollection = "mapreduce_with_chunk_migrations_out"; + + $config.transitions = { + init: {mapReduce: 1}, + mapReduce: { + moveChunk: 0.2, + mapReduce: 0.8, + }, + moveChunk: {mapReduce: 1}, + }; + + /** + * Moves a random chunk in the target collection. + */ + $config.states.moveChunk = function moveChunk(db, collName, connCache) { + $super.states.moveChunk.apply(this, [db, this.collWithMigrations, connCache]); + }; + + /** + * Executes a mapReduce with an empty pipeline. + */ + $config.states.mapReduce = function mapReduce(db, collName, connCache) { + const map = function() { + emit(this._id, 1); + }; + const reduce = function(k, values) { + return Array.sum(values); + }; + + const res = db[collName].mapReduce(map, reduce, {out: {replace: this.resultsCollection}}); + assertWhenOwnColl.commandWorked(res); + assertWhenOwnColl.eq( + this.numDocs, res.counts.output, `Expected each _id to be output once: ${tojson(res)}`); + }; + + /** + * Uses the base class init() to initialize this thread for both collections. + */ + $config.states.init = function init(db, collName, connCache) { + $super.states.init.apply(this, [db, collName, connCache]); + + // Init the target collection in a similar manner, if it is different than the default + // collection. + if (collName != this.collWithMigrations) { + $super.states.init.apply(this, [db, this.collWithMigrations, connCache]); + } + }; + + /** + * Initializes the aggregate collection and the target collection for chunk migrations as + * sharded with an even distribution across each thread ID. + */ + $config.setup = function setup(db, collName, cluster) { + $super.setup.apply(this, [db, collName, cluster]); + + if (collName != this.collWithMigrations) { + // Setup the target collection in a similar manner. Note that the FSM infrastructure + // will have already enabled sharded on collName, but we need to manually do it for the + // output collection. + cluster.shardCollection(db[this.collWithMigrations], this.shardKey, false); + $super.setup.apply(this, [db, this.collWithMigrations, cluster]); + } + }; + + return $config; +}); diff --git a/jstests/sharding/mr_shard_version.js b/jstests/sharding/mr_shard_version.js index 195444c97f..4033c66bfb 100644 --- a/jstests/sharding/mr_shard_version.js +++ b/jstests/sharding/mr_shard_version.js @@ -66,6 +66,7 @@ jsTest.log("Output coll : " + outputColl); for (var t = 0; t < numTests; t++) { var results = coll.mapReduce(map, reduce, {out: {replace: outputColl.getName()}}); + assert.eq(results.counts.output, numKeys); // Assert that the results are actually correct, all keys have values of (numDocs / numKeys) // x key diff --git a/src/mongo/s/commands/cluster_map_reduce.cpp b/src/mongo/s/commands/cluster_map_reduce.cpp index 6116311f58..910ea1bfdb 100644 --- a/src/mongo/s/commands/cluster_map_reduce.cpp +++ b/src/mongo/s/commands/cluster_map_reduce.cpp @@ -46,6 +46,7 @@ #include "mongo/s/grid.h" #include "mongo/s/request_types/shard_collection_gen.h" #include "mongo/util/log.h" +#include "mongo/util/uuid.h" namespace mongo { @@ -61,8 +62,7 @@ Rarely shardedOutputDeprecationSampler; * Generates a unique name for the temporary M/R output collection. */ std::string getTmpName(StringData coll) { - return str::stream() << "tmp.mrs." << coll << "_" << time(nullptr) << "_" - << jobNumber.fetchAndAdd(1); + return str::stream() << "tmp.mrs." << coll << "_" << UUID::gen(); } /**