From 16e278b6d3a5322ffd08bd605b66905035b70fb4 Mon Sep 17 00:00:00 2001 From: Pierlauro Sciarelli Date: Thu, 10 Jun 2021 11:40:35 +0000 Subject: SERVER-57475 ShardingTest.stop must join top-level chunk migrations --- jstests/libs/override_methods/check_orphans_are_deleted.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jstests/libs/override_methods/check_orphans_are_deleted.js b/jstests/libs/override_methods/check_orphans_are_deleted.js index 0f27e86dc1b..0a55981a884 100644 --- a/jstests/libs/override_methods/check_orphans_are_deleted.js +++ b/jstests/libs/override_methods/check_orphans_are_deleted.js @@ -1,4 +1,5 @@ load('jstests/libs/check_orphans_are_deleted_helpers.js'); // For CheckOrphansAreDeletedHelpers. +load('jstests/sharding/autosplit_include.js'); // For waitForOngoingChunkSplits /** * Asserts that all shards in the sharded cluster doesn't own any orphan documents. @@ -51,6 +52,12 @@ ShardingTest.prototype.checkOrphansAreDeleted = function() { } else { assert.commandWorked(mongosConn.adminCommand({balancerStop: 1})); + try { + waitForOngoingChunkSplits(this); + } catch (e) { + print("Unable to wait for ongoing chunk splits: " + e); + } + // Use config.shards so we will not miss shards added outside of ShardingTest. mongosConn.getDB('config').shards.find().forEach(shardDoc => { let shardConn = getConn(shardDoc.host); -- cgit v1.2.1