Merge pull request #3199 from briandowns/backport_3197_1.20

[Backport 1.20] - Resolve local retention issue when S3 in use.

Merge pull request #3199 from briandowns/backport_3197_1.20
62cce793 · Brian Downs · GitHub · 74c67115 · 1521e3b0 · 62cce793
Unverified Commit 62cce793 authored Apr 14, 2021 by Brian Downs Committed by GitHub Apr 14, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

etcd.go pkg/etcd/etcd.go +0 -2

No files found.
--- a/pkg/etcd/etcd.go
+++ b/pkg/etcd/etcd.go
@@ -844,8 +844,6 @@ func (e *ETCD) Snapshot(ctx context.Context, config *config.Control) error {
 				return errors.Wrap(err, "failed to apply s3 snapshot retention")
 			}
 		}
-
-		return nil
 	}

 	// check if we need to perform a retention check