SERVER-9043/SERVER-31156 Link flushRouterConfig on MongoD and make it accept a namespace argument

(cherry picked from commit e4f26d25632f94a6577028ccefd32069550628b6)

2 files changed, 2 insertions, 6 deletions

diff --git a/src/mongo/db/s/balancer/balancer.cpp b/src/mongo/db/s/balancer/balancer.cpp
index d027601f284..57be235c1a0 100644
--- a/src/mongo/db/s/balancer/balancer.cpp
+++ b/src/mongo/db/s/balancer/balancer.cpp
@@ -383,7 +383,7 @@ void Balancer::_mainThread() {
 
                     shardingContext->catalogClient()
                         ->logAction(opCtx.get(), "balancer.round", "", roundDetails.toBSON())
-                        .transitional_ignore();
+                        .ignore();
                 }
 
                 LOG(1) << "*** End of balancing round";
diff --git a/src/mongo/db/s/sharding_server_status.cpp b/src/mongo/db/s/sharding_server_status.cpp
index 87c831755ca..6b6031c8a4c 100644
--- a/src/mongo/db/s/sharding_server_status.cpp
+++ b/src/mongo/db/s/sharding_server_status.cpp
@@ -35,19 +35,15 @@
 #include "mongo/db/s/active_migrations_registry.h"
 #include "mongo/db/s/sharding_state.h"
 #include "mongo/db/s/sharding_statistics.h"
-#include "mongo/db/server_options.h"
 #include "mongo/s/balancer_configuration.h"
 #include "mongo/s/catalog_cache.h"
 #include "mongo/s/client/shard_registry.h"
 #include "mongo/s/grid.h"
+#include "mongo/s/is_mongos.h"
 
 namespace mongo {
 namespace {
 
-bool isClusterNode() {
-    return serverGlobalParams.clusterRole != ClusterRole::None;
-}
-
 class ShardingServerStatus final : public ServerStatusSection {
 public:
     ShardingServerStatus() : ServerStatusSection("sharding") {}