continuation of initial sync fix

Conflicts:

	db/repl/rs_sync.cpp

1 files changed, 18 insertions, 6 deletions

diff --git a/db/repl/rs_sync.cpp b/db/repl/rs_sync.cpp
index 1417df1d6c1..d09509fb5b2 100644
--- a/db/repl/rs_sync.cpp
+++ b/db/repl/rs_sync.cpp
@@ -147,13 +147,25 @@ namespace mongo {
                                 return false;
                             }
                             const char *ns = o.getStringField("ns");
-                            BSONObj query = BSONObjBuilder().append(o.getObjectField("o2")[_id]).obj(); // might be more than just _id in the update criteria
-                            BSONObj missingObj = missingObjReader.findOne(
-                                ns,
-                                query );
+                            BSONObj query = BSONObjBuilder().append(o.getObjectField("o2")["_id"]).obj(); // might be more than just _id in the update criteria
+                            BSONObj missingObj;
+                            try {
+                                missingObj = missingObjReader.findOne(
+                                    ns,
+                                    query );
+                            } catch(...) {
+                                log() << "replSet assertion fetching missing object" << endl;
+                                throw;
+                            }
                             assert( !missingObj.isEmpty() );
-                            DiskLoc d = theDataFileMgr.insert(ns, (void*) missingObj.objdata(), missingObj.objsize());
-                            assert( !d.isNull() );
+                            Client::Context ctx(ns);
+                            try {
+                                DiskLoc d = theDataFileMgr.insert(ns, (void*) missingObj.objdata(), missingObj.objsize());
+                                assert( !d.isNull() );
+                            } catch(...) {
+                                log() << "replSet assertion during insert of missing object" << endl;
+                                throw;
+                            }
                             // now reapply the update from above
                             bool failed = syncApply(o);
                             if( failed ) {