From 489cd07d2a3711286debae56f28416d7ba290648 Mon Sep 17 00:00:00 2001
From: Dianna Hohensee <dianna.hohensee@10gen.com>
Date: Wed, 1 Feb 2017 14:18:12 -0500
Subject: SERVER-27860 remove invariants to prevent ShardLocal running on
 shards and remove "-OnConfig" function name suffixes

---
 src/mongo/s/catalog/dist_lock_catalog_impl.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/mongo/s/catalog/dist_lock_catalog_impl.cpp')

diff --git a/src/mongo/s/catalog/dist_lock_catalog_impl.cpp b/src/mongo/s/catalog/dist_lock_catalog_impl.cpp
index 754db72ae6f..d84ced179db 100644
--- a/src/mongo/s/catalog/dist_lock_catalog_impl.cpp
+++ b/src/mongo/s/catalog/dist_lock_catalog_impl.cpp
@@ -204,7 +204,7 @@ Status DistLockCatalogImpl::ping(OperationContext* txn, StringData processID, Da
         ReadPreferenceSetting{ReadPreference::PrimaryOnly},
         _locksNS.db().toString(),
         request.toBSON(),
-        Shard::kDefaultConfigCommandTimeout,
+        Shard::kDefaultCommandTimeout,
         Shard::RetryPolicy::kNotIdempotent);
 
     auto findAndModifyStatus = extractFindAndModifyNewObj(std::move(resultStatus));
@@ -241,7 +241,7 @@ StatusWith<LocksType> DistLockCatalogImpl::grabLock(OperationContext* txn,
         ReadPreferenceSetting{ReadPreference::PrimaryOnly},
         _locksNS.db().toString(),
         request.toBSON(),
-        Shard::kDefaultConfigCommandTimeout,
+        Shard::kDefaultCommandTimeout,
         Shard::RetryPolicy::kNoRetry);  // Dist lock manager is handling own retries
 
     auto findAndModifyStatus = extractFindAndModifyNewObj(std::move(resultStatus));
@@ -298,7 +298,7 @@ StatusWith<LocksType> DistLockCatalogImpl::overtakeLock(OperationContext* txn,
         ReadPreferenceSetting{ReadPreference::PrimaryOnly},
         _locksNS.db().toString(),
         request.toBSON(),
-        Shard::kDefaultConfigCommandTimeout,
+        Shard::kDefaultCommandTimeout,
         Shard::RetryPolicy::kNotIdempotent);
 
     auto findAndModifyStatus = extractFindAndModifyNewObj(std::move(resultStatus));
@@ -343,7 +343,7 @@ Status DistLockCatalogImpl::_unlock(OperationContext* txn, const FindAndModifyRe
         ReadPreferenceSetting{ReadPreference::PrimaryOnly},
         _locksNS.db().toString(),
         request.toBSON(),
-        Shard::kDefaultConfigCommandTimeout,
+        Shard::kDefaultCommandTimeout,
         Shard::RetryPolicy::kIdempotent);
 
     auto findAndModifyStatus = extractFindAndModifyNewObj(std::move(resultStatus));
@@ -378,7 +378,7 @@ Status DistLockCatalogImpl::unlockAll(OperationContext* txn, const std::string&
         ReadPreferenceSetting{ReadPreference::PrimaryOnly},
         _locksNS.db().toString(),
         cmdObj,
-        Shard::kDefaultConfigCommandTimeout,
+        Shard::kDefaultCommandTimeout,
         Shard::RetryPolicy::kIdempotent);
 
     if (!response.isOK()) {
@@ -409,7 +409,7 @@ StatusWith<DistLockCatalog::ServerInfo> DistLockCatalogImpl::getServerInfo(Opera
         kReadPref,
         "admin",
         BSON("serverStatus" << 1),
-        Shard::kDefaultConfigCommandTimeout,
+        Shard::kDefaultCommandTimeout,
         Shard::RetryPolicy::kIdempotent);
 
     if (!resultStatus.isOK()) {
@@ -501,7 +501,7 @@ Status DistLockCatalogImpl::stopPing(OperationContext* txn, StringData processId
         ReadPreferenceSetting{ReadPreference::PrimaryOnly},
         _locksNS.db().toString(),
         request.toBSON(),
-        Shard::kDefaultConfigCommandTimeout,
+        Shard::kDefaultCommandTimeout,
         Shard::RetryPolicy::kNotIdempotent);
 
     auto findAndModifyStatus = extractFindAndModifyNewObj(std::move(resultStatus));
@@ -515,7 +515,7 @@ StatusWith<vector<BSONObj>> DistLockCatalogImpl::_findOnConfig(
     const BSONObj& query,
     const BSONObj& sort,
     boost::optional<long long> limit) {
-    auto result = _client->getConfigShard()->exhaustiveFindOnConfig(
+    auto result = _client->getConfigShard()->exhaustiveFind(
         txn, readPref, repl::ReadConcernLevel::kMajorityReadConcern, nss, query, sort, limit);
     if (!result.isOK()) {
         return result.getStatus();
-- 
cgit v1.2.1