rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-01 15:06:23 +00:00
Code Issues Releases Wiki Activity

Fix remove performance issues

Browse Source
This commit is contained in:
moelsayed
2018-10-24 01:38:00 +02:00
committed by Alena Prokharchyk
parent b324973081
commit dd4d19a945
4 changed files with 122 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
cluster/remove.go
View File

@@ -6,7 +6,9 @@ import (
"github.com/rancher/rke/hosts"
"github.com/rancher/rke/pki"
"github.com/rancher/rke/services"
"github.com/rancher/rke/util"
"github.com/rancher/types/apis/management.cattle.io/v3"
"golang.org/x/sync/errgroup"
)
func (c *Cluster) ClusterRemove(ctx context.Context) error {
@@ -18,15 +20,16 @@ func (c *Cluster) ClusterRemove(ctx context.Context) error {
if err := services.RemoveWorkerPlane(ctx, c.WorkerHosts, true); err != nil {
return err
}
// Remove Contol Plane
if err := services.RemoveControlPlane(ctx, c.ControlPlaneHosts, true); err != nil {
return err
}
// Remove Etcd Plane
if err := services.RemoveEtcdPlane(ctx, c.EtcdHosts, true); err != nil {
return err
if !externalEtcd {
if err := services.RemoveEtcdPlane(ctx, c.EtcdHosts, true); err != nil {
return err
}
}
// Clean up all hosts
@@ -39,15 +42,23 @@ func (c *Cluster) ClusterRemove(ctx context.Context) error {
}
func cleanUpHosts(ctx context.Context, cpHosts, workerHosts, etcdHosts []*hosts.Host, cleanerImage string, prsMap map[string]v3.PrivateRegistry, externalEtcd bool) error {
allHosts := []*hosts.Host{}
allHosts = append(allHosts, cpHosts...)
allHosts = append(allHosts, workerHosts...)
allHosts = append(allHosts, etcdHosts...)
for _, host := range allHosts {
if err := host.CleanUpAll(ctx, cleanerImage, prsMap, externalEtcd); err != nil {
return err
}
uniqueHosts := hosts.GetUniqueHostList(cpHosts, workerHosts, etcdHosts)
var errgrp errgroup.Group
hostsQueue := util.GetObjectQueue(uniqueHosts)
for w := 0; w < WorkerThreads; w++ {
errgrp.Go(func() error {
var errList []error
for host := range hostsQueue {
runHost := host.(*hosts.Host)
if err := runHost.CleanUpAll(ctx, cleanerImage, prsMap, externalEtcd); err != nil {
errList = append(errList, err)
}
}
return util.ErrList(errList)
})
}
return nil
return errgrp.Wait()
}