Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cluster: do not need to check TiFlash http_port #2440

Merged
merged 1 commit into from
Jul 23, 2024
Merged

cluster: do not need to check TiFlash http_port #2440

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions pkg/cluster/spec/tiflash.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ func (s *TiFlashSpec) GetOverrideDataDir() (string, error) {
// and make the dirSet uniq
checkAbsolute := func(d, host, key string) error {
if !strings.HasPrefix(d, "/") {
return fmt.Errorf("directory '%s' should be an absolute path in 'tiflash_servers:%s.config.%s'", d, s.Host, key)
return fmt.Errorf("directory '%s' should be an absolute path in 'tiflash_servers:%s.config.%s'", d, host, key)
}
return nil
}
Expand Down Expand Up @@ -301,7 +301,7 @@ func (c *TiFlashComponent) SetVersion(version string) {
func (c *TiFlashComponent) Instances() []Instance {
ins := make([]Instance, 0, len(c.Topology.TiFlashServers))
for _, s := range c.Topology.TiFlashServers {
ins = append(ins, &TiFlashInstance{BaseInstance{
tiflashInstance := &TiFlashInstance{BaseInstance{
InstanceSpec: s,
Name: c.Name(),
Host: s.Host,
Expand All @@ -315,7 +315,6 @@ func (c *TiFlashComponent) Instances() []Instance {

Ports: []int{
s.TCPPort,
s.HTTPPort,
s.FlashServicePort,
s.FlashProxyPort,
s.FlashProxyStatusPort,
Expand All @@ -330,7 +329,12 @@ func (c *TiFlashComponent) Instances() []Instance {
return UptimeByHost(s.GetManageHost(), s.StatusPort, timeout, tlsCfg)
},
Component: c,
}, c.Topology})
}, c.Topology}
// For 7.1.0 or later, TiFlash HTTP service is removed, so we don't need to set http_port
if !tidbver.TiFlashNotNeedHTTPPortConfig(c.Topology.ComponentVersions.TiFlash) {
tiflashInstance.Ports = append(tiflashInstance.Ports, s.HTTPPort)
}
ins = append(ins, tiflashInstance)
}
return ins
}
Expand Down Expand Up @@ -410,7 +414,7 @@ func checkTiFlashStorageConfig(config map[string]any) (bool, error) {
if !isMainStorageDefined {
for k := range config {
if strings.HasPrefix(k, "storage.latest") || strings.HasPrefix(k, "storage.raft") {
return false, fmt.Errorf("You must set '%s' before setting '%s', please check the tiflash configuration in your yaml file", TiFlashStorageKeyMainDirs, k)
return false, fmt.Errorf("you must set '%s' before setting '%s', please check the tiflash configuration in your yaml file", TiFlashStorageKeyMainDirs, k)
}
}
}
Expand Down Expand Up @@ -652,7 +656,7 @@ server_configs:

enableTLS := i.topo.(*Specification).GlobalOptions.TLSEnabled
// set TLS configs
spec.LearnerConfig, err = i.setTLSConfigWithTiFlashLearner(ctx, enableTLS, spec.LearnerConfig, paths)
spec.LearnerConfig, err = i.setTLSConfigWithTiFlashLearner(enableTLS, spec.LearnerConfig, paths)
if err != nil {
return nil, err
}
Expand All @@ -662,7 +666,7 @@ server_configs:
}

// setTLSConfigWithTiFlashLearner set TLS Config to support enable/disable TLS
func (i *TiFlashInstance) setTLSConfigWithTiFlashLearner(ctx context.Context, enableTLS bool, configs map[string]any, paths meta.DirPaths) (map[string]any, error) {
func (i *TiFlashInstance) setTLSConfigWithTiFlashLearner(enableTLS bool, configs map[string]any, paths meta.DirPaths) (map[string]any, error) {
if enableTLS {
if configs == nil {
configs = make(map[string]any)
Expand Down
Loading