SERVER-8066 (2/2) Skip undefined fields in mongorestore

1 files changed, 12 insertions, 1 deletions

diff --git a/src/mongo/tools/restore.cpp b/src/mongo/tools/restore.cpp
index 9180005fe56..abd7f868afe 100644
--- a/src/mongo/tools/restore.cpp
+++ b/src/mongo/tools/restore.cpp
@@ -485,7 +485,11 @@ private:
     }
 
     void createCollectionWithOptions(BSONObj cmdObj) {
+
+        // Create a new cmdObj to skip undefined fields and fix collection name
         BSONObjBuilder bo;
+
+        // Add a "create" field if it doesn't exist
         if (!cmdObj.hasField("create")) {
             bo.append("create", _curcoll);
         }
@@ -493,11 +497,18 @@ private:
         BSONObjIterator i(cmdObj);
         while ( i.more() ) {
             BSONElement e = i.next();
+
+            // Replace the "create" field with the name of the collection we are actually creating
             if (strcmp(e.fieldName(), "create") == 0) {
                 bo.append("create", _curcoll);
             }
             else {
-                bo.append(e);
+                if (e.type() == Undefined) {
+                    log() << _curns << ": skipping undefined field: " << e.fieldName() << endl;
+                }
+                else {
+                    bo.append(e);
+                }
             }
         }
         cmdObj = bo.obj();