SERVER-38714 Drop unfinished indexes on modified collections during repair when run on a replica set node

1 files changed, 2 insertions, 9 deletions

diff --git a/src/mongo/db/repl_set_member_in_standalone_mode.cpp b/src/mongo/db/repl_set_member_in_standalone_mode.cpp
index 4ea8bc6bc1e..9859ab9333b 100644
--- a/src/mongo/db/repl_set_member_in_standalone_mode.cpp
+++ b/src/mongo/db/repl_set_member_in_standalone_mode.cpp
@@ -35,24 +35,17 @@
 namespace mongo {
 namespace {
 
-// The boost::optional<bool> decoration will be initialized to boost::none.
-const auto& replSetMemberInStandaloneMode =
-    ServiceContext::declareDecoration<boost::optional<bool>>();
+const auto& replSetMemberInStandaloneMode = ServiceContext::declareDecoration<bool>();
 
 }  // namespace
 
 bool getReplSetMemberInStandaloneMode(ServiceContext* serviceCtx) {
-    auto& replSetMemberInStandaloneModeBool = replSetMemberInStandaloneMode(serviceCtx);
-    invariant(replSetMemberInStandaloneModeBool);
-
-    return replSetMemberInStandaloneModeBool.get();
+    return replSetMemberInStandaloneMode(serviceCtx);
 }
 
 void setReplSetMemberInStandaloneMode(ServiceContext* serviceCtx,
                                       bool isReplSetMemberInStandaloneMode) {
     auto& replSetMemberInStandaloneModeBool = replSetMemberInStandaloneMode(serviceCtx);
-    invariant(!replSetMemberInStandaloneModeBool);
-
     replSetMemberInStandaloneModeBool = isReplSetMemberInStandaloneMode;
 }