summaryrefslogtreecommitdiff
path: root/src/mongo/s/grid.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/s/grid.cpp')
-rw-r--r--src/mongo/s/grid.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/mongo/s/grid.cpp b/src/mongo/s/grid.cpp
index dbc42a8e20e..9254504dfd9 100644
--- a/src/mongo/s/grid.cpp
+++ b/src/mongo/s/grid.cpp
@@ -124,7 +124,6 @@ repl::OpTime Grid::configOpTime() const {
boost::optional<repl::OpTime> Grid::advanceConfigOpTime(OperationContext* opCtx,
repl::OpTime opTime,
StringData what) {
- invariant(serverGlobalParams.clusterRole != ClusterRole::ConfigServer);
const auto prevOpTime = _advanceConfigOpTime(opTime);
if (prevOpTime && prevOpTime->getTerm() != opTime.getTerm()) {
std::string clientAddr = "(unknown)";
@@ -143,12 +142,8 @@ boost::optional<repl::OpTime> Grid::advanceConfigOpTime(OperationContext* opCtx,
return prevOpTime;
}
-boost::optional<repl::OpTime> Grid::advanceConfigOpTimeAuthoritative(repl::OpTime opTime) {
- invariant(serverGlobalParams.clusterRole == ClusterRole::ConfigServer);
- return _advanceConfigOpTime(opTime);
-}
-
boost::optional<repl::OpTime> Grid::_advanceConfigOpTime(const repl::OpTime& opTime) {
+ invariant(serverGlobalParams.clusterRole != ClusterRole::ConfigServer);
stdx::lock_guard<Latch> lk(_mutex);
if (_configOpTime < opTime) {
repl::OpTime prev = _configOpTime;