pr suggestions

ReubenBond · ReubenBond · commit 53c9ae55b0e0 · 2026-03-26T15:39:16.000-07:00
diff --git a/src/Orleans.Runtime/MembershipService/MembershipTableManager.cs b/src/Orleans.Runtime/MembershipService/MembershipTableManager.cs
@@ -537,13 +537,7 @@ private async Task<bool> CleanupMyTableEntries(MembershipTableData table)
                 }
             }
 
-            try
-            {
-                await Task.WhenAll(completions).WaitAsync(_shutdownCts.Token);
-            }
-            catch (OperationCanceledException) when (_shutdownCts.IsCancellationRequested)
-            {
-            }
+            await Task.WhenAll(completions).WaitAsync(_shutdownCts.Token);
             return true;
         }
 
@@ -667,7 +661,14 @@ public async Task ProcessSuspectOrKillLists()
                     {
                         runningFailureCount += 1;
                         LogErrorProcessingSuspectOrKillLists(this.log, ex, runningFailureCount);
-                        await _trySuspectOrKillChannel.Writer.WriteAsync(request, _shutdownCts.Token);
+                        if (request.Completion is not null)
+                        {
+                            request.Completion.TrySetException(ex);
+                        }
+                        else
+                        {
+                            await _trySuspectOrKillChannel.Writer.WriteAsync(request, _shutdownCts.Token);
+                        }
                     }
 
                     if (!reader.TryPeek(out _))

Original file line number	Diff line number	Diff line change
`@@ -537,13 +537,7 @@ private async Task<bool> CleanupMyTableEntries(MembershipTableData table)`
`537`	`537`	`}`
`538`	`538`	`}`
`539`	`539`
`540`		`- try`
`541`		`- {`
`542`		`- await Task.WhenAll(completions).WaitAsync(_shutdownCts.Token);`
`543`		`- }`
`544`		`- catch (OperationCanceledException) when (_shutdownCts.IsCancellationRequested)`
`545`		`- {`
`546`		`- }`
	`540`	`+ await Task.WhenAll(completions).WaitAsync(_shutdownCts.Token);`
`547`	`541`	`return true;`
`548`	`542`	`}`
`549`	`543`
`@@ -667,7 +661,14 @@ public async Task ProcessSuspectOrKillLists()`
`667`	`661`	`{`
`668`	`662`	`runningFailureCount += 1;`
`669`	`663`	`LogErrorProcessingSuspectOrKillLists(this.log, ex, runningFailureCount);`
`670`		`- await _trySuspectOrKillChannel.Writer.WriteAsync(request, _shutdownCts.Token);`
	`664`	`+ if (request.Completion is not null)`
	`665`	`+ {`
	`666`	`+ request.Completion.TrySetException(ex);`
	`667`	`+ }`
	`668`	`+ else`
	`669`	`+ {`
	`670`	`+ await _trySuspectOrKillChannel.Writer.WriteAsync(request, _shutdownCts.Token);`
	`671`	`+ }`
`671`	`672`	`}`
`672`	`673`
`673`	`674`	`if (!reader.TryPeek(out _))`