Allow setting cluster Id explicitly

common/cluster/metadata.go

@@ -104,7 +104,12 @@ type (
 		InitialFailoverVersion int64 `yaml:"initialFailoverVersion"`
 		// Address indicate the remote service address(Host:Port). Host can be DNS name.
 		RPCAddress string `yaml:"rpcAddress"`
+<<<<<<< Updated upstream
 		ShardCount int32  `yaml:"-"` // Ignore this field when loading config.
+=======
+		// Cluster ID allows to explicitly the ID of the cluster. Optional.
+		ClusterID string `yaml:"clusterId"`
+>>>>>>> Stashed changes
 		// private field to track cluster information updates
 		version int64
 	}

temporal/fx.go

@@ -662,11 +662,20 @@ func ApplyClusterMetadataConfigProvider(
 				tag.Key("clusterInformation"),
 				tag.ClusterName(clusterName),
 				tag.IgnoredValue(clusterInfo))
+
+			// Only configure current cluster metadata from static config file
 			continue
 		}
 
-		// Only configure current cluster metadata from static config file
 		clusterId := uuid.New()
+		if clusterInfo.ClusterID != "" {
+			if uuid.Parse(clusterInfo.ClusterID) == nil {
+				return config.ClusterMetadata, config.Persistence, fmt.Errorf("invalid cluster id: %v", clusterInfo.ClusterID)
+			}
+
+			clusterId = clusterInfo.ClusterID
+		}
+
 		applied, err := clusterMetadataManager.SaveClusterMetadata(
 			ctx,
 			&persistence.SaveClusterMetadataRequest{