jandre/formolcli
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases 1 Wiki Activity

renamed BackupState into SessionState so it can be used for the restore as well

Browse Source 
renamed BackupState into SessionState so it can be used for the restore as well
This commit is contained in:
jandre 2021-02-16 21:46:29 +01:00
parent a8faed3306
commit 93710e9341
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/backupsession/root.go
View File

@ -49,17 +49,20 @@ func init() {
} }
} }
func BackupSessionUpdateStatus(state formolv1alpha1.BackupState, snapshotId string, duration time.Duration) error { func BackupSessionUpdateStatus(state formolv1alpha1.SessionState, snapshotId string, duration time.Duration) error {
log := logger.WithName("BackupSessionUpdateStatus") log := logger.WithName("BackupSessionUpdateStatus")
targetName := os.Getenv("TARGET_NAME") targetName := os.Getenv("TARGET_NAME")
backupSession := &formolv1alpha1.BackupSession{} backupSession := &formolv1alpha1.BackupSession{}
cl.Get(context.Background(), client.ObjectKey{ if err := cl.Get(context.Background(), client.ObjectKey{
Namespace: os.Getenv("BACKUPSESSION_NAMESPACE"), Namespace: os.Getenv("BACKUPSESSION_NAMESPACE"),
Name: os.Getenv("BACKUPSESSION_NAME"), Name: os.Getenv("BACKUPSESSION_NAME"),
}, backupSession) }, backupSession); err != nil {
log.Error(err, "unable to get backupsession", "BACKUPSESSION_NAME", os.Getenv("BACKUPSESSION_NAME"), "BACKUPSESSION_NAMESPACE", os.Getenv("BACKUPSESSION_NAMESPACE"))
return err
}
for i, target := range backupSession.Status.Targets { for i, target := range backupSession.Status.Targets {
if target.Name == targetName { if target.Name == targetName {
backupSession.Status.Targets[i].BackupState = state backupSession.Status.Targets[i].SessionState = state
backupSession.Status.Targets[i].SnapshotId = snapshotId backupSession.Status.Targets[i].SnapshotId = snapshotId
backupSession.Status.Targets[i].Duration = &metav1.Duration{Duration: duration} backupSession.Status.Targets[i].Duration = &metav1.Duration{Duration: duration}
} }

9
pkg/controllers/backupsession_controller.go
View File

@ -51,7 +51,7 @@ func (r *BackupSessionReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
for i, status := range backupSession.Status.Targets { for i, status := range backupSession.Status.Targets {
if status.Name == target.Name { if status.Name == target.Name {
log.V(0).Info("It's for us!", "target", target) log.V(0).Info("It's for us!", "target", target)
switch status.BackupState { switch status.SessionState {
case formolv1alpha1.New: case formolv1alpha1.New:
// TODO: Run beforeBackup // TODO: Run beforeBackup
log.V(0).Info("New session, run the beforeBackup hooks if any") log.V(0).Info("New session, run the beforeBackup hooks if any")
@ -59,7 +59,7 @@ func (r *BackupSessionReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
if err := formolcliutils.RunBeforeBackup(target); err != nil { if err := formolcliutils.RunBeforeBackup(target); err != nil {
result = formolv1alpha1.Failure result = formolv1alpha1.Failure
} }
backupSession.Status.Targets[i].BackupState = result backupSession.Status.Targets[i].SessionState = result
log.V(1).Info("current backupSession status", "status", backupSession.Status) log.V(1).Info("current backupSession status", "status", backupSession.Status)
if err := r.Status().Update(ctx, backupSession); err != nil { if err := r.Status().Update(ctx, backupSession); err != nil {
log.Error(err, "unable to update backupsession status") log.Error(err, "unable to update backupsession status")
@ -78,7 +78,7 @@ func (r *BackupSessionReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
backupSession.Status.Targets[i].SnapshotId = snapshotId backupSession.Status.Targets[i].SnapshotId = snapshotId
backupSession.Status.Targets[i].Duration = &metav1.Duration{Duration: duration} backupSession.Status.Targets[i].Duration = &metav1.Duration{Duration: duration}
} }
backupSession.Status.Targets[i].BackupState = result backupSession.Status.Targets[i].SessionState = result
log.V(1).Info("current backupSession status", "status", backupSession.Status) log.V(1).Info("current backupSession status", "status", backupSession.Status)
if err := r.Status().Update(ctx, backupSession); err != nil { if err := r.Status().Update(ctx, backupSession); err != nil {
log.Error(err, "unable to update backupsession status") log.Error(err, "unable to update backupsession status")
@ -100,10 +100,9 @@ func (r *BackupSessionReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
func (r *BackupSessionReconciler) SetupWithManager(mgr ctrl.Manager) error { func (r *BackupSessionReconciler) SetupWithManager(mgr ctrl.Manager) error {
return ctrl.NewControllerManagedBy(mgr). return ctrl.NewControllerManagedBy(mgr).
For(&formolv1alpha1.BackupSession{}). For(&formolv1alpha1.BackupSession{}).
//WithEventFilter(predicate.GenerationChangedPredicate{}). // Don't reconcile when status gets updated
WithEventFilter(predicate.Funcs{ WithEventFilter(predicate.Funcs{
CreateFunc: func(e event.CreateEvent) bool { return false }, CreateFunc: func(e event.CreateEvent) bool { return false },
DeleteFunc: func(e event.DeleteEvent) bool { return false }, DeleteFunc: func(e event.DeleteEvent) bool { return false },
}). // Don't reconcile when status gets updated }).
Complete(r) Complete(r)
} }