SERVER-59519 Fold repl_settings.idl into repl_server_parameters.idl

5 files changed, 31 insertions, 66 deletions

diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index 2a35874c14b..ac2443f24b6 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -146,12 +146,14 @@ env.Library(
     target='repl_settings',
     source=[
         'repl_settings.cpp',
-        'repl_settings.idl',
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/idl/server_parameter',
     ],
+    LIBDEPS_PRIVATE=[
+        'repl_server_parameters',
+    ]
 )
 
 env.Library(
diff --git a/src/mongo/db/repl/repl_server_parameters.idl b/src/mongo/db/repl/repl_server_parameters.idl
index 24fa8e6d649..99aa7338724 100644
--- a/src/mongo/db/repl/repl_server_parameters.idl
+++ b/src/mongo/db/repl/repl_server_parameters.idl
@@ -300,6 +300,31 @@ server_parameters:
             gte: 1
             lte: 256
 
+    recoverFromOplogAsStandalone:
+        description: Tells the server to perform replication recovery as a standalone.
+        set_at: startup
+        cpp_vartype: bool
+        cpp_varname: recoverFromOplogAsStandalone
+        default: false
+
+    maxSyncSourceLagSecs:
+        description: ''
+        set_at: startup
+        cpp_vartype: int
+        cpp_varname: maxSyncSourceLagSecs
+        default: 30
+        validator:
+            gt: 0
+
+    replElectionTimeoutOffsetLimitFraction:
+        description: ''
+        set_at: startup
+        cpp_vartype: double
+        cpp_varname: replElectionTimeoutOffsetLimitFraction
+        default: 0.15
+        validator:
+            gt: 0.01
+
     # New parameters since this file was created, not taken from elsewhere.
     initialSyncTransientErrorRetryPeriodSeconds:
         description: >-
@@ -593,8 +618,8 @@ feature_flags:
         description: When enabled, multitenant migration uses the "shard merge" protocol.
         cpp_varname: feature_flags::gShardMerge
         default: false
-    
+
     featureFlagShardSplit:
         description: When enabled, multitenant migration can use the shard split commands.
         cpp_varname: feature_flags::gShardSplit
-        default: false
+        default: false
\ No newline at end of file
diff --git a/src/mongo/db/repl/repl_settings.cpp b/src/mongo/db/repl/repl_settings.cpp
index e120cfe99dd..1c27c3a77c2 100644
--- a/src/mongo/db/repl/repl_settings.cpp
+++ b/src/mongo/db/repl/repl_settings.cpp
@@ -34,7 +34,6 @@
 #include "mongo/db/repl/repl_settings.h"
 
 #include "mongo/db/repl/repl_server_parameters_gen.h"
-#include "mongo/db/repl/repl_settings_gen.h"
 
 namespace mongo {
 namespace repl {
diff --git a/src/mongo/db/repl/repl_settings.h b/src/mongo/db/repl/repl_settings.h
index 6b90a9cbfc2..1fca4dc2984 100644
--- a/src/mongo/db/repl/repl_settings.h
+++ b/src/mongo/db/repl/repl_settings.h
@@ -32,8 +32,8 @@
 #include <string>
 
 #include "mongo/db/jsobj.h"
+#include "mongo/db/repl/repl_server_parameters_gen.h"
 #include "mongo/db/repl/repl_set_config_params_gen.h"
-#include "mongo/db/repl/repl_settings_gen.h"
 
 namespace mongo {
 namespace repl {
diff --git a/src/mongo/db/repl/repl_settings.idl b/src/mongo/db/repl/repl_settings.idl
deleted file mode 100644
index 4e01a00d270..00000000000
--- a/src/mongo/db/repl/repl_settings.idl
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (C) 2018-present MongoDB, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the Server Side Public License, version 1,
-# as published by MongoDB, Inc.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# Server Side Public License for more details.
-#
-# You should have received a copy of the Server Side Public License
-# along with this program. If not, see
-# <http://www.mongodb.com/licensing/server-side-public-license>.
-#
-# As a special exception, the copyright holders give permission to link the
-# code of portions of this program with the OpenSSL library under certain
-# conditions as described in each individual source file and distribute
-# linked combinations including the program with the OpenSSL library. You
-# must comply with the Server Side Public License in all respects for
-# all of the code used other than as permitted herein. If you modify file(s)
-# with this exception, you may extend this exception to your version of the
-# file(s), but you are not obligated to do so. If you do not wish to do so,
-# delete this exception statement from your version. If you delete this
-# exception statement from all source files in the program, then also delete
-# it in the license file.
-#
-
-# server setParameters for replication
-
-global:
-    cpp_namespace: "mongo::repl"
-
-server_parameters:
-    # From repl_settings.cpp
-    recoverFromOplogAsStandalone:
-        description: Tells the server to perform replication recovery as a standalone.
-        set_at: startup
-        cpp_vartype: bool
-        cpp_varname: recoverFromOplogAsStandalone
-        default: false
-
-    # From repl_settings_init.cpp
-    maxSyncSourceLagSecs:
-        description: ''
-        set_at: startup
-        cpp_vartype: int
-        cpp_varname: maxSyncSourceLagSecs
-        default: 30
-        validator:
-            gt: 0
-
-    replElectionTimeoutOffsetLimitFraction:
-        description: ''
-        set_at: startup
-        cpp_vartype: double
-        cpp_varname: replElectionTimeoutOffsetLimitFraction
-        default: 0.15
-        validator:
-            gt: 0.01
-