@@ -127,7 +127,8 @@ func (r *ReconcileMysqlBackup) Reconcile(ctx context.Context, request reconcile.
127
127
if errors .IsNotFound (err ) {
128
128
// Object not found, return. Created objects are automatically garbage collected.
129
129
// For additional cleanup logic use finalizers.
130
- return reconcile.Result {}, r .unregisterCluster (request .NamespacedName )
130
+ r .unregisterCluster (request .NamespacedName )
131
+ return reconcile.Result {}, nil
131
132
}
132
133
// Error reading the object - requeue the request.
133
134
return reconcile.Result {}, err
@@ -145,11 +146,12 @@ func (r *ReconcileMysqlBackup) Reconcile(ctx context.Context, request reconcile.
145
146
146
147
log .V (1 ).Info ("register cluster in cronjob" , "key" , cluster , "schedule" , schedule )
147
148
148
- return reconcile.Result {}, r .updateClusterSchedule (cluster , schedule )
149
+ r .updateClusterSchedule (cluster , schedule )
150
+ return reconcile.Result {}, nil
149
151
}
150
152
151
153
// 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 ) {
153
155
r .lockJobRegister .Lock ()
154
156
defer r .lockJobRegister .Unlock ()
155
157
@@ -183,7 +185,7 @@ func (r *ReconcileMysqlBackup) updateClusterSchedule(cluster *mysqlv1alpha1.Mysq
183
185
}
184
186
185
187
// nothing to change for this cluster, return
186
- return nil
188
+ return
187
189
}
188
190
}
189
191
@@ -194,11 +196,9 @@ func (r *ReconcileMysqlBackup) updateClusterSchedule(cluster *mysqlv1alpha1.Mysq
194
196
BackupScheduleJobsHistoryLimit : cluster .Spec .BackupScheduleJobsHistoryLimit ,
195
197
BackupRemoteDeletePolicy : cluster .Spec .BackupRemoteDeletePolicy ,
196
198
})
197
-
198
- return nil
199
199
}
200
200
201
- func (r * ReconcileMysqlBackup ) unregisterCluster (clusterKey types.NamespacedName ) error {
201
+ func (r * ReconcileMysqlBackup ) unregisterCluster (clusterKey types.NamespacedName ) {
202
202
r .lockJobRegister .Lock ()
203
203
defer r .lockJobRegister .Unlock ()
204
204
@@ -208,8 +208,6 @@ func (r *ReconcileMysqlBackup) unregisterCluster(clusterKey types.NamespacedName
208
208
r .cron .Remove (entry .ID )
209
209
}
210
210
}
211
-
212
- return nil
213
211
}
214
212
215
213
func addBackupFieldIndexers (mgr manager.Manager ) error {
0 commit comments