fix: ensure ResourceWatcher reconnection (#523)

tomasfabian · web-flow · commit 79646b366d7b · 2023-02-06T15:44:40.000+07:00
Removed disposal of `_reconnectHandler` in `ResourceWatcher` which causes `ObjectDisposedException` after [leader reelections](https://github.com/buehler/dotnet-operator-sdk/blob/a2290ff9edc41bbbb3a7b47a13a00c99e469f8f9/src/KubeOps/Operator/Controller/ResourceControllerManager.cs#L45) and the watcher stops observing the resource. This fixes #522.
diff --git a/src/KubeOps/Operator/Kubernetes/ResourceWatcher{TEntity}.cs b/src/KubeOps/Operator/Kubernetes/ResourceWatcher{TEntity}.cs
@@ -73,10 +73,11 @@ private void Disposing(bool fromStop)
         {
             _watchEvents.Dispose();
             _reconnectHandler.Dispose();
+            _reconnectSubscription.Dispose();
         }
 
-        _reconnectHandler.Dispose();
-        _reconnectSubscription.Dispose();
+        _resetReconnectCounter?.Dispose();
+
         if (_cancellation?.IsCancellationRequested == false)
         {
             _cancellation.Cancel();
@@ -195,8 +196,6 @@ e.InnerException is JsonException &&
                 .Timer(TimeSpan.FromMinutes(1))
                 .FirstAsync()
                 .Subscribe(_ => _reconnectAttempts = 0);
-
-            _reconnectHandler.OnNext(backoff);
         }
         catch (Exception exception)
         {

Original file line number	Diff line number	Diff line change
`@@ -73,10 +73,11 @@ private void Disposing(bool fromStop)`
`73`	`73`	`{`
`74`	`74`	`_watchEvents.Dispose();`
`75`	`75`	`_reconnectHandler.Dispose();`
	`76`	`+ _reconnectSubscription.Dispose();`
`76`	`77`	`}`
`77`	`78`
`78`		`- _reconnectHandler.Dispose();`
`79`		`- _reconnectSubscription.Dispose();`
	`79`	`+ _resetReconnectCounter?.Dispose();`
	`80`	`+`
`80`	`81`	`if (_cancellation?.IsCancellationRequested == false)`
`81`	`82`	`{`
`82`	`83`	`_cancellation.Cancel();`
`@@ -195,8 +196,6 @@ e.InnerException is JsonException &&`
`195`	`196`	`.Timer(TimeSpan.FromMinutes(1))`
`196`	`197`	`.FirstAsync()`
`197`	`198`	`.Subscribe(_ => _reconnectAttempts = 0);`
`198`		`-`
`199`		`- _reconnectHandler.OnNext(backoff);`
`200`	`199`	`}`
`201`	`200`	`catch (Exception exception)`
`202`	`201`	`{`