SERVER-24781 CSRS primary should cleanup dist locks on promotion

This also reverts commit cc904854866b1cd1a25508573eeab322c0dacbff.

1 files changed, 15 insertions, 1 deletions

diff --git a/src/mongo/s/sharding_initialization.h b/src/mongo/s/sharding_initialization.h
index a782dc6474a..0ecdd2a3508 100644
--- a/src/mongo/s/sharding_initialization.h
+++ b/src/mongo/s/sharding_initialization.h
@@ -31,6 +31,8 @@
 #include <cstdint>
 #include <memory>
 
+#include "mongo/base/string_data.h"
+#include "mongo/bson/oid.h"
 #include "mongo/stdx/functional.h"
 
 namespace mongo {
@@ -55,10 +57,22 @@ using ShardingEgressMetadataHookBuilder =
 }  // namespace rpc
 
 /**
+ * Fixed process identifier for the dist lock manager running on a config server.
+ */
+extern const StringData kDistLockProcessIdForConfigServer;
+
+/**
+ * Generates a uniform string to be used as a process id for the distributed lock manager.
+ */
+std::string generateDistLockProcessId(OperationContext* txn);
+
+/**
  * Takes in the connection string for reaching the config servers and initializes the global
  * ShardingCatalogClient, ShardingCatalogManager, ShardRegistry, and Grid objects.
  */
-Status initializeGlobalShardingState(const ConnectionString& configCS,
+Status initializeGlobalShardingState(OperationContext* txn,
+                                     const ConnectionString& configCS,
+                                     StringData distLockProcessId,
                                      std::unique_ptr<ShardFactory> shardFactory,
                                      rpc::ShardingEgressMetadataHookBuilder hookBuilder,
                                      ShardingCatalogManagerBuilder catalogManagerBuilder);