cluster: handle patched flags on scale-out and upgrade

pingcap · Feb 24, 2021 · 224ff6d · 224ff6d
1 parent 196c6be
commit 224ff6d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/pkg/cluster/manager/manager.go b/pkg/cluster/manager/manager.go
@@ -92,7 +92,7 @@ func (m *Manager) confirmTopology(name, version string, topo spec.Topology, patc
 
 	topo.IterInstance(func(instance spec.Instance) {
 		comp := instance.ComponentName()
-		if patchedRoles.Exist(comp) {
+		if patchedRoles.Exist(comp) || instance.IsPatched() {
 			comp += " (patched)"
 		}
 		clusterTable = append(clusterTable, []string{

diff --git a/pkg/cluster/manager/patch.go b/pkg/cluster/manager/patch.go
@@ -100,11 +100,7 @@ func (m *Manager) Patch(name string, packagePath string, opt operator.Options, o
 			}
 		}
 	})
-	if err := m.specManager.SaveMeta(name, metadata); err != nil {
-		return perrs.Trace(err)
-	}
-
-	return nil
+	return m.specManager.SaveMeta(name, metadata)
 }
 
 func checkPackage(bindVersion spec.BindVersion, specManager *spec.SpecManager, name, comp, nodeOS, arch, packagePath string) error {

diff --git a/pkg/cluster/manager/scale_out.go b/pkg/cluster/manager/scale_out.go
@@ -116,6 +116,7 @@ func (m *Manager) ScaleOut(
 	newPart.IterInstance(func(instance spec.Instance) {
 		if utils.IsExist(m.specManager.Path(name, spec.PatchDirName, instance.ComponentName()+".tar.gz")) {
 			patchedComponents.Insert(instance.ComponentName())
+			instance.SetPatched(true)
 		}
 	})
 

diff --git a/pkg/cluster/manager/upgrade.go b/pkg/cluster/manager/upgrade.go
@@ -182,14 +182,20 @@ func (m *Manager) Upgrade(name string, clusterVersion string, opt operator.Optio
 		return perrs.Trace(err)
 	}
 
-	metadata.SetVersion(clusterVersion)
-
-	if err := m.specManager.SaveMeta(name, metadata); err != nil {
+	// clear patched packages and tags
+	if err := os.RemoveAll(m.specManager.Path(name, "patch")); err != nil {
 		return perrs.Trace(err)
 	}
+	topo.IterInstance(func(ins spec.Instance) {
+		if ins.IsPatched() {
+			ins.SetPatched(false)
+		}
+	})
 
-	if err := os.RemoveAll(m.specManager.Path(name, "patch")); err != nil {
-		return perrs.Trace(err)
+	metadata.SetVersion(clusterVersion)
+
+	if err := m.specManager.SaveMeta(name, metadata); err != nil {
+		return err
 	}
 
 	log.Infof("Upgraded cluster `%s` successfully", name)