From 686f41ebeccc3c2b24631efcd65cde7dff877b52 Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Fri, 23 Aug 2019 11:53:00 -0600 Subject: [PATCH] remove calls to restic check before/after prune (#1794) * remove calls to restic check before/after prune Signed-off-by: Steve Kriss * changelog Signed-off-by: Steve Kriss --- changelogs/unreleased/1794-skriss | 1 + pkg/controller/restic_repository_controller.go | 10 ---------- pkg/restic/command_factory.go | 7 ------- pkg/restic/command_factory_test.go | 7 ------- pkg/restic/repository_manager.go | 11 ----------- 5 files changed, 1 insertion(+), 35 deletions(-) create mode 100644 changelogs/unreleased/1794-skriss diff --git a/changelogs/unreleased/1794-skriss b/changelogs/unreleased/1794-skriss new file mode 100644 index 000000000..2afc42089 --- /dev/null +++ b/changelogs/unreleased/1794-skriss @@ -0,0 +1 @@ +remove 'restic check' calls from before/after 'restic prune' since they're redundant diff --git a/pkg/controller/restic_repository_controller.go b/pkg/controller/restic_repository_controller.go index 56067c2aa..7be6ad5d9 100644 --- a/pkg/controller/restic_repository_controller.go +++ b/pkg/controller/restic_repository_controller.go @@ -216,11 +216,6 @@ func (c *resticRepositoryController) runMaintenanceIfDue(req *v1.ResticRepositor log.Info("Running maintenance on restic repository") - log.Debug("Checking repo before prune") - if err := c.repositoryManager.CheckRepo(req); err != nil { - return c.patchResticRepository(req, repoNotReady(err.Error())) - } - // prune failures should be displayed in the `.status.message` field but // should not cause the repo to move to `NotReady`. log.Debug("Pruning repo") @@ -233,11 +228,6 @@ func (c *resticRepositoryController) runMaintenanceIfDue(req *v1.ResticRepositor } } - log.Debug("Checking repo after prune") - if err := c.repositoryManager.CheckRepo(req); err != nil { - return c.patchResticRepository(req, repoNotReady(err.Error())) - } - return c.patchResticRepository(req, func(req *v1.ResticRepository) { req.Status.LastMaintenanceTime = metav1.Time{Time: now} }) diff --git a/pkg/restic/command_factory.go b/pkg/restic/command_factory.go index fd913125f..95a2d6009 100644 --- a/pkg/restic/command_factory.go +++ b/pkg/restic/command_factory.go @@ -91,13 +91,6 @@ func SnapshotsCommand(repoIdentifier string) *Command { } } -func CheckCommand(repoIdentifier string) *Command { - return &Command{ - Command: "check", - RepoIdentifier: repoIdentifier, - } -} - func PruneCommand(repoIdentifier string) *Command { return &Command{ Command: "prune", diff --git a/pkg/restic/command_factory_test.go b/pkg/restic/command_factory_test.go index 1b45a4024..6cd0ab961 100644 --- a/pkg/restic/command_factory_test.go +++ b/pkg/restic/command_factory_test.go @@ -103,13 +103,6 @@ func TestSnapshotsCommand(t *testing.T) { assert.Equal(t, "repo-id", c.RepoIdentifier) } -func TestCheckCommand(t *testing.T) { - c := CheckCommand("repo-id") - - assert.Equal(t, "check", c.Command) - assert.Equal(t, "repo-id", c.RepoIdentifier) -} - func TestPruneCommand(t *testing.T) { c := PruneCommand("repo-id") diff --git a/pkg/restic/repository_manager.go b/pkg/restic/repository_manager.go index 31925b736..1e58ef930 100644 --- a/pkg/restic/repository_manager.go +++ b/pkg/restic/repository_manager.go @@ -49,9 +49,6 @@ type RepositoryManager interface { // authenticated to. ConnectToRepo(repo *velerov1api.ResticRepository) error - // CheckRepo checks the specified repo for errors. - CheckRepo(repo *velerov1api.ResticRepository) error - // PruneRepo deletes unused data from a repo. PruneRepo(repo *velerov1api.ResticRepository) error @@ -200,14 +197,6 @@ func (rm *repositoryManager) ConnectToRepo(repo *velerov1api.ResticRepository) e return rm.exec(snapshotsCmd, repo.Spec.BackupStorageLocation) } -func (rm *repositoryManager) CheckRepo(repo *velerov1api.ResticRepository) error { - // restic check requires an exclusive lock - rm.repoLocker.LockExclusive(repo.Name) - defer rm.repoLocker.UnlockExclusive(repo.Name) - - return rm.exec(CheckCommand(repo.Spec.ResticIdentifier), repo.Spec.BackupStorageLocation) -} - func (rm *repositoryManager) PruneRepo(repo *velerov1api.ResticRepository) error { // restic prune requires an exclusive lock rm.repoLocker.LockExclusive(repo.Name)