diff options
author | Siyuan Zhou <siyuan.zhou@mongodb.com> | 2016-11-06 01:33:50 -0400 |
---|---|---|
committer | Siyuan Zhou <siyuan.zhou@mongodb.com> | 2016-11-06 01:33:50 -0400 |
commit | d23e79eb9e69bd746416d9f674dfaee59457c887 (patch) | |
tree | 7ae8940e36d5ae51bb4eadd1318860ca212e8c3f /src/mongo/db/repl/replication_coordinator_mock.cpp | |
parent | 0ac04999faae1d2fc0e10972aaf21082a2e48c8f (diff) | |
download | mongo-d23e79eb9e69bd746416d9f674dfaee59457c887.tar.gz |
Revert "SERVER-26202 Relax index constraints in oplog application"
This reverts commit f00448255bbb24c07e2f55e7e229f19e316350a6.
Diffstat (limited to 'src/mongo/db/repl/replication_coordinator_mock.cpp')
-rw-r--r-- | src/mongo/db/repl/replication_coordinator_mock.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/mongo/db/repl/replication_coordinator_mock.cpp b/src/mongo/db/repl/replication_coordinator_mock.cpp index 4b032ba582b..daa9c379545 100644 --- a/src/mongo/db/repl/replication_coordinator_mock.cpp +++ b/src/mongo/db/repl/replication_coordinator_mock.cpp @@ -120,13 +120,8 @@ bool ReplicationCoordinatorMock::isMasterForReportingPurposes() { } bool ReplicationCoordinatorMock::canAcceptWritesForDatabase(StringData dbName) { - // Return true if we allow writes explicitly even when not in primary state, as in sharding - // unit tests, so that the op observers can fire but the tests don't have to set all the states - // as if it's in primary. - if (_alwaysAllowWrites) { - return true; - } - return dbName == "local" || _memberState.primary(); + // TODO + return true; } bool ReplicationCoordinatorMock::canAcceptWritesFor(const NamespaceString& ns) { @@ -141,8 +136,9 @@ Status ReplicationCoordinatorMock::checkCanServeReadsFor(OperationContext* txn, return Status::OK(); } -bool ReplicationCoordinatorMock::shouldRelaxIndexConstraints(const NamespaceString& ns) { - return !canAcceptWritesFor(ns); +bool ReplicationCoordinatorMock::shouldIgnoreUniqueIndex(const IndexDescriptor* idx) { + // TODO + return false; } Status ReplicationCoordinatorMock::setLastOptimeForSlave(const OID& rid, const Timestamp& ts) { @@ -466,9 +462,5 @@ Status ReplicationCoordinatorMock::stepUpIfEligible() { return Status::OK(); } -void ReplicationCoordinatorMock::alwaysAllowWrites(bool allowWrites) { - _alwaysAllowWrites = allowWrites; -} - } // namespace repl } // namespace mongo |