bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-06 00:03:34 +00:00
Code Issues Releases Wiki Activity

[BRE-1058] fix alpine race condition (#6156)

Browse Source 
* alpine race condition during shutdown fix

* change catch to only be for relevant task cancelled, added a debug log

* test commit for build and test

* remove testing comment
This commit is contained in:
aj-bw
2025-08-05 09:20:54 -04:00
committed by GitHub
parent 1c2bccdeff
commit 9081c205b1
3 changed files with 59 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/Core/HostedServices/ApplicationCacheHostedService.cs
View File

@@ -67,19 +67,25 @@ public class ApplicationCacheHostedService : IHostedService, IDisposable
public virtual async Task StopAsync(CancellationToken cancellationToken)
{
// Step 1: Signal ExecuteAsync to stop gracefully
_cts?.Cancel();
// Step 2: Wait for ExecuteAsync to finish cleanly
if (_executingTask != null)
{
await _executingTask;
}
// Step 3: Now safely dispose resources (ExecuteAsync is done)
await _subscriptionReceiver.CloseAsync(cancellationToken);
await _serviceBusClient.DisposeAsync();
_cts?.Cancel();
// Step 4: Clean up subscription
try
{
await _serviceBusAdministrationClient.DeleteSubscriptionAsync(_topicName, _subName, cancellationToken);
}
catch { }
if (_executingTask != null)
{
await _executingTask;
}
}
public virtual void Dispose()
@@ -87,15 +93,39 @@ public class ApplicationCacheHostedService : IHostedService, IDisposable
private async Task ExecuteAsync(CancellationToken cancellationToken)
{
await foreach (var message in _subscriptionReceiver.ReceiveMessagesAsync(cancellationToken))
while (!cancellationToken.IsCancellationRequested)
{
try
{
await ProcessMessageAsync(message, cancellationToken);
var messages = await _subscriptionReceiver.ReceiveMessagesAsync(
maxMessages: 1,
maxWaitTime: TimeSpan.FromSeconds(30),
cancellationToken);
if (messages?.Any() == true)
{
foreach (var message in messages)
{
try
{
await ProcessMessageAsync(message, cancellationToken);
}
catch (Exception e)
{
_logger.LogError(e, "Error processing messages in ApplicationCacheHostedService");
}
}
}
}
catch (Exception e)
catch (ObjectDisposedException) when (cancellationToken.IsCancellationRequested)
{
_logger.LogError(e, "Error processing messages in ApplicationCacheHostedService");
_logger.LogDebug("ServiceBus receiver disposed during Alpine container shutdown");
break;
}
catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
{
_logger.LogDebug("ServiceBus operation cancelled during Alpine container shutdown");
break;
}
}
}

15
src/EventsProcessor/AzureQueueHostedService.cs
View File

@@ -86,11 +86,24 @@ public class AzureQueueHostedService : IHostedService, IDisposable
await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
}
}
catch (TaskCanceledException) when (cancellationToken.IsCancellationRequested)
{
_logger.LogDebug("Task.Delay cancelled during Alpine container shutdown");
break;
}
catch (Exception ex)
{
_logger.LogError(ex, "Error occurred processing message block.");
await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
try
{
await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
}
catch (TaskCanceledException) when (cancellationToken.IsCancellationRequested)
{
_logger.LogDebug("Task.Delay cancelled during Alpine container shutdown");
break;
}
}
}

5
src/Notifications/AzureQueueHostedService.cs
View File

@@ -87,6 +87,11 @@ public class AzureQueueHostedService : IHostedService, IDisposable
await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
}
}
catch (TaskCanceledException) when (cancellationToken.IsCancellationRequested)
{
_logger.LogDebug("Task.Delay cancelled during Alpine container shutdown");
break;
}
catch (Exception e)
{
_logger.LogError(e, "Error processing messages.");