Skip to content

cluster: skip tiproxy download & copy #2366

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

Merged
ti-chi-bot merged 3 commits into from
Mar 6, 2024
Merged

cluster: skip tiproxy download & copy #2366

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98495ed
cluster: skip tiproxy download & copy
xhebox Jan 18, 2024
404a554
trigger test
xhebox Jan 22, 2024
588189e
Merge branch 'master' into fix_2
ti-chi-bot[bot] Mar 6, 2024
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
17 changes: 12 additions & 5 deletions pkg/cluster/manager/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"github.com/pingcap/tiup/pkg/environment"
"github.com/pingcap/tiup/pkg/meta"
"github.com/pingcap/tiup/pkg/repository"
"github.com/pingcap/tiup/pkg/set"
"github.com/pingcap/tiup/pkg/tui"
"github.com/pingcap/tiup/pkg/utils"
"golang.org/x/mod/semver"
Expand Down Expand Up @@ -88,21 +89,25 @@ func (m *Manager) Upgrade(name string, clusterVersion string, componentVersions
}

compVersionMsg := ""
for _, comp := range topo.ComponentsByUpdateOrder(base.Version) {
restartComponents := []string{}
components := topo.ComponentsByUpdateOrder(base.Version)
for _, comp := range components {
// if component version is not specified, use the cluster version or latest("")
oldver := comp.CalculateVersion(base.Version)
version := componentVersions[comp.Name()]
if version != "" {
comp.SetVersion(version)
}
calver := comp.CalculateVersion(clusterVersion)
if comp.Role() != spec.ComponentTiProxy || calver != oldver {
opt.Roles = append(opt.Roles, comp.Role())
if comp.Name() != spec.ComponentTiProxy || calver != oldver {
restartComponents = append(restartComponents, comp.Name(), comp.Role())
if len(comp.Instances()) > 0 {
compVersionMsg += fmt.Sprintf("\nwill upgrade and restart component \"%19s\" to \"%s\",", comp.Name(), calver)
}
}
}
components = operator.FilterComponent(components, set.NewStringSet(restartComponents...))

monitoredOptions := topo.GetMonitoredOptions()
if monitoredOptions != nil {
if componentVersions[spec.ComponentBlackboxExporter] != "" {
Expand Down Expand Up @@ -131,7 +136,7 @@ This operation will upgrade %s %s cluster %s to %s:%s`,
}

hasImported := false
for _, comp := range topo.ComponentsByUpdateOrder(base.Version) {
for _, comp := range components {
compName := comp.Name()
version := comp.CalculateVersion(clusterVersion)

Expand Down Expand Up @@ -311,7 +316,9 @@ This operation will upgrade %s %s cluster %s to %s:%s`,
if offline {
return nil
}
return operator.Upgrade(ctx, topo, opt, tlsCfg, base.Version, clusterVersion)
nopt := opt
nopt.Roles = restartComponents
return operator.Upgrade(ctx, topo, nopt, tlsCfg, base.Version, clusterVersion)
}).
Build()

Expand Down