From 91bb4787979b1e080d1e46e3f1f1ea4ec74d987f Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Fri, 10 Sep 2021 10:48:46 -0700 Subject: [PATCH] Backport cluster-reset fix (#3989) Signed-off-by: dereknola --- pkg/cluster/managed.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/cluster/managed.go b/pkg/cluster/managed.go index a7cb78ffb0..cead4d51b6 100644 --- a/pkg/cluster/managed.go +++ b/pkg/cluster/managed.go @@ -62,17 +62,18 @@ func (c *Cluster) start(ctx context.Context) error { rebootstrap := func() error { return c.storageBootstrap(ctx) } - if err := c.managedDB.Reset(ctx, rebootstrap); err != nil { - return err - } + return c.managedDB.Reset(ctx, rebootstrap) case c.config.ClusterReset: if _, err := os.Stat(resetFile); err != nil { if !os.IsNotExist(err) { return err } - } else { - return fmt.Errorf("cluster-reset was successfully performed, please remove the cluster-reset flag and start %s normally, if you need to perform another cluster reset, you must first manually delete the %s file", version.Program, resetFile) + rebootstrap := func() error { + return c.storageBootstrap(ctx) + } + return c.managedDB.Reset(ctx, rebootstrap) } + return fmt.Errorf("cluster-reset was successfully performed, please remove the cluster-reset flag and start %s normally, if you need to perform another cluster reset, you must first manually delete the %s file", version.Program, resetFile) } // removing the reset file and ignore error if the file doesn't exist