feat: support cluster upgrade from cd/cv to cmpd/cmpv (#8584)

apecloud · Dec 5, 2024 · 9ffd0c3 · 9ffd0c3
1 parent de1888a
commit 9ffd0c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/controllers/apps/transformer_cluster_component.go b/controllers/apps/transformer_cluster_component.go
@@ -230,6 +230,7 @@ func copyAndMergeComponent(oldCompObj, newCompObj *appsv1alpha1.Component) *apps
 	compObjCopy.Spec.OfflineInstances = compProto.Spec.OfflineInstances
 	compObjCopy.Spec.RuntimeClassName = compProto.Spec.RuntimeClassName
 	compObjCopy.Spec.DisableExporter = compProto.Spec.DisableExporter
+	compObjCopy.Spec.SystemAccounts = compProto.Spec.SystemAccounts
 	compObjCopy.Spec.Stop = compProto.Spec.Stop
 
 	if reflect.DeepEqual(oldCompObj.Annotations, compObjCopy.Annotations) &&

diff --git a/pkg/lorry/engines/mysql/manager.go b/pkg/lorry/engines/mysql/manager.go
@@ -119,8 +119,11 @@ func (mgr *Manager) IsDBStartupReady() bool {
 	// test if db is ready to connect or not
 	err := mgr.DB.PingContext(ctx)
 	if err != nil {
-		mgr.Logger.Info("DB is not ready", "error", err)
-		return false
+		var driverErr *mysql.MySQLError
+		if !errors.As(err, &driverErr) {
+			mgr.Logger.Info("DB is not ready", "error", err)
+			return false
+		}
 	}
 
 	mgr.DBStartupReady = true