From f12d07945bd82ff9b6726aa74b84ea4e94b06171 Mon Sep 17 00:00:00 2001 From: Paolo Polato Date: Wed, 7 Jul 2021 10:28:16 +0000 Subject: SERVER-58191 Allow delete_during_migrate test to tolerate chunk migration timeouts in slow variants. (cherry picked from commit a8cf4f32d5b53291add8b19d6f26ccac82c50dde) --- jstests/sharding/delete_during_migrate.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/jstests/sharding/delete_during_migrate.js b/jstests/sharding/delete_during_migrate.js index 04c3075b1f1..35882bf376c 100644 --- a/jstests/sharding/delete_during_migrate.js +++ b/jstests/sharding/delete_during_migrate.js @@ -10,6 +10,10 @@ (function() { 'use strict'; + const isCodeCoverageEnabled = buildInfo().buildEnvironment.ccflags.includes('-ftest-coverage'); + const isSanitizerEnabled = buildInfo().buildEnvironment.ccflags.includes('-fsanitize'); + const slowTestVariant = isCodeCoverageEnabled || isSanitizerEnabled; + var st = new ShardingTest({shards: 2, mongos: 1}); var dbname = "test"; @@ -36,8 +40,15 @@ var join = startParallelShell("db." + coll + ".remove({});", st.s0.port); // migrate while deletions are happening - assert.commandWorked(st.s0.adminCommand( - {moveChunk: ns, find: {a: 1}, to: st.getOther(st.getPrimaryShard(dbname)).name})); + try { + assert.commandWorked(st.s0.adminCommand( + {moveChunk: ns, find: {a: 1}, to: st.getOther(st.getPrimaryShard(dbname)).name})); + } catch (e) { + const expectedFailureMessage = "startCommit timed out waiting for the catch up completion."; + if (!slowTestVariant || !e.message.match(expectedFailureMessage)) { + throw e; + } + } join(); -- cgit v1.2.1