Skip to content

Commit 3e48d02

Browse files
committed
Fix linting issues
1 parent 62e836f commit 3e48d02

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

pkg/controller/mysqlbackupcron/mysqlbackupcron_controller.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ func (r *ReconcileMysqlBackup) Reconcile(ctx context.Context, request reconcile.
127127
if errors.IsNotFound(err) {
128128
// Object not found, return. Created objects are automatically garbage collected.
129129
// For additional cleanup logic use finalizers.
130-
return reconcile.Result{}, r.unregisterCluster(request.NamespacedName)
130+
r.unregisterCluster(request.NamespacedName)
131+
return reconcile.Result{}, nil
131132
}
132133
// Error reading the object - requeue the request.
133134
return reconcile.Result{}, err
@@ -145,11 +146,12 @@ func (r *ReconcileMysqlBackup) Reconcile(ctx context.Context, request reconcile.
145146

146147
log.V(1).Info("register cluster in cronjob", "key", cluster, "schedule", schedule)
147148

148-
return reconcile.Result{}, r.updateClusterSchedule(cluster, schedule)
149+
r.updateClusterSchedule(cluster, schedule)
150+
return reconcile.Result{}, nil
149151
}
150152

151153
// updateClusterSchedule creates/updates a cron job for specified cluster.
152-
func (r *ReconcileMysqlBackup) updateClusterSchedule(cluster *mysqlv1alpha1.MysqlCluster, schedule cron.Schedule) error {
154+
func (r *ReconcileMysqlBackup) updateClusterSchedule(cluster *mysqlv1alpha1.MysqlCluster, schedule cron.Schedule) {
153155
r.lockJobRegister.Lock()
154156
defer r.lockJobRegister.Unlock()
155157

@@ -183,7 +185,7 @@ func (r *ReconcileMysqlBackup) updateClusterSchedule(cluster *mysqlv1alpha1.Mysq
183185
}
184186

185187
// nothing to change for this cluster, return
186-
return nil
188+
return
187189
}
188190
}
189191

@@ -194,11 +196,9 @@ func (r *ReconcileMysqlBackup) updateClusterSchedule(cluster *mysqlv1alpha1.Mysq
194196
BackupScheduleJobsHistoryLimit: cluster.Spec.BackupScheduleJobsHistoryLimit,
195197
BackupRemoteDeletePolicy: cluster.Spec.BackupRemoteDeletePolicy,
196198
})
197-
198-
return nil
199199
}
200200

201-
func (r *ReconcileMysqlBackup) unregisterCluster(clusterKey types.NamespacedName) error {
201+
func (r *ReconcileMysqlBackup) unregisterCluster(clusterKey types.NamespacedName) {
202202
r.lockJobRegister.Lock()
203203
defer r.lockJobRegister.Unlock()
204204

@@ -208,8 +208,6 @@ func (r *ReconcileMysqlBackup) unregisterCluster(clusterKey types.NamespacedName
208208
r.cron.Remove(entry.ID)
209209
}
210210
}
211-
212-
return nil
213211
}
214212

215213
func addBackupFieldIndexers(mgr manager.Manager) error {

0 commit comments

Comments
 (0)