(james-project) 05/10: JAMES-4027 Task manager queue: delete cancelRequestQueue upon shutdown

[rcordier]

This is an automated email from the ASF dual-hosted git repository.

rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit f856f1047827798bf71ce675e2077789f9131e0f
Author: Quan Tran <hqt...@linagora.com>
AuthorDate: Mon Apr 8 16:50:54 2024 +0700

    JAMES-4027 Task manager queue: delete cancelRequestQueue upon shutdown
    
    cancelRequestQueue would not be auto deleted by RabbitMQ when quorum queue 
is used.
---
 .../james/task/eventsourcing/distributed/RabbitMQWorkQueue.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/RabbitMQWorkQueue.java
 
b/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/RabbitMQWorkQueue.java
index a8402385bc..fe4acefb2d 100644
--- 
a/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/RabbitMQWorkQueue.java
+++ 
b/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/RabbitMQWorkQueue.java
@@ -27,7 +27,6 @@ import static 
org.apache.james.backends.rabbitmq.Constants.evaluateAutoDelete;
 import static org.apache.james.backends.rabbitmq.Constants.evaluateDurable;
 import static reactor.core.publisher.Sinks.EmitFailureHandler.FAIL_FAST;
 
-import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Optional;
@@ -264,7 +263,11 @@ public class RabbitMQWorkQueue implements WorkQueue {
     public void close() {
         try {
             worker.close();
-        } catch (IOException e) {
+
+            
sender.delete(QueueSpecification.queue(cancelRequestQueueName.asString()))
+                .timeout(Duration.ofSeconds(30))
+                .block();
+        } catch (Exception e) {
             throw new RuntimeException(e);
         }
         closeRabbitResources();


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org