summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpencer Jackson <spencer.jackson@mongodb.com>2015-11-13 18:37:22 -0500
committerSpencer Jackson <spencer.jackson@mongodb.com>2015-11-13 18:37:22 -0500
commitba65cade1f0ba76c921364300d1f33cff5f35043 (patch)
tree1ad54b0613b6fc78d67942f12215c3de87a9dbc5
parenta5e6480126f503cf116276a535ca2bbdc334464f (diff)
downloadmongo-ba65cade1f0ba76c921364300d1f33cff5f35043.tar.gz
Revert "SERVER-20845 audit log reconfigs"
This reverts commit 766b3e3508b7c1025dfc55ea8a4a01179989c9f4.
-rw-r--r--src/mongo/db/repl/SConscript2
-rw-r--r--src/mongo/db/repl/replication_coordinator_impl.cpp11
-rw-r--r--src/mongo/db/repl/topology_coordinator_impl.cpp2
3 files changed, 3 insertions, 12 deletions
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index 69f5e292331..4fab475d306 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -250,6 +250,7 @@ env.Library('topology_coordinator_impl',
'topology_coordinator_impl.cpp',
],
LIBDEPS=[
+ '$BUILD_DIR/mongo/db/audit',
'replication_executor',
'replica_set_messages',
'repl_settings',
@@ -290,7 +291,6 @@ env.Library('repl_coordinator_impl',
'vote_requester.cpp',
],
LIBDEPS=[
- '$BUILD_DIR/mongo/db/audit',
'$BUILD_DIR/mongo/db/common',
'$BUILD_DIR/mongo/db/global_timestamp',
'$BUILD_DIR/mongo/db/index/index_descriptor',
diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp
index 7a16d5eb894..a4dc7172fce 100644
--- a/src/mongo/db/repl/replication_coordinator_impl.cpp
+++ b/src/mongo/db/repl/replication_coordinator_impl.cpp
@@ -36,8 +36,6 @@
#include <limits>
#include "mongo/base/status.h"
-#include "mongo/db/audit.h"
-#include "mongo/db/client_basic.h"
#include "mongo/db/concurrency/d_concurrency.h"
#include "mongo/db/global_timestamp.h"
#include "mongo/db/index/index_descriptor.h"
@@ -2055,10 +2053,6 @@ Status ReplicationCoordinatorImpl::processReplSetReconfig(OperationContext* txn,
return status;
}
- BSONObj oldConfigObjForAudit = _rsConfig.toBSON();
- BSONObj newConfigObjForAudit = newConfig.toBSON();
- audit::logReplSetReconfig(
- ClientBasic::getCurrent(), &oldConfigObjForAudit, &newConfigObjForAudit);
const stdx::function<void(const ReplicationExecutor::CallbackArgs&)> reconfigFinishFn(
stdx::bind(&ReplicationCoordinatorImpl::_finishReplSetReconfig,
this,
@@ -2179,11 +2173,6 @@ Status ReplicationCoordinatorImpl::processReplSetInitiate(OperationContext* txn,
return status;
}
- BSONObj oldConfigObjForAudit;
- BSONObj newConfigObjForAudit = newConfig.toBSON();
- audit::logReplSetReconfig(
- ClientBasic::getCurrent(), &oldConfigObjForAudit, &newConfigObjForAudit);
-
if (replEnabled) {
CBHStatus cbh = _replExecutor.scheduleWork(
stdx::bind(&ReplicationCoordinatorImpl::_finishReplSetInitiate,
diff --git a/src/mongo/db/repl/topology_coordinator_impl.cpp b/src/mongo/db/repl/topology_coordinator_impl.cpp
index 479f8bc1181..40e36edc9ba 100644
--- a/src/mongo/db/repl/topology_coordinator_impl.cpp
+++ b/src/mongo/db/repl/topology_coordinator_impl.cpp
@@ -34,6 +34,8 @@
#include <limits>
+#include "mongo/db/audit.h"
+#include "mongo/db/client_basic.h"
#include "mongo/db/operation_context.h"
#include "mongo/db/repl/heartbeat_response_action.h"
#include "mongo/db/repl/is_master_response.h"