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: fix can't skip confirmation of scale-out #1645

Merged
merged 6 commits into from
Dec 2, 2021
Merged

cluster: fix can't skip confirmation of scale-out #1645

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
404b1de
fix can't skip confirmation of scale-out
srstack Dec 1, 2021
4be0199
fix skip confirm
srstack Dec 1, 2021
4381689
Merge branch 'master' into issue-1640
srstack Dec 1, 2021
7550f30
perfect tips
srstack Dec 2, 2021
997973e
Merge branch 'issue-1640' of https://github.com/srstack/tiup into iss…
srstack Dec 2, 2021
930a426
Merge branch 'master' into issue-1640
AstroProfundis Dec 2, 2021
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
54 changes: 34 additions & 20 deletions pkg/cluster/manager/scale_out.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func (m *Manager) ScaleOut(
}

// check the scale out file lock is exist
err := checkScaleOutLock(m, name, opt)
err := checkScaleOutLock(m, name, opt, skipConfirm)
if err != nil {
return err
}
Expand Down Expand Up @@ -81,7 +81,7 @@ func (m *Manager) ScaleOut(
} else { // if stage2 is true, not need check topology or other
// check for the input topology to let user confirm if there're any
// global configs set
if err := checkForGlobalConfigs(topoFile); err != nil {
if err := checkForGlobalConfigs(topoFile, skipConfirm); err != nil {
return err
}

Expand Down Expand Up @@ -210,11 +210,11 @@ func (m *Manager) ScaleOut(
}

if opt.Stage1 {
log.Infof(color.YellowString(`The new instance is not started!
You need to execute 'tiup cluster scale-out %s --stage2' to start the new instance.`, name))
log.Infof(`The new instance is not started!
You need to execute '%s' to start the new instance.`, color.YellowString("tiup cluster scale-out %s --stage2", name))
}

log.Infof("Scaled cluster `%s` out successfully", name)
log.Infof("Scaled cluster `%s` out successfully", color.YellowString(name))

return nil
}
Expand All @@ -236,7 +236,7 @@ func validateNewTopo(topo spec.Topology) (err error) {

// checkForGlobalConfigs checks the input scale out topology to make sure users are aware
// of the global config fields in it will be ignored.
func checkForGlobalConfigs(topoFile string) error {
func checkForGlobalConfigs(topoFile string, skipConfirm bool) error {
yamlFile, err := spec.ReadYamlFile(topoFile)
if err != nil {
return err
Expand All @@ -247,27 +247,30 @@ func checkForGlobalConfigs(topoFile string) error {
return err
}

// user confirmed, skip checks

for k := range newPart {
switch k {
case "global",
"monitored",
"server_configs":
log.Warnf(color.YellowString(
`You have one or more of ["global", "monitored", "server_configs"] fields configured in
the scale out topology, but they will be ignored during the scaling out process.
If you want to use configs different from the existing cluster, cancel now and
set them in the specification fileds for each host.`))
if err := tui.PromptForConfirmOrAbortError("Do you want to continue? [y/N]: "); err != nil {
return err
log.Warnf(`You have one or more of %s fields configured in
the scale out topology, but they will be ignored during the scaling out process.
If you want to use configs different from the existing cluster, cancel now and
set them in the specification fileds for each host.`, color.YellowString(`["global", "monitored", "server_configs"]`))
if !skipConfirm {
if err := tui.PromptForConfirmOrAbortError("Do you want to continue? [y/N]: "); err != nil {
return err
}
}
return nil // user confirmed, skip further checks
return nil
}
}
return nil
}

// checkEnvWithStage1 check environment in scale-out stage 1
func checkScaleOutLock(m *Manager, name string, opt DeployOptions) error {
func checkScaleOutLock(m *Manager, name string, opt DeployOptions, skipConfirm bool) error {
locked, _ := m.specManager.IsScaleOutLocked(name)

if (!opt.Stage1 && !opt.Stage2) && locked {
Expand All @@ -278,18 +281,29 @@ func checkScaleOutLock(m *Manager, name string, opt DeployOptions) error {
if locked {
return m.specManager.ScaleOutLockedErr(name)
}
log.Warnf(color.YellowString(`The parameter '--stage1' is set, new instance will not be started
Please manually execute 'tiup cluster scale-out %s --stage2' to finish the process.`, name))
return tui.PromptForConfirmOrAbortError("Do you want to continue? [y/N]: ")

log.Warnf(`The parameter '%s' is set, new instance will not be started
Please manually execute '%s' to finish the process.`,
color.YellowString("--stage1"),
color.YellowString("tiup cluster scale-out %s --stage2", name))
if !skipConfirm {
if err := tui.PromptForConfirmOrAbortError("Do you want to continue? [y/N]: "); err != nil {
return err
}
}
}

if opt.Stage2 {
if !locked {
return fmt.Errorf("The scale-out file lock does not exist, please make sure to run 'tiup-cluster scale-out %s --stage1' first", name)
}

log.Warnf(color.YellowString(`The parameter '--stage2' is set, only start the new instances and reload configs.`))
return tui.PromptForConfirmOrAbortError("Do you want to continue? [y/N]: ")
log.Warnf(`The parameter '%s' is set, only start the new instances and reload configs.`, color.YellowString("--stage2"))
if !skipConfirm {
if err := tui.PromptForConfirmOrAbortError("Do you want to continue? [y/N]: "); err != nil {
return err
}
}
}

return nil
Expand Down