fix(upgrade): add short sleep to allow shutdown and event to flush be…

…fore panic Signed-off-by: James Munson <james.munson@suse.com>
longhorn · Oct 25, 2024 · d1b2d32 · d1b2d32
1 parent e7db6e7
commit d1b2d32
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/app/post_upgrade.go b/app/post_upgrade.go
@@ -70,7 +70,10 @@ func postUpgrade(c *cli.Context) error {
 	if err != nil {
 		return errors.Wrap(err, "failed to create event broadcaster")
 	}
-	defer eventBroadcaster.Shutdown()
+	defer func() {
+		eventBroadcaster.Shutdown()
+		time.Sleep(5 * time.Second)
+	}()
 
 	scheme := runtime.NewScheme()
 	if err := longhorn.SchemeBuilder.AddToScheme(scheme); err != nil {
@@ -87,6 +90,7 @@ func postUpgrade(c *cli.Context) error {
 	err = newPostUpgrader(namespace, kubeClient, eventRecorder).Run()
 	if err != nil {
 		logrus.Warnf("Done with Run() ... err is %v", err)
+		time.Sleep(5 * time.Minute)
 	}
 
 	return err

diff --git a/app/pre_upgrade.go b/app/pre_upgrade.go
@@ -1,6 +1,8 @@
 package app
 
 import (
+	"time"
+
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
@@ -61,7 +63,10 @@ func preUpgrade(c *cli.Context) error {
 	if err != nil {
 		return errors.Wrap(err, "failed to create event broadcaster")
 	}
-	defer eventBroadcaster.Shutdown()
+	defer func() {
+		eventBroadcaster.Shutdown()
+		time.Sleep(5 * time.Second)
+	}()
 
 	scheme := runtime.NewScheme()
 	if err := longhorn.SchemeBuilder.AddToScheme(scheme); err != nil {