Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the ability to cancel scheduled messages #746

Merged
merged 21 commits into from
Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Common/Helpers/ServiceBusHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5337,7 +5337,7 @@ public string GetAddressRelativeToNamespace(string address)

public ServiceBusHelper2 GetServiceBusHelper2()
{
var serviceBusHelper2 = new ServiceBusHelper2();
var serviceBusHelper2 = new ServiceBusHelper2(writeToLog);
serviceBusHelper2.ConnectionString = ConnectionString;
serviceBusHelper2.TransportType = UseAmqpWebSockets
? Azure.Messaging.ServiceBus.ServiceBusTransportType.AmqpWebSockets
Expand Down
53 changes: 53 additions & 0 deletions src/ServiceBus/Helpers/CancelScheduledMessagesHelper.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;

using Azure.Messaging.ServiceBus;

using ServiceBusExplorer.Utilities.Helpers;

namespace ServiceBusExplorer.ServiceBus.Helpers
{
public static class CancelScheduledMessagesHelper
{
public static async Task CancelScheduledMessages(ServiceBusHelper2 serviceBusHelper,
string queueName, List<long> sequenceNumbersToCancel)
{
var client = serviceBusHelper.CreateServiceBusClient();

try
{
var sender = client.CreateSender(queueName);

serviceBusHelper.WriteToLog($"Starting cancellation of scheduled messages on queue {queueName}.");

var stopwatch = Stopwatch.StartNew();
var semaphore = new SemaphoreSlim(40); // As recommended by https://learn.microsoft.com/en-us/azure/service-bus-messaging/message-transfers-locks-settlement#settling-send-operations
var tasks = new List<Task>(sequenceNumbersToCancel.Count);

foreach (long sequenceNumber in sequenceNumbersToCancel)
{
await semaphore.WaitAsync();
tasks.Add(CancelScheduledMessageWithLogAsync(sender, sequenceNumber, serviceBusHelper.WriteToLog)
.ContinueWith((t) => semaphore.Release()));
ErikMogensen marked this conversation as resolved.
Show resolved Hide resolved
}

await Task.WhenAll(tasks);
stopwatch.Stop();
serviceBusHelper.WriteToLog($"Cancelled {sequenceNumbersToCancel.Count} scheduled message(s) in {stopwatch.ElapsedMilliseconds / 1000} seconds.");
ErikMogensen marked this conversation as resolved.
Show resolved Hide resolved
}
finally
{
await client.DisposeAsync();
}
}

static async Task CancelScheduledMessageWithLogAsync(ServiceBusSender sender,
long sequenceNumber, WriteToLogDelegate writeToLog)
{
await sender.CancelScheduledMessageAsync(sequenceNumber);
writeToLog($"Cancelled scheduled message with sequence number {sequenceNumber}.");
ErikMogensen marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
32 changes: 31 additions & 1 deletion src/ServiceBus/Helpers/ServiceBusHelper2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,40 @@
#endregion

using System.Threading.Tasks;

using Azure.Messaging.ServiceBus;
using Azure.Messaging.ServiceBus.Administration;

using ServiceBusExplorer.Utilities.Helpers;

// ReSharper disable CheckNamespace
namespace ServiceBusExplorer.ServiceBus.Helpers
// ReSharper restore CheckNamespace
{
public class ServiceBusHelper2
{
readonly WriteToLogDelegate writeToLog;

public string ConnectionString { get; set; }
public ServiceBusTransportType TransportType { get; set; }

public WriteToLogDelegate WriteToLog
{
get
{
return writeToLog;
}
}

public ServiceBusHelper2(WriteToLogDelegate writeToLog)
{
this.writeToLog = writeToLog;
}

public bool ConnectionStringContainsEntityPath()
{
var connectionStringProperties = ServiceBusConnectionStringProperties.Parse(ConnectionString);

if (connectionStringProperties?.EntityPath != null)
{
return true;
Expand All @@ -44,6 +62,18 @@ public bool ConnectionStringContainsEntityPath()
return false;
}

//
/// <summary>
/// It is the callers responsibility to dispose the returned ServiceBusClient object by calling DisposeAsync() on it.
/// </summary>
/// <returns>An Azure.Messaging.ServiceBus.ServiceBusClient</returns>
ErikMogensen marked this conversation as resolved.
Show resolved Hide resolved
public ServiceBusClient CreateServiceBusClient()
{
return new ServiceBusClient(
ConnectionString,
new ServiceBusClientOptions { TransportType = this.TransportType });
}

public async Task<bool> IsPremiumNamespace()
{
var administrationClient = new ServiceBusAdministrationClient(ConnectionString);
Expand Down
35 changes: 34 additions & 1 deletion src/ServiceBusExplorer/Controls/HandleQueueControl.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading