SERVER-31424 generate the keys in RS right after becoming a primary

2 files changed, 2 insertions, 1 deletions

diff --git a/src/mongo/db/keys_collection_manager_sharding.cpp b/src/mongo/db/keys_collection_manager_sharding.cpp
index 2c4ab5dfa55..c63aa33e1eb 100644
--- a/src/mongo/db/keys_collection_manager_sharding.cpp
+++ b/src/mongo/db/keys_collection_manager_sharding.cpp
@@ -305,6 +305,7 @@ void KeysCollectionManagerSharding::PeriodicRunner::_doPeriodicRefresh(
 void KeysCollectionManagerSharding::PeriodicRunner::setFunc(RefreshFunc newRefreshStrategy) {
     stdx::lock_guard<stdx::mutex> lock(_mutex);
     _doRefresh = std::make_shared<RefreshFunc>(std::move(newRefreshStrategy));
+    _refreshNeededCV.notify_all();
 }
 
 void KeysCollectionManagerSharding::PeriodicRunner::switchFunc(OperationContext* opCtx,
diff --git a/src/mongo/db/read_concern.cpp b/src/mongo/db/read_concern.cpp
index 79d353f536e..4b055c6f646 100644
--- a/src/mongo/db/read_concern.cpp
+++ b/src/mongo/db/read_concern.cpp
@@ -74,7 +74,7 @@ Status makeNoopWriteIfNeeded(OperationContext* opCtx, LogicalTime clusterTime) {
         auto shardingState = ShardingState::get(opCtx);
         // standalone replica set, so there is no need to advance the OpLog on the primary.
         if (!shardingState->enabled()) {
-            log() << "XXX: attempting to make a write for clusterTIme: " << clusterTime
+            log() << "Attempting to make a write for clusterTIme: " << clusterTime
                   << " but is in standalone RS";
             return Status::OK();
         }