fix: handle panics in Omni and Talos UI watches

Safety net against any bugs there. Signed-off-by: Artem Chernyshev <[email protected]>
siderolabs · Jun 13, 2024 · 4ecb175 · 4ecb175
1 parent 6286340
commit 4ecb175
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/internal/backend/runtime/omni/omni.go b/internal/backend/runtime/omni/omni.go
@@ -338,7 +338,19 @@ func (r *Runtime) Run(ctx context.Context, eg newgroup.EGroup) {
 }
 
 // Watch implements runtime.Runtime.
-func (r *Runtime) Watch(ctx context.Context, events chan<- runtime.WatchResponse, setters ...runtime.QueryOption) error {
+func (r *Runtime) Watch(ctx context.Context, events chan<- runtime.WatchResponse, setters ...runtime.QueryOption) (err error) {
+	defer func() {
+		if p := recover(); p != nil {
+			err = fmt.Errorf("watch panic")
+
+			r.logger.Error("watch panicked", zap.Stack("stack"), zap.Error(err))
+		}
+	}()
+
+	return r.watch(ctx, events, setters...)
+}
+
+func (r *Runtime) watch(ctx context.Context, events chan<- runtime.WatchResponse, setters ...runtime.QueryOption) error {
 	opts := runtime.NewQueryOptions(setters...)
 
 	var (

diff --git a/internal/backend/runtime/talos/talos.go b/internal/backend/runtime/talos/talos.go
@@ -44,7 +44,19 @@ func New(clientFactory *ClientFactory, logger *zap.Logger) *Runtime {
 }
 
 // Watch implements runtime.Runtime.
-func (r *Runtime) Watch(ctx context.Context, events chan<- runtime.WatchResponse, setters ...runtime.QueryOption) error {
+func (r *Runtime) Watch(ctx context.Context, events chan<- runtime.WatchResponse, setters ...runtime.QueryOption) (err error) {
+	defer func() {
+		if p := recover(); p != nil {
+			err = fmt.Errorf("watch panic")
+
+			r.logger.Error("watch panicked", zap.Stack("stack"), zap.Error(err))
+		}
+	}()
+
+	return r.watch(ctx, events, setters...)
+}
+
+func (r *Runtime) watch(ctx context.Context, events chan<- runtime.WatchResponse, setters ...runtime.QueryOption) error {
 	opts := runtime.NewQueryOptions(setters...)
 
 	switch len(opts.Nodes) {