SERVER-24318 change BackgroundSync to one owned object by the Repl ExternalState, to simplify lifetime issues

1 files changed, 11 insertions, 8 deletions

diff --git a/src/mongo/db/repl/repl_settings.cpp b/src/mongo/db/repl/repl_settings.cpp
index b2049ba8776..c31f8bc5012 100644
--- a/src/mongo/db/repl/repl_settings.cpp
+++ b/src/mongo/db/repl/repl_settings.cpp
@@ -29,9 +29,12 @@
 #define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kReplication
 
 #include "mongo/db/repl/repl_settings.h"
-#include "mongo/util/log.h"
+
 #include <string>
 
+#include "mongo/db/repl/bgsync.h"
+#include "mongo/util/log.h"
+
 namespace mongo {
 namespace repl {
 
@@ -93,12 +96,12 @@ std::string ReplSettings::getReplSetString() const {
     return _replSetString;
 }
 
-BackgroundSync::IndexPrefetchConfig ReplSettings::getPrefetchIndexMode() const {
+ReplSettings::IndexPrefetchConfig ReplSettings::getPrefetchIndexMode() const {
     return _prefetchIndexMode;
 }
 
 bool ReplSettings::isPrefetchIndexModeSet() const {
-    return _prefetchIndexMode != BackgroundSync::UNINITIALIZED;
+    return _prefetchIndexMode != IndexPrefetchConfig::UNINITIALIZED;
 }
 
 /**
@@ -150,16 +153,16 @@ void ReplSettings::setReplSetString(std::string replSetString) {
 
 void ReplSettings::setPrefetchIndexMode(std::string prefetchIndexModeString) {
     if (prefetchIndexModeString.empty()) {
-        _prefetchIndexMode = BackgroundSync::UNINITIALIZED;
+        _prefetchIndexMode = IndexPrefetchConfig::UNINITIALIZED;
     } else {
         if (prefetchIndexModeString == "none")
-            _prefetchIndexMode = BackgroundSync::PREFETCH_NONE;
+            _prefetchIndexMode = IndexPrefetchConfig::PREFETCH_NONE;
         else if (prefetchIndexModeString == "_id_only")
-            _prefetchIndexMode = BackgroundSync::PREFETCH_ID_ONLY;
+            _prefetchIndexMode = IndexPrefetchConfig::PREFETCH_ID_ONLY;
         else if (prefetchIndexModeString == "all")
-            _prefetchIndexMode = BackgroundSync::PREFETCH_ALL;
+            _prefetchIndexMode = IndexPrefetchConfig::PREFETCH_ALL;
         else {
-            _prefetchIndexMode = BackgroundSync::PREFETCH_ALL;
+            _prefetchIndexMode = IndexPrefetchConfig::PREFETCH_ALL;
             warning() << "unrecognized indexPrefetchMode setting \"" << prefetchIndexModeString
                       << "\", defaulting to \"all\"";
         }