SERVER-42856 Make the check for chunk moved in the op observer take hashed shard keys into account

1 files changed, 4 insertions, 2 deletions

diff --git a/src/mongo/db/s/op_observer_sharding_impl.cpp b/src/mongo/db/s/op_observer_sharding_impl.cpp
index a76bbd1bcb2..4ede2a0f03d 100644
--- a/src/mongo/db/s/op_observer_sharding_impl.cpp
+++ b/src/mongo/db/s/op_observer_sharding_impl.cpp
@@ -59,9 +59,11 @@ void assertIntersectingChunkHasNotMoved(OperationContext* opCtx,
     if (!metadata->isSharded())
         return;
 
+    auto chunkManager = metadata->getChunkManager();
+    auto shardKey = chunkManager->getShardKeyPattern().extractShardKeyFromDoc(doc);
+
     // We can assume the simple collation because shard keys do not support non-simple collations.
-    auto chunk = metadata->getChunkManager()->findIntersectingChunkWithSimpleCollation(
-        metadata->extractDocumentKey(doc));
+    auto chunk = chunkManager->findIntersectingChunkWithSimpleCollation(shardKey);
 
     // Throws if the chunk has moved since the timestamp of the running transaction's atClusterTime
     // read concern parameter.