summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl
diff options
context:
space:
mode:
authorAndy Schwerin <schwerin@10gen.com>2013-10-25 18:15:23 -0400
committerAndy Schwerin <schwerin@10gen.com>2013-10-25 18:15:23 -0400
commit774860337ea71d1f8b4711971dc9fa61115cd003 (patch)
tree221abb74c9c050ab62399028d966c2cdec8fc311 /src/mongo/db/repl
parentff9f15747c7f9e3d20436a66b2d90384e06fd4f2 (diff)
downloadmongo-774860337ea71d1f8b4711971dc9fa61115cd003.tar.gz
Revert "SERVER-9516 Write version document to admin.system.version as needed in mongod."
This reverts commit 3d61067308f7f526ec00d79bcbb158d31fd413fa, which breaks multi-version because it replicates writes to admin.system.version at startup.
Diffstat (limited to 'src/mongo/db/repl')
-rw-r--r--src/mongo/db/repl/rs.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mongo/db/repl/rs.cpp b/src/mongo/db/repl/rs.cpp
index 9bb0c75e80a..c7004a277a1 100644
--- a/src/mongo/db/repl/rs.cpp
+++ b/src/mongo/db/repl/rs.cpp
@@ -33,7 +33,6 @@
#include "mongo/db/audit.h"
#include "mongo/db/auth/authorization_manager.h"
#include "mongo/db/auth/authorization_session.h"
-#include "mongo/db/auth/authz_manager_external_state_d.h"
#include "mongo/db/client.h"
#include "mongo/db/dbhelpers.h"
#include "mongo/db/instance.h"
@@ -150,10 +149,10 @@ namespace {
changeState(MemberState::RS_PRIMARY);
- // The following operations must occur after becoming primary but before accepting writes
- // from clients. Any actions taken from here will be replicated to seconaries.
+ // This must be done after becoming primary but before releasing the write lock. This adds
+ // the dropCollection entries for every temp collection to the opLog since we want it to be
+ // replicated to secondaries.
dropAllTempCollections();
- AuthzManagerExternalStateMongod::writeAuthSchemaVersionDocumentIfNeeded();
}
void ReplSetImpl::changeState(MemberState s) { box.change(s, _self); }