Skip to content

Commit

Permalink
address comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Wenquan Xing committed May 8, 2019
1 parent eb6742a commit eebceb7
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 33 deletions.
12 changes: 6 additions & 6 deletions common/cluster/metadata.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,17 @@ func NewMetadata(

versionToClusterName := make(map[int64]string)
for clusterName, info := range clusterInfo {
if versionIncrement <= info.InitialVersion || info.InitialVersion < 0 {
if versionIncrement <= info.InitialFailoverVersion || info.InitialFailoverVersion < 0 {
panic(fmt.Sprintf(
"Version increment %v is smaller than initial version: %v.",
versionIncrement,
info.InitialVersion,
info.InitialFailoverVersion,
))
}
if len(clusterName) == 0 {
panic("Cluster name in all cluster names is empty")
}
versionToClusterName[info.InitialVersion] = clusterName
versionToClusterName[info.InitialFailoverVersion] = clusterName

if info.Enabled && (len(info.RPCName) == 0 || len(info.RPCAddress) == 0) {
panic(fmt.Sprintf("Cluster %v: rpc name / address is empty", clusterName))
Expand Down Expand Up @@ -210,12 +210,12 @@ func (metadata *metadataImpl) GetAllClusterInfo() map[string]config.ClusterInfor

// ClusterNameForFailoverVersion return the corresponding cluster name for a given failover version
func (metadata *metadataImpl) ClusterNameForFailoverVersion(failoverVersion int64) string {
initialVersion := failoverVersion % metadata.versionIncrement
clusterName, ok := metadata.versionToClusterName[initialVersion]
initialFailoverVersion := failoverVersion % metadata.versionIncrement
clusterName, ok := metadata.versionToClusterName[initialFailoverVersion]
if !ok {
panic(fmt.Sprintf(
"Unknown initial failover version %v with given cluster initial failover version map: %v and failover version increment %v.",
initialVersion,
initialFailoverVersion,
metadata.clusterInfo,
metadata.versionIncrement,
))
Expand Down
24 changes: 12 additions & 12 deletions common/cluster/metadataTestBase.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@ var (
// TestAllClusterInfo is the same as above, just convenient for test mocking
TestAllClusterInfo = map[string]config.ClusterInformation{
TestCurrentClusterName: config.ClusterInformation{
Enabled: true,
InitialVersion: TestCurrentClusterInitialFailoverVersion,
RPCName: common.FrontendServiceName,
RPCAddress: TestCurrentClusterFrontendAddress,
Enabled: true,
InitialFailoverVersion: TestCurrentClusterInitialFailoverVersion,
RPCName: common.FrontendServiceName,
RPCAddress: TestCurrentClusterFrontendAddress,
},
TestAlternativeClusterName: config.ClusterInformation{
Enabled: true,
InitialVersion: TestAlternativeClusterInitialFailoverVersion,
RPCName: common.FrontendServiceName,
RPCAddress: TestAlternativeClusterFrontendAddress,
Enabled: true,
InitialFailoverVersion: TestAlternativeClusterInitialFailoverVersion,
RPCName: common.FrontendServiceName,
RPCAddress: TestAlternativeClusterFrontendAddress,
},
}

Expand All @@ -69,10 +69,10 @@ var (
// TestSingleDCClusterInfo is the same as above, just convenient for test mocking
TestSingleDCClusterInfo = map[string]config.ClusterInformation{
TestCurrentClusterName: config.ClusterInformation{
Enabled: true,
InitialVersion: TestCurrentClusterInitialFailoverVersion,
RPCName: common.FrontendServiceName,
RPCAddress: TestCurrentClusterFrontendAddress,
Enabled: true,
InitialFailoverVersion: TestCurrentClusterInitialFailoverVersion,
RPCName: common.FrontendServiceName,
RPCAddress: TestCurrentClusterFrontendAddress,
},
}
)
Expand Down
2 changes: 1 addition & 1 deletion common/service/config/clusterInformation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func (c ClustersInfo) ToClusterInformation() ClustersInformation {

clusterInfo := ClusterInformation{}
clusterInfo.Enabled = true
clusterInfo.InitialVersion = v
clusterInfo.InitialFailoverVersion = v
clusterInfo.RPCName = address.RPCName
clusterInfo.RPCAddress = address.RPCAddress
clustersInfo.ClusterInformation[k] = clusterInfo
Expand Down
4 changes: 2 additions & 2 deletions common/service/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,8 @@ type (

// ClusterInformation contains the information about each cluster which participated in cross DC
ClusterInformation struct {
Enabled bool `yaml:"enabled"`
InitialVersion int64 `yaml:"initialVersion"`
Enabled bool `yaml:"enabled"`
InitialFailoverVersion int64 `yaml:"initialFailoverVersion"`
// RPCName indicate the remote service name
RPCName string `yaml:"rpcName"`
// Address indicate the remote service IP address
Expand Down
2 changes: 1 addition & 1 deletion config/development.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ clustersInformation:
clusterInformation:
active:
enabled: true
initialVersion: 0
initialFailoverVersion: 0
rpcName: "cadence-frontend"
rpcAddress: "127.0.0.1:7933"

Expand Down
4 changes: 2 additions & 2 deletions config/development_active.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ clustersInformation:
clusterInformation:
active:
enabled: true
initialVersion: 1
initialFailoverVersion: 1
rpcName: "cadence-frontend"
rpcAddress: "127.0.0.1:7933"
standby:
enabled: true
initialVersion: 0
initialFailoverVersion: 0
rpcName: "cadence-frontend"
rpcAddress: "127.0.0.1:8933"

Expand Down
2 changes: 1 addition & 1 deletion config/development_prometheus.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ clustersInformation:
clusterInformation:
active:
enabled: true
initialVersion: 0
initialFailoverVersion: 0
rpcName: "cadence-frontend"
rpcAddress: "127.0.0.1:7933"

Expand Down
4 changes: 2 additions & 2 deletions config/development_standby.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ clustersInformation:
clusterInformation:
active:
enabled: true
initialVersion: 1
initialFailoverVersion: 1
rpcName: "cadence-frontend"
rpcAddress: "127.0.0.1:7933"
standby:
enabled: true
initialVersion: 0
initialFailoverVersion: 0
rpcName: "cadence-frontend"
rpcAddress: "127.0.0.1:8933"

Expand Down
2 changes: 1 addition & 1 deletion docker/config_template.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ clustersInformation:
clusterInformation:
active:
enabled: true
initialVersion: 0
initialFailoverVersion: 0
rpcName: "cadence-frontend"
rpcAddress: "127.0.0.1:7933"

Expand Down
2 changes: 1 addition & 1 deletion docker/config_template_mysql.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ clustersInformation:
clusterInformation:
active:
enabled: true
initialVersion: 0
initialFailoverVersion: 0
rpcName: "cadence-frontend"
rpcAddress: "127.0.0.1:7933"

Expand Down
8 changes: 4 additions & 4 deletions hostxdc/testdata/integrationtestclusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
clusterInformation:
active:
enabled: true
initialVersion: 0
initialFailoverVersion: 0
rpcName: "cadence-frontend"
rpcAddress: "127.0.0.1:7104"
standby:
enabled: true
initialVersion: 1
initialFailoverVersion: 1
rpcName: "cadence-frontend"
rpcAddress: "127.0.0.1:8104"
enablearchival: false
Expand Down Expand Up @@ -60,12 +60,12 @@
clusterInformation:
active:
enabled: true
initialVersion: 0
initialFailoverVersion: 0
rpcName: "cadence-frontend"
rpcAddress: "127.0.0.1:7104"
standby:
enabled: true
initialVersion: 1
initialFailoverVersion: 1
rpcName: "cadence-frontend"
rpcAddress: "127.0.0.1:8104"
enablearchival: false
Expand Down

0 comments on commit eebceb7

Please sign in to comment.