Adding mutable metadata and cluster id (#803)

Adding mutable metadata and cluster id
temporalio · Oct 8, 2020 · b63d577 · b63d577
1 parent 5a4ed0d
commit b63d577
Show file tree

Hide file tree

Showing 31 changed files with 3,334 additions and 889 deletions.
diff --git a/api/persistenceblobs/v1/message.pb.go b/api/persistenceblobs/v1/message.pb.go
diff --git a/cmd/server/temporal/server.go b/cmd/server/temporal/server.go
@@ -28,6 +28,8 @@ import (
 	"log"
 	"time"
 
+	"github.com/pborman/uuid"
+
 	sdkclient "go.temporal.io/sdk/client"
 	"go.uber.org/zap"
 
@@ -301,30 +303,33 @@ func immutableClusterMetadataInitialization(
 	}
 	defer clusterMetadataManager.Close()
 
-	resp, err := clusterMetadataManager.InitializeImmutableClusterMetadata(
-		&persistence.InitializeImmutableClusterMetadataRequest{
-			ImmutableClusterMetadata: persistenceblobs.ImmutableClusterMetadata{
+	applied, err := clusterMetadataManager.SaveClusterMetadata(
+		&persistence.SaveClusterMetadataRequest{
+			ClusterMetadata: persistenceblobs.ClusterMetadata{
 				HistoryShardCount: int32(persistenceConfig.NumHistoryShards),
 				ClusterName:       clusterMetadata.CurrentClusterName,
+				ClusterId:         uuid.New(),
 			}})
-
 	if err != nil {
-		log.Fatalf("Error while fetching or persisting immutable cluster metadata: %v", err)
+		log.Fatalf("Error while saving cluster metadata: %v", err)
 	}
-
-	if resp.RequestApplied {
-		logger.Info("Successfully applied immutable cluster metadata.")
+	if applied {
+		logger.Info("Successfully saved cluster metadata.")
 	} else {
-		if clusterMetadata.CurrentClusterName != resp.PersistedImmutableData.ClusterName {
+		resp, err := clusterMetadataManager.GetClusterMetadata()
+		if err != nil {
+			log.Fatalf("Error while fetching cluster metadata: %v", err)
+		}
+		if clusterMetadata.CurrentClusterName != resp.ClusterName {
 			logImmutableMismatch(logger,
 				"ClusterMetadata.CurrentClusterName",
 				clusterMetadata.CurrentClusterName,
-				resp.PersistedImmutableData.ClusterName)
+				resp.ClusterName)
 
-			clusterMetadata.CurrentClusterName = resp.PersistedImmutableData.ClusterName
+			clusterMetadata.CurrentClusterName = resp.ClusterName
 		}
 
-		var persistedShardCount = int(resp.PersistedImmutableData.HistoryShardCount)
+		var persistedShardCount = int(resp.HistoryShardCount)
 		if persistenceConfig.NumHistoryShards != persistedShardCount {
 			logImmutableMismatch(logger,
 				"Persistence.NumHistoryShards",

diff --git a/common/metrics/defs.go b/common/metrics/defs.go
@@ -276,10 +276,10 @@ const (
 	PersistenceUpdateDLQAckLevelScope
 	// PersistenceGetDLQAckLevelScope tracks GetDLQAckLevel calls made by service to persistence layer
 	PersistenceGetDLQAckLevelScope
-	// PersistenceInitImmutableClusterMetadataScope tracks InitializeImmutableClusterMetadata calls made by service to persistence layer
-	PersistenceInitImmutableClusterMetadataScope
-	// PersistenceGetImmutableClusterMetadataScope tracks GetImmutableClusterMetadata calls made by service to persistence layer
-	PersistenceGetImmutableClusterMetadataScope
+	// PersistenceGetClusterMetadataScope tracks GetClusterMetadata calls made by service to persistence layer
+	PersistenceGetClusterMetadataScope
+	// PersistenceSaveClusterMetadataScope tracks SaveClusterMetadata calls made by service to persistence layer
+	PersistenceSaveClusterMetadataScope
 	// PersistenceUpsertClusterMembershipScope tracks UpsertClusterMembership calls made by service to persistence layer
 	PersistenceUpsertClusterMembershipScope
 	// PersistencePruneClusterMembershipScope tracks PruneClusterMembership calls made by service to persistence layer
@@ -1144,8 +1144,8 @@ var ScopeDefs = map[ServiceIdx]map[int]scopeDefinition{
 		PersistenceUpdateDLQAckLevelScope:                        {operation: "UpdateDLQAckLevel"},
 		PersistenceGetDLQAckLevelScope:                           {operation: "GetDLQAckLevel"},
 		PersistenceNamespaceReplicationQueueScope:                {operation: "NamespaceReplicationQueue"},
-		PersistenceInitImmutableClusterMetadataScope:             {operation: "InitializeImmutableClusterMetadata"},
-		PersistenceGetImmutableClusterMetadataScope:              {operation: "GetImmutableClusterMetadata"},
+		PersistenceGetClusterMetadataScope:                       {operation: "GetClusterMetadata"},
+		PersistenceSaveClusterMetadataScope:                      {operation: "SaveClusterMetadata"},
 		PersistencePruneClusterMembershipScope:                   {operation: "PruneClusterMembership"},
 		PersistenceGetClusterMembersScope:                        {operation: "GetClusterMembership"},
 		PersistenceUpsertClusterMembershipScope:                  {operation: "UpsertClusterMembership"},