diff options
| author | ADAM David Alan Martin <adam.martin@10gen.com> | 2017-05-17 14:32:07 -0400 |
|---|---|---|
| committer | ADAM David Alan Martin <adam.martin@10gen.com> | 2017-05-17 14:32:07 -0400 |
| commit | 7b911c9f339c57c499c7081fd582a3596351bc6a (patch) | |
| tree | 16382313d415d97689010972f118383f08f14d0f /src/mongo/s/client | |
| parent | 1ac2f9d964bc86a1b7ed5ec608a7d1c444b017bd (diff) | |
| download | mongo-7b911c9f339c57c499c7081fd582a3596351bc6a.tar.gz | |
SERVER-29252 Rotate the coreshard & sharding client cycle.
Resolve the cycle with repl/rs_rollback.
Also remove a superfluous catalog dependency.
Diffstat (limited to 'src/mongo/s/client')
| -rw-r--r-- | src/mongo/s/client/SConscript | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mongo/s/client/SConscript b/src/mongo/s/client/SConscript index 0ea64131ddc..165f6242ec6 100644 --- a/src/mongo/s/client/SConscript +++ b/src/mongo/s/client/SConscript @@ -26,12 +26,8 @@ env.Library( '$BUILD_DIR/mongo/rpc/metadata', '$BUILD_DIR/mongo/s/cluster_last_error_info', '$BUILD_DIR/mongo/s/is_mongos', + '$BUILD_DIR/mongo/s/coreshard', 'shard_interface', - #'$BUILD_DIR/mongo/s/coreshard', # CYCLE - ], - LIBDEPS_TAGS=[ - # TODO(ADAM, 2017,04-25): See `CYCLE` tags above - 'illegal_cyclic_or_unresolved_dependencies_whitelisted', ], ) @@ -42,6 +38,7 @@ env.Library( 'sharding_network_connection_hook.cpp', ], LIBDEPS=[ + 'sharding_client', '$BUILD_DIR/mongo/client/clientdriver', '$BUILD_DIR/mongo/s/coreshard', ], |