diff options
author | Eliot Horowitz <eliot@10gen.com> | 2011-09-05 21:44:03 -0400 |
---|---|---|
committer | Eliot Horowitz <eliot@10gen.com> | 2011-09-05 21:44:03 -0400 |
commit | b7d7b752a4714a77a9b6ea77dd976c05544047b8 (patch) | |
tree | 1632eb38b4bbbbd53d5b4e53f2b677328b18e1b4 | |
parent | dc7f6223b72676e45c964d6da6cd4163e86bf6f8 (diff) | |
download | mongo-b7d7b752a4714a77a9b6ea77dd976c05544047b8.tar.gz |
fix issue where dropDup code for insertion can fail on secondary during clone if doc moved SERVER-3762
-rw-r--r-- | db/pdfile.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/db/pdfile.cpp b/db/pdfile.cpp index 0569ba6868e..ac7731ae60c 100644 --- a/db/pdfile.cpp +++ b/db/pdfile.cpp @@ -45,6 +45,7 @@ _ disallow system* manipulations from the database. #include "compact.h" #include "ops/delete.h" #include "instance.h" +#include "replutil.h" namespace mongo { @@ -1296,7 +1297,7 @@ namespace mongo { log(1) << "\t fastBuildIndex dupsToDrop:" << dupsToDrop.size() << endl; for( list<DiskLoc>::iterator i = dupsToDrop.begin(); i != dupsToDrop.end(); i++ ){ - theDataFileMgr.deleteRecord( ns, i->rec(), *i, false, true , true ); + theDataFileMgr.deleteRecord( ns, i->rec(), *i, false /* cappedOk */ , true /* noWarn */ , isMaster( ns ) /* logOp */ ); getDur().commitIfNeeded(); } |