Merge pull request #3198 from briandowns/backport_3197_1.19

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

Merge pull request #3198 from briandowns/backport_3197_1.19
f7615299 · Brian Downs · GitHub · dc1d86e6 · 0f3fe02e · f7615299
Unverified Commit f7615299 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
@@ -827,8 +827,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