+
incrementalBackupEnabled
bool
diff --git a/pkg/dataprotection/backup/scheduler.go b/pkg/dataprotection/backup/scheduler.go
index a4eea041847..c9f426178d1 100644
--- a/pkg/dataprotection/backup/scheduler.go
+++ b/pkg/dataprotection/backup/scheduler.go
@@ -365,18 +365,42 @@ type backupReconfigureRef struct {
type parameterPairs map[string][]appsv1alpha1.ParameterPair
+func (s *Scheduler) convertLastAppliedConfigs(continuousMethod string) {
+ if _, ok := s.BackupSchedule.Annotations[dptypes.LastAppliedConfigsAnnotationKey]; ok {
+ return
+ }
+ lastAppliedConfig := s.BackupSchedule.Annotations[constant.LastAppliedConfigAnnotationKey]
+ if lastAppliedConfig == "" {
+ return
+ }
+ lastAppliedConfigMap := map[string]string{}
+ lastAppliedConfigMap[continuousMethod] = lastAppliedConfig
+ str, _ := json.Marshal(lastAppliedConfigMap)
+ s.BackupSchedule.Annotations[dptypes.LastAppliedConfigsAnnotationKey] = string(str)
+}
+
+func (s *Scheduler) getLastAppliedConfigsMap() (map[string]string, error) {
+ resMap := map[string]string{}
+ if err := json.Unmarshal([]byte(s.BackupSchedule.Annotations[dptypes.LastAppliedConfigsAnnotationKey]), &resMap); err != nil {
+ return nil, err
+ }
+ return resMap, nil
+}
+
func (s *Scheduler) reconfigure(schedulePolicy *dpv1alpha1.SchedulePolicy) error {
reCfgRef := s.BackupSchedule.Annotations[dptypes.ReconfigureRefAnnotationKey]
if reCfgRef == "" {
return nil
}
+ // convert deprecated "lastAppliedConfig "to "lastAppliedConfigs"
+ s.convertLastAppliedConfigs(schedulePolicy.BackupMethod)
configRef := backupReconfigureRef{}
if err := json.Unmarshal([]byte(reCfgRef), &configRef); err != nil {
return err
}
enable := boolptr.IsSetToTrue(schedulePolicy.Enabled)
- if s.BackupSchedule.Annotations[constant.LastAppliedConfigAnnotationKey] == "" && !enable {
+ if s.BackupSchedule.Annotations[dptypes.LastAppliedConfigsAnnotationKey] == "" && !enable {
// disable in the first policy created, no need reconfigure because default configs had been set.
return nil
}
@@ -392,9 +416,13 @@ func (s *Scheduler) reconfigure(schedulePolicy *dpv1alpha1.SchedulePolicy) error
// skip reconfigure if not found parameters.
return nil
}
+ lastAppliedConfigsMap, err := s.getLastAppliedConfigsMap()
+ if err != nil {
+ return err
+ }
updateParameterPairsBytes, _ := json.Marshal(parameters)
updateParameterPairs := string(updateParameterPairsBytes)
- if updateParameterPairs == s.BackupSchedule.Annotations[constant.LastAppliedConfigAnnotationKey] {
+ if updateParameterPairs == lastAppliedConfigsMap[schedulePolicy.BackupMethod] {
// reconcile the config job if finished
return s.reconcileReconfigure(s.BackupSchedule)
}
@@ -450,7 +478,10 @@ func (s *Scheduler) reconfigure(schedulePolicy *dpv1alpha1.SchedulePolicy) error
if s.BackupSchedule.Annotations == nil {
s.BackupSchedule.Annotations = map[string]string{}
}
- s.BackupSchedule.Annotations[constant.LastAppliedConfigAnnotationKey] = updateParameterPairs
+ lastAppliedConfigsMap[schedulePolicy.BackupMethod] = updateParameterPairs
+ updateParameterPairsBytes, _ = json.Marshal(lastAppliedConfigsMap)
+ s.BackupSchedule.Annotations[dptypes.LastAppliedConfigsAnnotationKey] = string(updateParameterPairsBytes)
+ delete(s.BackupSchedule.Annotations, constant.LastAppliedConfigAnnotationKey)
if err := s.Client.Patch(s.Ctx, s.BackupSchedule, patch); err != nil {
return err
}
diff --git a/pkg/dataprotection/restore/utils.go b/pkg/dataprotection/restore/utils.go
index bea8d944095..7cb74ffd43a 100644
--- a/pkg/dataprotection/restore/utils.go
+++ b/pkg/dataprotection/restore/utils.go
@@ -293,10 +293,10 @@ func FormatRestoreTimeAndValidate(restoreTimeStr string, continuousBackup *dpv1a
restoreTimeStr = restoreTime.UTC().Format(time.RFC3339)
// TODO: check with Recoverable time
- if continuousBackup.Status.TimeRange == nil || continuousBackup.Status.TimeRange.Start.IsZero() || continuousBackup.Status.TimeRange.End.IsZero() {
+ if continuousBackup.Status.TimeRange == nil || continuousBackup.GetStartTime().IsZero() || continuousBackup.GetEndTime().IsZero() {
return restoreTimeStr, fmt.Errorf("invalid timeRange of the backup")
}
- if !isTimeInRange(restoreTime, continuousBackup.Status.TimeRange.Start.Time, continuousBackup.Status.TimeRange.End.Time) {
+ if !isTimeInRange(restoreTime, continuousBackup.GetStartTime().Time, continuousBackup.GetEndTime().Time) {
return restoreTimeStr, fmt.Errorf("restore-to-time is out of time range, you can view the recoverable time: \n"+
"\tkbcli cluster describe %s -n %s", continuousBackup.Labels[constant.AppInstanceLabelKey], continuousBackup.Namespace)
}
diff --git a/pkg/dataprotection/types/constant.go b/pkg/dataprotection/types/constant.go
index 558bba53a84..1b74f18bda6 100644
--- a/pkg/dataprotection/types/constant.go
+++ b/pkg/dataprotection/types/constant.go
@@ -62,6 +62,8 @@ const (
ConnectionPasswordAnnotationKey = "dataprotection.kubeblocks.io/connection-password"
// GeminiAcknowledgedAnnotationKey indicates whether Gemini has acknowledged the backup.
GeminiAcknowledgedAnnotationKey = "dataprotection.kubeblocks.io/gemini-acknowledged"
+ // LastAppliedConfigsAnnotationKey specifies last applied reconfigurations.
+ LastAppliedConfigsAnnotationKey = "dataprotection.kubeblocks.io/last-applied-configurations"
)
// label keys
|