SERVER-63494 Enable WouldChangeOwningShard update and findAndModify tests with chunk migrations

2 files changed, 15 insertions, 3 deletions

diff --git a/src/mongo/s/would_change_owning_shard_exception.cpp b/src/mongo/s/would_change_owning_shard_exception.cpp
index 10b2f77b45b..ac131fb9440 100644
--- a/src/mongo/s/would_change_owning_shard_exception.cpp
+++ b/src/mongo/s/would_change_owning_shard_exception.cpp
@@ -58,7 +58,8 @@ std::shared_ptr<const ErrorExtraInfo> WouldChangeOwningShardInfo::parse(const BS
 WouldChangeOwningShardInfo WouldChangeOwningShardInfo::parseFromCommandError(const BSONObj& obj) {
     return WouldChangeOwningShardInfo(obj[kPreImage].Obj().getOwned(),
                                       obj[kPostImage].Obj().getOwned(),
-                                      obj[kShouldUpsert].Bool());
+                                      obj[kShouldUpsert].Bool(),
+                                      boost::none);
 }
 
 }  // namespace mongo
diff --git a/src/mongo/s/would_change_owning_shard_exception.h b/src/mongo/s/would_change_owning_shard_exception.h
index 639d1806ffb..3468e062586 100644
--- a/src/mongo/s/would_change_owning_shard_exception.h
+++ b/src/mongo/s/would_change_owning_shard_exception.h
@@ -32,6 +32,7 @@
 #include "mongo/base/error_extra_info.h"
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/bsonobjbuilder.h"
+#include "mongo/db/namespace_string.h"
 
 namespace mongo {
 
@@ -48,10 +49,12 @@ public:
 
     explicit WouldChangeOwningShardInfo(const BSONObj& preImage,
                                         const BSONObj& postImage,
-                                        const bool shouldUpsert)
+                                        const bool shouldUpsert,
+                                        boost::optional<NamespaceString> ns)
         : _preImage(preImage.getOwned()),
           _postImage(postImage.getOwned()),
-          _shouldUpsert(shouldUpsert) {}
+          _shouldUpsert(shouldUpsert),
+          _ns(ns) {}
 
     const auto& getPreImage() const {
         return _preImage;
@@ -65,6 +68,10 @@ public:
         return _shouldUpsert;
     }
 
+    const auto& getNs() const {
+        return _ns;
+    }
+
     BSONObj toBSON() const {
         BSONObjBuilder bob;
         serialize(&bob);
@@ -84,6 +91,10 @@ private:
 
     // True if {upsert: true} and the update stage did not match any docs
     bool _shouldUpsert;
+
+    // The namespace of the collection containing the document. Does not get serialized into the
+    // BSONObj for this error.
+    boost::optional<NamespaceString> _ns;
 };
 using WouldChangeOwningShardException = ExceptionFor<ErrorCodes::WouldChangeOwningShard>;