diff options
4 files changed, 8 insertions, 40 deletions
diff --git a/jstests/concurrency/fsm_workloads/random_moveChunk_broadcast_delete_transaction.js b/jstests/concurrency/fsm_workloads/random_moveChunk_broadcast_delete_transaction.js index f0098fa0020..f1bd4e25f84 100644 --- a/jstests/concurrency/fsm_workloads/random_moveChunk_broadcast_delete_transaction.js +++ b/jstests/concurrency/fsm_workloads/random_moveChunk_broadcast_delete_transaction.js @@ -19,21 +19,13 @@ var $config = extendWorkload($config, function($config, $super) { // partition per thread. $config.data.partitionSize = 100; - // A moveChunk may fail with a WriteConflict when clearing orphans on the destination shard if - // any of them are concurrently written to by a broadcast transaction operation. The error - // message and top-level code may be different depending on where the failure occurs. - // - // TODO SERVER-39141: Don't ignore WriteConflict error message once the range deleter retries on - // write conflict exceptions. - // - // Additionally, because deletes don't have a shard filter stage, a migration may fail if a + // Because deletes don't have a shard filter stage, a migration may fail if a // broadcast delete is operating on orphans from a previous migration in the range being // migrated back in. The particular error code is replaced with a more generic one, so this is // identified by the failed migration's error message. $config.data.isMoveChunkErrorAcceptable = (err) => { return err.message && - (err.message.indexOf("WriteConflict") > -1 || - err.message.indexOf("CommandFailed") > -1 || + (err.message.indexOf("CommandFailed") > -1 || err.message.indexOf("Documents in target range may still be in use") > -1); }; diff --git a/jstests/concurrency/fsm_workloads/random_moveChunk_broadcast_update_transaction.js b/jstests/concurrency/fsm_workloads/random_moveChunk_broadcast_update_transaction.js index 86a530fe91f..a30e7a711c8 100644 --- a/jstests/concurrency/fsm_workloads/random_moveChunk_broadcast_update_transaction.js +++ b/jstests/concurrency/fsm_workloads/random_moveChunk_broadcast_update_transaction.js @@ -19,21 +19,13 @@ var $config = extendWorkload($config, function($config, $super) { // partition per thread. $config.data.partitionSize = 100; - // A moveChunk may fail with a WriteConflict when clearing orphans on the destination shard if - // any of them are concurrently written to by a broadcast transaction operation. The error - // message and top-level code may be different depending on where the failure occurs. - // - // TODO SERVER-39141: Don't ignore WriteConflict error message once the range deleter retries on - // write conflict exceptions. - // - // Additionally, because updates don't have a shard filter stage, a migration may fail if a + // Because updates don't have a shard filter stage, a migration may fail if a // broadcast update is operating on orphans from a previous migration in the range being // migrated back in. The particular error code is replaced with a more generic one, so this is // identified by the failed migration's error message. $config.data.isMoveChunkErrorAcceptable = (err) => { return err.message && - (err.message.indexOf("WriteConflict") > -1 || - err.message.indexOf("CommandFailed") > -1 || + (err.message.indexOf("CommandFailed") > -1 || err.message.indexOf("Documents in target range may still be in use") > -1); }; diff --git a/jstests/concurrency/fsm_workloads/random_moveChunk_refine_collection_shard_key.js b/jstests/concurrency/fsm_workloads/random_moveChunk_refine_collection_shard_key.js index bf9e7b5f2a8..754648667a3 100644 --- a/jstests/concurrency/fsm_workloads/random_moveChunk_refine_collection_shard_key.js +++ b/jstests/concurrency/fsm_workloads/random_moveChunk_refine_collection_shard_key.js @@ -48,21 +48,13 @@ var $config = extendWorkload($config, function($config, $super) { return collName + '_' + latchNumber.toString(); }; - // A moveChunk may fail with a WriteConflict when clearing orphans on the destination shard - // if any of them are concurrently written to by a broadcast transaction operation. The - // error message and top-level code may be different depending on where the failure occurs. - // - // TODO SERVER-39141: Don't ignore WriteConflict error message once the range deleter - // retries on write conflict exceptions. - // - // Additionally, because updates don't have a shard filter stage, a migration may fail if a + // Because updates don't have a shard filter stage, a migration may fail if a // broadcast update is operating on orphans from a previous migration in the range being // migrated back in. The particular error code is replaced with a more generic one, so this // is identified by the failed migration's error message. $config.data.isMoveChunkErrorAcceptable = (err) => { return err.message && - (err.message.indexOf("WriteConflict") > -1 || - err.message.indexOf("CommandFailed") > -1 || + (err.message.indexOf("CommandFailed") > -1 || err.message.indexOf("Documents in target range may still be in use") > -1 || // This error will occur as a result of trying to move a chunk with a pre-refine // collection epoch. diff --git a/jstests/concurrency/fsm_workloads/random_moveChunk_update_shard_key.js b/jstests/concurrency/fsm_workloads/random_moveChunk_update_shard_key.js index f370479e392..5718292901c 100644 --- a/jstests/concurrency/fsm_workloads/random_moveChunk_update_shard_key.js +++ b/jstests/concurrency/fsm_workloads/random_moveChunk_update_shard_key.js @@ -23,21 +23,13 @@ var $config = extendWorkload($config, function($config, $super) { // applied. $config.data.expectedCounters = {}; - // A moveChunk may fail with a WriteConflict when clearing orphans on the destination shard if - // any of them are concurrently written to by a broadcast transaction operation. The error - // message and top-level code may be different depending on where the failure occurs. - // - // TODO SERVER-39141: Don't ignore WriteConflict error message once the range deleter retries on - // write conflict exceptions. - // - // Additionally, because updates don't have a shard filter stage, a migration may fail if a + // Because updates don't have a shard filter stage, a migration may fail if a // broadcast update is operating on orphans from a previous migration in the range being // migrated back in. The particular error code is replaced with a more generic one, so this is // identified by the failed migration's error message. $config.data.isMoveChunkErrorAcceptable = (err) => { return err.message && - (err.message.indexOf("WriteConflict") > -1 || - err.message.indexOf("CommandFailed") > -1 || + (err.message.indexOf("CommandFailed") > -1 || err.message.indexOf("Documents in target range may still be in use")); }; |