fix: resource hangs on context canceled

Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
werf · May 29, 2023 · 0c195e2 · 0c195e2
1 parent 1d082bd
commit 0c195e2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/pkg/tracker/generic/resource_state_watcher.go b/pkg/tracker/generic/resource_state_watcher.go
@@ -96,5 +96,9 @@ func (w *ResourceStateWatcher) Run(ctx context.Context, resourceAddedCh, resourc
 		fmt.Printf("      %s resource watcher DONE\n", w.ResourceID)
 	}
 
-	return fatalWatchErr
+	if fatalWatchErr.Err != nil {
+		return fatalWatchErr
+	} else {
+		return nil
+	}
 }
diff --git a/pkg/tracker/generic/tracker.go b/pkg/tracker/generic/tracker.go
@@ -2,7 +2,6 @@ package generic
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"os"
 	"sync"
@@ -115,11 +114,7 @@ func (t *Tracker) Track(ctx context.Context, noActivityTimeout time.Duration, ad
 		case <-time.After(noActivityTimeout):
 			failedCh <- NewFailedResourceStatus(fmt.Sprintf("marking resource as failed because no activity for %s", noActivityTimeout))
 		case err := <-stateWatcherErrCh:
-			var unrecoverableWatchErr *UnrecoverableWatchError
-			if errors.As(err, &unrecoverableWatchErr) {
-				succeededCh <- NewSucceededResourceStatus()
-				return nil
-			} else {
+			if err != nil {
 				return err
 			}
 		case err := <-eventWatcherErrCh: