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

fine tuning and logging

Browse Source
This commit is contained in:
jandre 2021-02-16 20:01:52 +01:00
parent fd0facf171
commit e972ecef8f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/controllers/restoresession_controller.go
View File

@ -28,7 +28,7 @@ type RestoreSessionReconciler struct {
} }
func (r *RestoreSessionReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) { func (r *RestoreSessionReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
time.Sleep(2 * time.Second) time.Sleep(300 * time.Millisecond)
ctx := context.Background() ctx := context.Background()
log := r.Log.WithValues("restoresession", req.NamespacedName) log := r.Log.WithValues("restoresession", req.NamespacedName)
r.RestoreSession = &formolv1alpha1.RestoreSession{} r.RestoreSession = &formolv1alpha1.RestoreSession{}
@ -83,6 +83,7 @@ func (r *RestoreSessionReconciler) Reconcile(req ctrl.Request) (ctrl.Result, err
return ctrl.Result{}, err return ctrl.Result{}, err
} }
url := fmt.Sprintf("s3:http://%s/%s/%s-%s", repo.Spec.Backend.S3.Server, repo.Spec.Backend.S3.Bucket, strings.ToUpper(r.BackupConf.Namespace), strings.ToLower(r.BackupConf.Name)) url := fmt.Sprintf("s3:http://%s/%s/%s-%s", repo.Spec.Backend.S3.Server, repo.Spec.Backend.S3.Bucket, strings.ToUpper(r.BackupConf.Namespace), strings.ToLower(r.BackupConf.Name))
log.V(0).Info("restoring", "url", url, "snapshot", r.BackupSession.Status.Targets[i].SnapshotId)
output, err := restic.RestorePaths(url, r.BackupSession.Status.Targets[i].SnapshotId) output, err := restic.RestorePaths(url, r.BackupSession.Status.Targets[i].SnapshotId)
if err != nil { if err != nil {
log.Error(err, "unable to restore deployment", "output", string(output)) log.Error(err, "unable to restore deployment", "output", string(output))

4
pkg/restic/root.go
View File

@ -92,7 +92,9 @@ func RestorePaths(repository string, snapshotId string) ([]byte, error) {
return []byte{}, err return []byte{}, err
} }
cmd := exec.Command(resticExec, "restore", "-r", repository, snapshotId, "--target", "/") cmd := exec.Command(resticExec, "restore", "-r", repository, snapshotId, "--target", "/")
return cmd.CombinedOutput() output, err := cmd.CombinedOutput()
log.V(1).Info("restic restore output", "output", string(output))
return output, err
} }
func DeleteSnapshot(snapshot string) error { func DeleteSnapshot(snapshot string) error {