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/clean: prompt list of paths to be delete before processing (part 2) #993

Merged
merged 3 commits into from
Dec 16, 2020
Merged

cluster/clean: prompt list of paths to be delete before processing (part 2) #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9243582
cluster/operation: reduce function stack a little
AstroProfundis Dec 15, 2020
a191867
cluster/clean: prompt list of file paths to be deleted before process
AstroProfundis Dec 15, 2020
4842c6f
cluster/clean: update variable naming
AstroProfundis Dec 16, 2020
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
60 changes: 57 additions & 3 deletions pkg/cluster/manager/cleanup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
package manager

import (
"fmt"
"path"
"strings"

"github.com/fatih/color"
"github.com/joomcode/errorx"
perrs "github.com/pingcap/errors"
Expand All @@ -22,6 +26,7 @@ import (
"github.com/pingcap/tiup/pkg/cluster/spec"
"github.com/pingcap/tiup/pkg/cluster/task"
"github.com/pingcap/tiup/pkg/logger/log"
"github.com/pingcap/tiup/pkg/set"
)

// CleanCluster cleans the cluster without destroying it
Expand All @@ -39,6 +44,44 @@ func (m *Manager) CleanCluster(name string, gOpt operator.Options, cleanOpt oper
return err
}

// calculate file paths to be deleted before the prompt
delFileMap := make(map[string]set.StringSet)
for _, com := range topo.ComponentsByStopOrder() {
instances := com.Instances()
retainDataRoles := set.NewStringSet(cleanOpt.RetainDataRoles...)
retainDataNodes := set.NewStringSet(cleanOpt.RetainDataNodes...)

for _, ins := range instances {
// Some data of instances will be retained
dataRetained := retainDataRoles.Exist(ins.ComponentName()) ||
retainDataNodes.Exist(ins.ID()) || retainDataNodes.Exist(ins.GetHost())

if dataRetained {
continue
}

dataPaths := set.NewStringSet()
logPaths := set.NewStringSet()

if cleanOpt.CleanupData && len(ins.DataDir()) > 0 {
for _, dataDir := range strings.Split(ins.DataDir(), ",") {
dataPaths.Insert(path.Join(dataDir, "*"))
}
}

if cleanOpt.CleanupLog && len(ins.LogDir()) > 0 {
for _, logDir := range strings.Split(ins.LogDir(), ",") {
logPaths.Insert(path.Join(logDir, "*.log"))
}
}

if delFileMap[ins.GetHost()] == nil {
delFileMap[ins.GetHost()] = set.NewStringSet()
}
delFileMap[ins.GetHost()].Join(logPaths).Join(dataPaths)
}
}

if !skipConfirm {
target := ""
switch {
Expand All @@ -49,14 +92,25 @@ func (m *Manager) CleanCluster(name string, gOpt operator.Options, cleanOpt oper
case cleanOpt.CleanupLog:
target = "log"
}

// build file list string
delFileList := ""
for host, fileList := range delFileMap {
delFileList += fmt.Sprintf("\n%s:", color.CyanString(host))
for _, dfp := range fileList.Slice() {
delFileList += fmt.Sprintf("\n %s", dfp)
}
}

if err := cliutil.PromptForConfirmOrAbortError(
"This operation will clean %s %s cluster %s's %s.\nNodes will be ignored: %s\nRoles will be ignored: %s\nDo you want to continue? [y/N]:",
"This operation will clean %s %s cluster %s's %s.\nNodes will be ignored: %s\nRoles will be ignored: %s\nFiles to be deleted are: %s\nDo you want to continue? [y/N]:",
m.sysName,
color.HiYellowString(base.Version),
color.HiYellowString(name),
target,
cleanOpt.RetainDataNodes,
cleanOpt.RetainDataRoles); err != nil {
cleanOpt.RetainDataRoles,
delFileList); err != nil {
return err
}
log.Infof("Cleanup cluster...")
Expand All @@ -67,7 +121,7 @@ func (m *Manager) CleanCluster(name string, gOpt operator.Options, cleanOpt oper
return operator.Stop(ctx, topo, operator.Options{}, tlsCfg)
}).
Func("CleanupCluster", func(ctx *task.Context) error {
return operator.Cleanup(ctx, topo, cleanOpt)
return operator.CleanupComponent(ctx, delFileMap)
}).
Build()

Expand Down
64 changes: 7 additions & 57 deletions pkg/cluster/operation/destroy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"crypto/tls"
"fmt"
"io/ioutil"
"path"
"path/filepath"
"strconv"
"strings"
Expand All @@ -34,24 +33,6 @@ import (
"github.com/pingcap/tiup/pkg/set"
)

// Cleanup the cluster
func Cleanup(
getter ExecutorGetter,
cluster spec.Topology,
options Options,
) error {
coms := cluster.ComponentsByStopOrder()

for _, com := range coms {
insts := com.Instances()
if err := CleanupComponent(getter, insts, cluster, options); err != nil {
return errors.Annotatef(err, "failed to cleanup %s", com.Name())
}
}

return nil
}

// Destroy the cluster.
func Destroy(
getter ExecutorGetter,
Expand Down Expand Up @@ -291,41 +272,11 @@ func DestroyMonitored(getter ExecutorGetter, inst spec.Instance, options *spec.M
}

// CleanupComponent cleanup the instances
func CleanupComponent(getter ExecutorGetter, instances []spec.Instance, cls spec.Topology, options Options) error {
retainDataRoles := set.NewStringSet(options.RetainDataRoles...)
retainDataNodes := set.NewStringSet(options.RetainDataNodes...)

for _, ins := range instances {
// Some data of instances will be retained
dataRetained := retainDataRoles.Exist(ins.ComponentName()) ||
retainDataNodes.Exist(ins.ID()) || retainDataNodes.Exist(ins.GetHost())

if dataRetained {
continue
}

e := getter.Get(ins.GetHost())
log.Infof("Cleanup instance %s", ins.GetHost())

delFiles := set.NewStringSet()
dataPaths := set.NewStringSet()
logPaths := set.NewStringSet()

if options.CleanupData && len(ins.DataDir()) > 0 {
for _, dataDir := range strings.Split(ins.DataDir(), ",") {
dataPaths.Insert(path.Join(dataDir, "*"))
}
}

if options.CleanupLog && len(ins.LogDir()) > 0 {
for _, logDir := range strings.Split(ins.LogDir(), ",") {
logPaths.Insert(path.Join(logDir, "*.log"))
}
}

delFiles.Join(logPaths).Join(dataPaths)

log.Debugf("Deleting paths on %s: %s", ins.GetHost(), strings.Join(delFiles.Slice(), " "))
func CleanupComponent(getter ExecutorGetter, delFileMaps map[string]set.StringSet) error {
for host, delFiles := range delFileMaps {
e := getter.Get(host)
log.Infof("Cleanup instance %s", host)
log.Debugf("Deleting paths on %s: %s", host, strings.Join(delFiles.Slice(), " "))
c := module.ShellModuleConfig{
Command: fmt.Sprintf("rm -rf %s;", strings.Join(delFiles.Slice(), " ")),
Sudo: true, // the .service files are in a directory owned by root
Expand All @@ -343,11 +294,10 @@ func CleanupComponent(getter ExecutorGetter, instances []spec.Instance, cls spec
}

if err != nil {
return errors.Annotatef(err, "failed to cleanup: %s", ins.GetHost())
return errors.Annotatef(err, "failed to cleanup: %s", host)
}

log.Infof("Cleanup %s success", ins.GetHost())
log.Infof("- Clanup %s files: %v", ins.ComponentName(), delFiles.Slice())
log.Infof("Cleanup %s success", host)
}

return nil
Expand Down