VladPolskiy/mariadb-operator
1
0
Fork 0
mirror of https://github.com/mariadb-operator/mariadb-operator.git synced 2025-07-31 21:08:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Unlock primary during switchiver using defer"

Browse Source 
This reverts commit 262dcaf11e.
This commit is contained in:
Martin Montes
2023-12-22 08:54:07 +01:00
parent 992600bb76
commit 8cfd507fb3
2 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/controller/replication/switchover.go
View File

@ -44,13 +44,11 @@ func (r *ReplicationReconciler) reconcileSwitchover(ctx context.Context, req *re
return fmt.Errorf("error patching MariaDB status: %v", err)
}
err, close := r.lockPrimaryWithReadLock(ctx, req.mariadb, req.clientSet, logger)
if err != nil {
return fmt.Errorf("error locking primary: %v", err)
}
defer close()
phases := []switchoverPhase{
{
name: "Lock primary with read lock",
reconcile: r.lockPrimaryWithReadLock,
},
{
name: "Set read_only in primary",
reconcile: r.setPrimaryReadOnly,
@ -96,31 +94,23 @@ func (r *ReplicationReconciler) reconcileSwitchover(ctx context.Context, req *re
}
func (r *ReplicationReconciler) lockPrimaryWithReadLock(ctx context.Context, mariadb *mariadbv1alpha1.MariaDB,
clientSet *replicationClientSet, logger logr.Logger) (error, func()) {
noop := func() {}
clientSet *replicationClientSet, logger logr.Logger) error {
ready, err := r.currentPrimaryReady(ctx, mariadb)
if err != nil {
return fmt.Errorf("error getting current primary readiness: %v", err), noop
return fmt.Errorf("error getting current primary readiness: %v", err)
}
if !ready {
return nil, noop
return nil
}
client, err := clientSet.currentPrimaryClient(ctx)
if err != nil {
return fmt.Errorf("error getting current primary client: %v", err), noop
return fmt.Errorf("error getting current primary client: %v", err)
}
close := func() {
logger.Info("Unlocking primary")
r.recorder.Event(mariadb, corev1.EventTypeNormal, mariadbv1alpha1.ReasonReplicationPrimaryLock, "Unlocking primary")
if err := client.UnlockTables(ctx); err != nil {
logger.Error(err, "error unlocking primary")
}
}
logger.Info("Locking primary with read lock")
r.recorder.Event(mariadb, corev1.EventTypeNormal, mariadbv1alpha1.ReasonReplicationPrimaryLock,
"Locking primary with read lock")
return client.LockTablesWithReadLock(ctx), close
return client.LockTablesWithReadLock(ctx)
}
func (r *ReplicationReconciler) setPrimaryReadOnly(ctx context.Context, mariadb *mariadbv1alpha1.MariaDB,