fix(tidb): fix missing topology when adopting (#6509)

Author: liubog2008

pkg/adoption/manager.go

@@ -143,7 +143,7 @@ func (m *manager) register(db *v1alpha1.TiDB) {
 		}
 		m.standby.add(hash, key)
 
-		m.logger.Info("register standby instance", "instance", key, "hash", hash)
+		m.logger.Info("register standby instance", "instance", key, "hash", hash, "rv", db.GetResourceVersion())
 
 		return
 	}
@@ -161,6 +161,8 @@ func (m *manager) register(db *v1alpha1.TiDB) {
 
 	item.hash = nHash
 	item.instance = db.DeepCopy()
+
+	m.logger.Info("update standby instance", "instance", key, "hash", nHash, "rv", db.GetResourceVersion())
 	// - applied and uid is not changed
 	//   - instance has been adopted and mode is changed to normal.
 	//   - just wait until the instance is synced.
@@ -199,10 +201,16 @@ func (m *manager) Adopt(dbg *v1alpha1.TiDBGroup, index int) (*v1alpha1.TiDB, Unl
 	adopting := m.adopting.list(key)
 	if index < len(adopting) {
 		inKey := adopting[index]
+		// should always exist
+		item := m.keyToInstance[inKey]
 
-		m.logger.Info("return adopting standby instance", "group", key, "instance", inKey, "index", index)
+		m.logger.Info("return adopting standby instance",
+			"group", key,
+			"instance", inKey,
+			"index", index,
+			"rv", item.instance.GetResourceVersion())
 
-		return m.keyToInstance[inKey].instance.DeepCopy(), DoNothing
+		return item.instance.DeepCopy(), DoNothing
 	}
 
 	hash := hashTiDBGroup(dbg)
@@ -217,7 +225,13 @@ func (m *manager) Adopt(dbg *v1alpha1.TiDBGroup, index int) (*v1alpha1.TiDB, Unl
 		}
 		m.lock(dbg, item)
 
-		m.logger.Info("adopting standby instance", "group", key, "instance", k, "hash", item.hash, "index", index)
+		m.logger.Info("adopting standby instance",
+			"group", key,
+			"instance", k,
+			"hash", item.hash,
+			"index", index,
+			"rv", item.instance.GetResourceVersion(),
+		)
 
 		return item.instance.DeepCopy(), m.unlockFunc(item)
 	}

pkg/controllers/tidbgroup/tasks/updater.go

@@ -180,6 +180,9 @@ func (f *factory) Adopt() (*runtime.TiDB, updater.UnlockFunc, bool) {
 			Name:            standby.Name,
 			ResourceVersion: standby.ResourceVersion,
 		},
+		Spec: v1alpha1.TiDBSpec{
+			Topology: standby.Spec.Topology,
+		},
 	}
 
 	tidb = f.updateTiDB(tidb)
@@ -189,18 +192,18 @@ func (f *factory) Adopt() (*runtime.TiDB, updater.UnlockFunc, bool) {
 
 func (f *factory) updateTiDB(tidb *v1alpha1.TiDB) *v1alpha1.TiDB {
 	spec := f.dbg.Spec.Template.Spec.DeepCopy()
+
 	tidb.Labels = coreutil.InstanceLabels[scope.TiDBGroup](f.dbg, f.rev)
 	tidb.Annotations = coreutil.InstanceAnnotations[scope.TiDBGroup](f.dbg)
 	tidb.Finalizers = []string{metav1alpha1.Finalizer}
 	tidb.OwnerReferences = []metav1.OwnerReference{
 		*metav1.NewControllerRef(f.dbg, v1alpha1.SchemeGroupVersion.WithKind("TiDBGroup")),
 	}
-	tidb.Spec = v1alpha1.TiDBSpec{
-		Cluster:          f.dbg.Spec.Cluster,
-		Features:         f.dbg.Spec.Features,
-		Subdomain:        HeadlessServiceName(f.dbg.Name), // same as headless service
-		TiDBTemplateSpec: *spec,
-	}
+
+	tidb.Spec.Cluster = f.dbg.Spec.Cluster
+	tidb.Spec.Features = f.dbg.Spec.Features
+	tidb.Spec.Subdomain = HeadlessServiceName(f.dbg.Name) // same as headless service
+	tidb.Spec.TiDBTemplateSpec = *spec
 
 	if f.fg.Enabled(metav1alpha1.ClusterSubdomain) {
 		tidb.Spec.Subdomain = coreutil.ClusterSubdomain(f.dbg.Spec.Cluster.Name)