From 2f9cbb7f816f744ac08ac52a0c87eaec3258e3ef Mon Sep 17 00:00:00 2001
From: Kaloian Manassiev <kaloian.manassiev@mongodb.com>
Date: Tue, 28 Apr 2020 02:22:04 -0400
Subject: SERVER-47793 Remove library dependency of sessions_collection_sharded
 on sessions_collection_rs

---
 src/mongo/SConscript | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'src/mongo/SConscript')

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index da604bc2800..b6abe388ec4 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -351,10 +351,11 @@ if env.TargetOSIs('windows'):
 mongod = env.Program(
     target="mongod",
     source=[
-        "db/db.cpp",
-        "db/read_write_concern_defaults_cache_lookup_mongod.cpp",
+        'db/db.cpp',
+        'db/logical_session_cache_factory_mongod.cpp',
+        'db/read_write_concern_defaults_cache_lookup_mongod.cpp',
     ] + env.WindowsResourceFile("db/db.rc"),
-    LIBDEPS=[
+    LIBDEPS_PRIVATE=[
         '$BUILD_DIR/third_party/shim_snappy',
         'base',
         'db/auth/auth_op_observer',
@@ -368,15 +369,15 @@ mongod = env.Program(
         'db/catalog/index_key_validate',
         'db/client_metadata_propagation_egress_hook',
         'db/collection_index_usage_tracker',
-        'db/commands/mongod',
         'db/commands/mongod_fcv',
+        'db/commands/mongod',
         'db/commands/server_status_servers',
         'db/common',
         'db/concurrency/flow_control_ticketholder',
         'db/concurrency/lock_manager',
         'db/concurrency/write_conflict_exception',
-        'db/curop',
         'db/curop_metrics',
+        'db/curop',
         'db/db_raii',
         'db/dbdirectclient',
         'db/dbhelpers',
@@ -384,15 +385,16 @@ mongod = env.Program(
         'db/free_mon/free_mon_mongod',
         'db/ftdc/ftdc_mongod',
         'db/fts/ftsmongod',
+        'db/index_builds_coordinator_mongod',
         'db/index/index_access_method',
+        'db/index/index_access_methods',
         'db/index/index_descriptor',
-        'db/index_builds_coordinator_mongod',
         'db/initialize_server_security_state',
         'db/initialize_snmp',
         'db/introspect',
         'db/keys_collection_client_direct',
         'db/kill_sessions_local',
-        'db/logical_session_cache_factory_mongod',
+        'db/logical_session_cache_impl',
         'db/logical_time_metadata_hook',
         'db/matcher/expressions_mongod_only',
         'db/mirror_maestro',
@@ -412,21 +414,24 @@ mongod = env.Program(
         'db/repl/oplog_buffer_collection',
         'db/repl/oplog_buffer_proxy',
         'db/repl/repl_coordinator_impl',
-        'db/repl/repl_coordinator_interface',
         'db/repl/repl_set_commands',
         'db/repl/repl_settings',
         'db/repl/rs_rollback',
         'db/repl/rslog',
         'db/repl/serveronly_repl',
-        'db/repl/storage_interface',
         'db/repl/storage_interface_impl',
         'db/repl/topology_coordinator',
+        'db/replica_set_aware_service',
         'db/rw_concern_d',
         'db/s/balancer',
         'db/s/op_observer_sharding_impl',
+        'db/s/sessions_collection_config_server',
         'db/s/sharding_commands_d',
         'db/s/sharding_runtime_d',
         'db/service_context_d',
+        'db/service_liaison_mongod',
+        'db/sessions_collection_rs',
+        'db/sessions_collection_standalone',
         'db/startup_warnings_mongod',
         'db/stats/counters',
         'db/stats/serveronly_stats',
@@ -435,8 +440,8 @@ mongod = env.Program(
         'db/storage/biggie/storage_biggie',
         'db/storage/devnull/storage_devnull',
         'db/storage/ephemeral_for_test/storage_ephemeral_for_test',
-        'db/storage/flow_control',
         'db/storage/flow_control_parameters',
+        'db/storage/flow_control',
         'db/storage/storage_control',
         'db/storage/storage_engine_lock_file',
         'db/storage/storage_engine_metadata',
@@ -447,15 +452,15 @@ mongod = env.Program(
         'db/traffic_recorder',
         'db/ttl_collection_cache',
         'db/ttl_d',
-        'db/update/update_driver',
         'db/update_index_data',
+        'db/update/update_driver',
         'db/views/views_mongod',
         'db/windows_options' if env.TargetOSIs('windows') else [],
         'executor/network_interface_factory',
         'mongod_options_init',
         'rpc/rpc',
-        's/catalog/sharding_catalog_client_impl',
         's/commands/shared_cluster_commands',
+        's/sessions_collection_sharded',
         'scripting/scripting_server',
         'transport/message_compressor_options_server',
         'transport/service_entry_point',
@@ -471,10 +476,6 @@ mongod = env.Program(
         'util/version_impl',
         'watchdog/watchdog_mongod',
     ],
-    LIBDEPS_PRIVATE=[
-        'db/index/index_access_methods',
-        'db/replica_set_aware_service',
-    ],
     AIB_COMPONENT="mongod",
     AIB_COMPONENTS_EXTRA=[
         "core",
-- 
cgit v1.2.1