Removed global domain enabled config (cadence-workflow#4845)

FranciShy · May 26, 2022 · c6ce732 · c6ce732
1 parent 3a813e8
commit c6ce732
Show file tree

Hide file tree

Showing 61 changed files with 121 additions and 807 deletions.
diff --git a/cmd/server/cadence/server.go b/cmd/server/cadence/server.go
@@ -190,8 +190,6 @@ func (s *server) startService() common.Daemon {
 	params.MetricsClient = metrics.NewClient(params.MetricScope, service.GetMetricsServiceIdx(params.Name, params.Logger))
 
 	params.ClusterMetadata = cluster.NewMetadata(
-		params.Logger,
-		dc.GetBoolProperty(dynamicconfig.EnableGlobalDomain, clusterGroupMetadata.EnableGlobalDomain),
 		clusterGroupMetadata.FailoverVersionIncrement,
 		clusterGroupMetadata.PrimaryClusterName,
 		clusterGroupMetadata.CurrentClusterName,

diff --git a/common/cache/domainCache.go b/common/cache/domainCache.go
@@ -571,10 +571,8 @@ func (c *domainCache) updateIDToDomainCache(
 	entry.Lock()
 	defer entry.Unlock()
 
-	triggerCallback := c.clusterMetadata.IsGlobalDomainEnabled() &&
-		// initialized will be true when the entry contains valid data
-		entry.initialized &&
-		record.notificationVersion > entry.notificationVersion
+	// initialized will be true when the entry contains valid data
+	triggerCallback := entry.initialized && record.notificationVersion > entry.notificationVersion
 
 	entry.info = record.info
 	entry.config = record.config

diff --git a/common/cache/domainCache_test.go b/common/cache/domainCache_test.go
@@ -34,7 +34,6 @@ import (
 	"github.com/uber/cadence/common"
 	"github.com/uber/cadence/common/clock"
 	"github.com/uber/cadence/common/cluster"
-	"github.com/uber/cadence/common/dynamicconfig"
 	"github.com/uber/cadence/common/log"
 	"github.com/uber/cadence/common/log/loggerimpl"
 	"github.com/uber/cadence/common/metrics"
@@ -154,7 +153,6 @@ func (s *domainCacheSuite) TestListDomain() {
 	pageToken := []byte("some random page token")
 
 	s.metadataMgr.On("GetMetadata", mock.Anything).Return(&persistence.GetMetadataResponse{NotificationVersion: domainNotificationVersion}, nil)
-	s.clusterMetadata.On("IsGlobalDomainEnabled").Return(true)
 	s.metadataMgr.On("ListDomains", mock.Anything, &persistence.ListDomainsRequest{
 		PageSize:      domainCacheRefreshPageSize,
 		NextPageToken: nil,
@@ -197,7 +195,6 @@ func (s *domainCacheSuite) TestListDomain() {
 }
 
 func (s *domainCacheSuite) TestGetDomain_NonLoaded_GetByName() {
-	s.clusterMetadata.On("IsGlobalDomainEnabled").Return(true)
 	domainNotificationVersion := int64(999999) // make this notification version really large for test
 	s.metadataMgr.On("GetMetadata", mock.Anything).Return(&persistence.GetMetadataResponse{NotificationVersion: domainNotificationVersion}, nil)
 	domainRecord := &persistence.GetDomainResponse{
@@ -241,7 +238,6 @@ func (s *domainCacheSuite) TestGetDomain_NonLoaded_GetByName() {
 }
 
 func (s *domainCacheSuite) TestGetDomain_NonLoaded_GetByID() {
-	s.clusterMetadata.On("IsGlobalDomainEnabled").Return(true)
 	domainNotificationVersion := int64(999999) // make this notification version really large for test
 	s.metadataMgr.On("GetMetadata", mock.Anything).Return(&persistence.GetMetadataResponse{NotificationVersion: domainNotificationVersion}, nil)
 	domainRecord := &persistence.GetDomainResponse{
@@ -280,7 +276,6 @@ func (s *domainCacheSuite) TestGetDomain_NonLoaded_GetByID() {
 }
 
 func (s *domainCacheSuite) TestGetActiveDomainEntry_LocalDomain() {
-	s.clusterMetadata.On("IsGlobalDomainEnabled").Return(true)
 	domainNotificationVersion := int64(999999) // make this notification version really large for test
 	s.metadataMgr.On("GetMetadata", mock.Anything).Return(&persistence.GetMetadataResponse{NotificationVersion: domainNotificationVersion}, nil)
 
@@ -317,7 +312,6 @@ func (s *domainCacheSuite) TestGetActiveDomainEntry_LocalDomain() {
 }
 
 func (s *domainCacheSuite) TestGetActiveDomainEntry_ActiveGlobalDomain() {
-	s.clusterMetadata.On("IsGlobalDomainEnabled").Return(true)
 	s.clusterMetadata.On("GetCurrentClusterName").Return(cluster.TestCurrentClusterName)
 	domainNotificationVersion := int64(999999) // make this notification version really large for test
 	s.metadataMgr.On("GetMetadata", mock.Anything).Return(&persistence.GetMetadataResponse{NotificationVersion: domainNotificationVersion}, nil)
@@ -356,7 +350,6 @@ func (s *domainCacheSuite) TestGetActiveDomainEntry_ActiveGlobalDomain() {
 }
 
 func (s *domainCacheSuite) TestGetActiveDomainEntry_PassiveGlobalDomain() {
-	s.clusterMetadata.On("IsGlobalDomainEnabled").Return(true)
 	s.clusterMetadata.On("GetCurrentClusterName").Return(cluster.TestCurrentClusterName)
 	domainNotificationVersion := int64(999999) // make this notification version really large for test
 	s.metadataMgr.On("GetMetadata", mock.Anything).Return(&persistence.GetMetadataResponse{NotificationVersion: domainNotificationVersion}, nil)
@@ -441,7 +434,6 @@ func (s *domainCacheSuite) TestRegisterCallback_CatchUp() {
 	domainNotificationVersion++
 
 	s.metadataMgr.On("GetMetadata", mock.Anything).Return(&persistence.GetMetadataResponse{NotificationVersion: domainNotificationVersion}, nil).Once()
-	s.clusterMetadata.On("IsGlobalDomainEnabled").Return(true)
 	s.metadataMgr.On("ListDomains", mock.Anything, &persistence.ListDomainsRequest{
 		PageSize:      domainCacheRefreshPageSize,
 		NextPageToken: nil,
@@ -519,7 +511,6 @@ func (s *domainCacheSuite) TestUpdateCache_TriggerCallBack() {
 	domainNotificationVersion++
 
 	s.metadataMgr.On("GetMetadata", mock.Anything).Return(&persistence.GetMetadataResponse{NotificationVersion: domainNotificationVersion}, nil).Once()
-	s.clusterMetadata.On("IsGlobalDomainEnabled").Return(true)
 	s.metadataMgr.On("ListDomains", mock.Anything, &persistence.ListDomainsRequest{
 		PageSize:      domainCacheRefreshPageSize,
 		NextPageToken: nil,
@@ -605,7 +596,6 @@ func (s *domainCacheSuite) TestUpdateCache_TriggerCallBack() {
 }
 
 func (s *domainCacheSuite) TestGetTriggerListAndUpdateCache_ConcurrentAccess() {
-	s.clusterMetadata.On("IsGlobalDomainEnabled").Return(true)
 	domainNotificationVersion := int64(999999) // make this notification version really large for test
 	s.metadataMgr.On("GetMetadata", mock.Anything).Return(&persistence.GetMetadataResponse{NotificationVersion: domainNotificationVersion}, nil)
 	id := uuid.New()
@@ -764,8 +754,6 @@ func Test_IsSampledForLongerRetention(t *testing.T) {
 
 func Test_DomainCacheEntry_GetDomainNotActiveErr(t *testing.T) {
 	clusterMetadata := cluster.NewMetadata(
-		loggerimpl.NewNopLogger(),
-		dynamicconfig.GetBoolPropertyFn(true),
 		int64(10),
 		cluster.TestCurrentClusterName,
 		cluster.TestCurrentClusterName,

diff --git a/common/cluster/metadata.go b/common/cluster/metadata.go
@@ -27,16 +27,11 @@ import (
 
 	"github.com/uber/cadence/common"
 	"github.com/uber/cadence/common/config"
-	"github.com/uber/cadence/common/dynamicconfig"
-	"github.com/uber/cadence/common/log"
 )
 
 type (
 	// Metadata provides information about clusters
 	Metadata interface {
-		// IsGlobalDomainEnabled whether the global domain is enabled,
-		// this attr should be discarded when cross DC is made public
-		IsGlobalDomainEnabled() bool
 		// IsPrimaryCluster whether current cluster is the primary cluster
 		IsPrimaryCluster() bool
 		// GetNextFailoverVersion return the next failover version for domain failover
@@ -54,10 +49,6 @@ type (
 	}
 
 	metadataImpl struct {
-		logger log.Logger
-		// EnableGlobalDomain whether the global domain is enabled,
-		// this attr should be discarded when cross DC is made public
-		enableGlobalDomain dynamicconfig.BoolPropertyFn
 		// failoverVersionIncrement is the increment of each cluster's version when failover happen
 		failoverVersionIncrement int64
 		// primaryClusterName is the name of the primary cluster, only the primary cluster can register / update domain
@@ -74,8 +65,6 @@ type (
 
 // NewMetadata create a new instance of Metadata
 func NewMetadata(
-	logger log.Logger,
-	enableGlobalDomain dynamicconfig.BoolPropertyFn,
 	failoverVersionIncrement int64,
 	primaryClusterName string,
 	currentClusterName string,
@@ -87,8 +76,6 @@ func NewMetadata(
 	}
 
 	return &metadataImpl{
-		logger:                   logger,
-		enableGlobalDomain:       enableGlobalDomain,
 		failoverVersionIncrement: failoverVersionIncrement,
 		primaryClusterName:       primaryClusterName,
 		currentClusterName:       currentClusterName,
@@ -97,12 +84,6 @@ func NewMetadata(
 	}
 }
 
-// IsGlobalDomainEnabled whether the global domain is enabled,
-// this attr should be discarded when cross DC is made public
-func (metadata *metadataImpl) IsGlobalDomainEnabled() bool {
-	return metadata.enableGlobalDomain()
-}
-
 // GetNextFailoverVersion return the next failover version based on input
 func (metadata *metadataImpl) GetNextFailoverVersion(cluster string, currentFailoverVersion int64) int64 {
 	info, ok := metadata.clusterGroup[cluster]

diff --git a/common/cluster/metadataTest.go b/common/cluster/metadataTest.go
@@ -22,8 +22,6 @@ package cluster
 
 import (
 	"github.com/uber/cadence/common/config"
-	"github.com/uber/cadence/common/dynamicconfig"
-	"github.com/uber/cadence/common/log/loggerimpl"
 	"github.com/uber/cadence/common/service"
 )
 
@@ -90,29 +88,16 @@ var (
 )
 
 // GetTestClusterMetadata return an cluster metadata instance, which is initialized
-func GetTestClusterMetadata(enableGlobalDomain bool, isPrimaryCluster bool) Metadata {
+func GetTestClusterMetadata(isPrimaryCluster bool) Metadata {
 	primaryClusterName := TestCurrentClusterName
 	if !isPrimaryCluster {
 		primaryClusterName = TestAlternativeClusterName
 	}
 
-	if enableGlobalDomain {
-		return NewMetadata(
-			loggerimpl.NewNopLogger(),
-			dynamicconfig.GetBoolPropertyFn(true),
-			TestFailoverVersionIncrement,
-			primaryClusterName,
-			TestCurrentClusterName,
-			TestAllClusterInfo,
-		)
-	}
-
 	return NewMetadata(
-		loggerimpl.NewNopLogger(),
-		dynamicconfig.GetBoolPropertyFn(false),
 		TestFailoverVersionIncrement,
+		primaryClusterName,
 		TestCurrentClusterName,
-		TestCurrentClusterName,
-		TestSingleDCClusterInfo,
+		TestAllClusterInfo,
 	)
 }
diff --git a/common/cluster/metadata_mock.go b/common/cluster/metadata_mock.go
diff --git a/common/config/cluster.go b/common/config/cluster.go
@@ -34,7 +34,6 @@ import (
 type (
 	// ClusterGroupMetadata contains all the clusters participating in a replication group(aka XDC/GlobalDomain)
 	ClusterGroupMetadata struct {
-		EnableGlobalDomain bool `yaml:"enableGlobalDomain"`
 		// FailoverVersionIncrement is the increment of each cluster version when failover happens
 		// It decides the maximum number clusters in this replication groups
 		FailoverVersionIncrement int64 `yaml:"failoverVersionIncrement"`
@@ -90,11 +89,6 @@ func (m *ClusterGroupMetadata) Validate() error {
 		return errors.New("ClusterGroupMetadata cannot be empty")
 	}
 
-	if !m.EnableGlobalDomain {
-		log.Println("[WARN] Local domain is now deprecated. Please update config to enable global domain(ClusterGroupMetadata->EnableGlobalDomain)." +
-			"Global domain of single cluster has zero overhead, but only advantages for future migration and fail over. Please check Cadence documentation for more details.")
-	}
-
 	var errs error
 
 	if len(m.PrimaryClusterName) == 0 {

diff --git a/common/config/cluster_test.go b/common/config/cluster_test.go
@@ -176,7 +176,6 @@ func TestClusterGroupMetadataValidate(t *testing.T) {
 
 func validClusterGroupMetadata() *ClusterGroupMetadata {
 	return &ClusterGroupMetadata{
-		EnableGlobalDomain:       true,
 		FailoverVersionIncrement: 10,
 		PrimaryClusterName:       "active",
 		CurrentClusterName:       "standby",

diff --git a/common/domain/handler.go b/common/domain/handler.go
@@ -126,16 +126,9 @@ func (d *handlerImpl) RegisterDomain(
 	registerRequest *types.RegisterDomainRequest,
 ) error {
 
-	if !d.clusterMetadata.IsGlobalDomainEnabled() {
-		if registerRequest.IsGlobalDomain {
-			return &types.BadRequestError{Message: "Cannot register global domain when not enabled. Please update config to enable global domain(recommended), " +
-				"or specify explicit parameter to create legacy local domain. Global domain of single cluster has zero overhead, but only advantages for future migration and fail over. Please check Cadence documentation for more details."}
-		}
-	} else {
-		// cluster global domain enabled
-		if !d.clusterMetadata.IsPrimaryCluster() && registerRequest.GetIsGlobalDomain() {
-			return errNotPrimaryCluster
-		}
+	// cluster global domain enabled
+	if !d.clusterMetadata.IsPrimaryCluster() && registerRequest.GetIsGlobalDomain() {
+		return errNotPrimaryCluster
 	}
 
 	// first check if the name is already registered as the local domain