Skip to content

Commit

Permalink
fix: can't config zk port issue
Browse files Browse the repository at this point in the history
  • Loading branch information
YenchangChan committed Sep 2, 2022
1 parent a50946e commit da36826
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions controller/clickhouse.go
Original file line number Diff line number Diff line change
Expand Up @@ -2066,6 +2066,7 @@ func mergeClickhouseConfig(conf *model.CKManClickHouseConfig) (bool, error) {
cluster.SshPort == conf.SshPort &&
cluster.Password == conf.Password && !storageChanged && !expertChanged &&
cluster.PromHost == conf.PromHost && cluster.PromPort == conf.PromPort &&
cluster.ZkPort == conf.ZkPort && cluster.ZkStatusPort == conf.ZkStatusPort &&
!userconfChanged && !logicChaned {
return false, errors.Errorf("all config are the same, it's no need to update")
}
Expand Down Expand Up @@ -2123,6 +2124,8 @@ func mergeClickhouseConfig(conf *model.CKManClickHouseConfig) (bool, error) {
cluster.Expert = conf.Expert
cluster.UsersConf = conf.UsersConf
cluster.LogicCluster = conf.LogicCluster
cluster.ZkPort = conf.ZkPort
cluster.ZkStatusPort = conf.ZkStatusPort
if err = common.DeepCopyByGob(conf, cluster); err != nil {
return false, err
}
Expand Down

0 comments on commit da36826

Please sign in to comment.