You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2024/12/05 02:28:27 UTC
(james-project) branch master updated (f4d6947383 -> b6ed512b41)
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
from f4d6947383 [FIX] DistributedDeletedMessageVaultDeletionCallback: add an applicative timeout before RabbitMQ consumer timeout
new 8b94aece08 [ENHANCEMENT] DistributedDeletedMessageVaultDeletionCallback should be singleton
new d4aadcb149 JAMES-3605 TerminationReconnectionHandler should not create the termination queue upon reconnection
new b6ed512b41 JAMES-3605 Implement DeletedMessageVaultWorkQueueReconnectionHandler
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...dMessageVaultWorkQueueReconnectionHandler.java} | 13 ++++----
...ributedDeletedMessageVaultDeletionCallback.java | 24 +++++++++++---
.../DistributedDeletedMessageVaultModule.java | 5 +++
.../TerminationReconnectionHandler.java | 37 ++--------------------
4 files changed, 32 insertions(+), 47 deletions(-)
copy server/container/guice/{queue/rabbitmq/src/main/java/org/apache/james/modules/queue/rabbitmq/SpoolerReconnectionHandler.java => distributed/src/main/java/org/apache/james/modules/mailbox/DeletedMessageVaultWorkQueueReconnectionHandler.java} (70%)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
(james-project) 02/03: JAMES-3605 TerminationReconnectionHandler should not create the termination queue upon reconnection
Posted by rc...@apache.org.
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 d4aadcb14933472fa8fa3e4dbd8171ae90503421
Author: Quan Tran <hq...@linagora.com>
AuthorDate: Wed Dec 4 14:39:23 2024 +0700
JAMES-3605 TerminationReconnectionHandler should not create the termination queue upon reconnection
Otherwise error:
```
com.rabbitmq.client.AlreadyClosedException: channel is already closed due to channel error; protocol method: #method<channel.close>(reply-code=406, reply-text=PRECONDITION_FAILED - inequivalent arg 'x-queue-version' for queue 'terminationSubscriber291d56fc-1e2d-4fb3-a455-bad297263f43' in vhost '/': received none but current is the value '2' of type 'signedint', class-id=50, method-id=10)
```
And cause the remaining reconnection handlers to fail.
---
.../TerminationReconnectionHandler.java | 37 ++--------------------
1 file changed, 2 insertions(+), 35 deletions(-)
diff --git a/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/TerminationReconnectionHandler.java b/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/TerminationReconnectionHandler.java
index f21e4061fa..121d2a3dfe 100644
--- a/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/TerminationReconnectionHandler.java
+++ b/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/TerminationReconnectionHandler.java
@@ -19,58 +19,25 @@
package org.apache.james.task.eventsourcing.distributed;
-import static org.apache.james.backends.rabbitmq.Constants.AUTO_DELETE;
-import static org.apache.james.backends.rabbitmq.Constants.DURABLE;
-import static org.apache.james.backends.rabbitmq.Constants.EXCLUSIVE;
-import static org.apache.james.backends.rabbitmq.Constants.evaluateAutoDelete;
-import static org.apache.james.backends.rabbitmq.Constants.evaluateDurable;
-import static org.apache.james.backends.rabbitmq.Constants.evaluateExclusive;
-
import jakarta.inject.Inject;
-import org.apache.james.backends.rabbitmq.QueueArguments;
-import org.apache.james.backends.rabbitmq.RabbitMQConfiguration;
import org.apache.james.backends.rabbitmq.SimpleConnectionPool;
import org.reactivestreams.Publisher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection;
import reactor.core.publisher.Mono;
public class TerminationReconnectionHandler implements SimpleConnectionPool.ReconnectionHandler {
- private static final Logger LOGGER = LoggerFactory.getLogger(TerminationReconnectionHandler.class);
-
- private final TerminationQueueName queueName;
private final RabbitMQTerminationSubscriber terminationSubscriber;
- private final RabbitMQConfiguration configuration;
@Inject
- public TerminationReconnectionHandler(TerminationQueueName queueName, RabbitMQTerminationSubscriber terminationSubscriber, RabbitMQConfiguration configuration) {
- this.queueName = queueName;
+ public TerminationReconnectionHandler(RabbitMQTerminationSubscriber terminationSubscriber) {
this.terminationSubscriber = terminationSubscriber;
- this.configuration = configuration;
}
@Override
public Publisher<Void> handleReconnection(Connection connection) {
- return Mono.fromRunnable(() -> createTerminationQueue(connection))
- .then(Mono.fromRunnable(terminationSubscriber::restart));
- }
-
- private void createTerminationQueue(Connection connection) {
- try (Channel channel = connection.createChannel()) {
- QueueArguments.Builder builder = QueueArguments.builder();
- configuration.getQueueTTL().ifPresent(builder::queueTTL);
- channel.queueDeclare(queueName.asString(),
- evaluateDurable(!DURABLE, configuration.isQuorumQueuesUsed()),
- evaluateExclusive(!EXCLUSIVE, configuration.isQuorumQueuesUsed()),
- evaluateAutoDelete(!AUTO_DELETE, configuration.isQuorumQueuesUsed()),
- builder.build());
- } catch (Exception e) {
- LOGGER.error("Error recovering connection", e);
- }
+ return Mono.fromRunnable(terminationSubscriber::restart);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
(james-project) 03/03: JAMES-3605 Implement DeletedMessageVaultWorkQueueReconnectionHandler
Posted by rc...@apache.org.
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 b6ed512b41fae241e30b5691f875c38a19e78195
Author: Quan Tran <hq...@linagora.com>
AuthorDate: Wed Dec 4 14:57:16 2024 +0700
JAMES-3605 Implement DeletedMessageVaultWorkQueueReconnectionHandler
So the consumer for deleted message vault queue could reconnect if needed.
---
...edMessageVaultWorkQueueReconnectionHandler.java | 43 ++++++++++++++++++++++
...ributedDeletedMessageVaultDeletionCallback.java | 24 +++++++++---
.../DistributedDeletedMessageVaultModule.java | 4 ++
3 files changed, 66 insertions(+), 5 deletions(-)
diff --git a/server/container/guice/distributed/src/main/java/org/apache/james/modules/mailbox/DeletedMessageVaultWorkQueueReconnectionHandler.java b/server/container/guice/distributed/src/main/java/org/apache/james/modules/mailbox/DeletedMessageVaultWorkQueueReconnectionHandler.java
new file mode 100644
index 0000000000..0893a66d34
--- /dev/null
+++ b/server/container/guice/distributed/src/main/java/org/apache/james/modules/mailbox/DeletedMessageVaultWorkQueueReconnectionHandler.java
@@ -0,0 +1,43 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.modules.mailbox;
+
+import jakarta.inject.Inject;
+
+import org.apache.james.backends.rabbitmq.SimpleConnectionPool;
+import org.reactivestreams.Publisher;
+
+import com.rabbitmq.client.Connection;
+
+import reactor.core.publisher.Mono;
+
+public class DeletedMessageVaultWorkQueueReconnectionHandler implements SimpleConnectionPool.ReconnectionHandler {
+ private final DistributedDeletedMessageVaultDeletionCallback distributedDeletedMessageVaultDeletionCallback;
+
+ @Inject
+ public DeletedMessageVaultWorkQueueReconnectionHandler(DistributedDeletedMessageVaultDeletionCallback distributedDeletedMessageVaultDeletionCallback) {
+ this.distributedDeletedMessageVaultDeletionCallback = distributedDeletedMessageVaultDeletionCallback;
+ }
+
+ @Override
+ public Publisher<Void> handleReconnection(Connection connection) {
+ return Mono.fromRunnable(distributedDeletedMessageVaultDeletionCallback::restart);
+ }
+}
diff --git a/server/container/guice/distributed/src/main/java/org/apache/james/modules/mailbox/DistributedDeletedMessageVaultDeletionCallback.java b/server/container/guice/distributed/src/main/java/org/apache/james/modules/mailbox/DistributedDeletedMessageVaultDeletionCallback.java
index 6be7246339..6bed7178c5 100644
--- a/server/container/guice/distributed/src/main/java/org/apache/james/modules/mailbox/DistributedDeletedMessageVaultDeletionCallback.java
+++ b/server/container/guice/distributed/src/main/java/org/apache/james/modules/mailbox/DistributedDeletedMessageVaultDeletionCallback.java
@@ -35,6 +35,7 @@ import jakarta.inject.Inject;
import org.apache.james.backends.rabbitmq.RabbitMQConfiguration;
import org.apache.james.backends.rabbitmq.ReactorRabbitMQChannelPool;
+import org.apache.james.backends.rabbitmq.ReceiverProvider;
import org.apache.james.blob.api.BlobId;
import org.apache.james.core.Username;
import org.apache.james.lifecycle.api.Startable;
@@ -168,7 +169,7 @@ public class DistributedDeletedMessageVaultDeletionCallback implements DeleteMes
private final MailboxId.Factory mailboxIdFactory;
private final MessageId.Factory messageIdFactory;
private final BlobId.Factory blobIdFactory;
- private Receiver receiver;
+ private final ReceiverProvider receiverProvider;
private Disposable disposable;
@Inject
@@ -178,7 +179,8 @@ public class DistributedDeletedMessageVaultDeletionCallback implements DeleteMes
DeletedMessageVaultDeletionCallback callback,
MailboxId.Factory mailboxIdFactory,
MessageId.Factory messageIdFactory,
- BlobId.Factory blobIdFactory) {
+ BlobId.Factory blobIdFactory,
+ ReceiverProvider receiverProvider) {
this.sender = sender;
this.rabbitMQConfiguration = rabbitMQConfiguration;
this.callback = callback;
@@ -187,6 +189,7 @@ public class DistributedDeletedMessageVaultDeletionCallback implements DeleteMes
this.blobIdFactory = blobIdFactory;
this.objectMapper = new ObjectMapper();
this.channelPool = channelPool;
+ this.receiverProvider = receiverProvider;
}
public void init() {
@@ -215,17 +218,28 @@ public class DistributedDeletedMessageVaultDeletionCallback implements DeleteMes
.then()
.block();
- receiver = channelPool.createReceiver();
- disposable = receiver.consumeManualAck(QUEUE, new ConsumeOptions().qos(QOS))
+ disposable = consumeDeletedMessageVaultWorkQueue();
+ }
+
+ private Disposable consumeDeletedMessageVaultWorkQueue() {
+ return Flux.using(
+ receiverProvider::createReceiver,
+ receiver -> receiver.consumeManualAck(QUEUE, new ConsumeOptions().qos(QOS)),
+ Receiver::close)
.flatMap(this::handleMessage)
.subscribeOn(Schedulers.boundedElastic())
.subscribe();
}
+ public void restart() {
+ Disposable previousConsumer = disposable;
+ disposable = consumeDeletedMessageVaultWorkQueue();
+ previousConsumer.dispose();
+ }
+
@PreDestroy
public void stop() {
Optional.ofNullable(disposable).ifPresent(Disposable::dispose);
- Optional.ofNullable(receiver).ifPresent(Receiver::close);
}
private Mono<Void> handleMessage(AcknowledgableDelivery delivery) {
diff --git a/server/container/guice/distributed/src/main/java/org/apache/james/modules/mailbox/DistributedDeletedMessageVaultModule.java b/server/container/guice/distributed/src/main/java/org/apache/james/modules/mailbox/DistributedDeletedMessageVaultModule.java
index 68c1744ea9..2a2078ed49 100644
--- a/server/container/guice/distributed/src/main/java/org/apache/james/modules/mailbox/DistributedDeletedMessageVaultModule.java
+++ b/server/container/guice/distributed/src/main/java/org/apache/james/modules/mailbox/DistributedDeletedMessageVaultModule.java
@@ -20,6 +20,7 @@
package org.apache.james.modules.mailbox;
import org.apache.james.backends.cassandra.components.CassandraModule;
+import org.apache.james.backends.rabbitmq.SimpleConnectionPool;
import org.apache.james.mailbox.cassandra.DeleteMessageListener;
import org.apache.james.modules.vault.DeletedMessageVaultModule;
import org.apache.james.utils.InitializationOperation;
@@ -68,6 +69,9 @@ public class DistributedDeletedMessageVaultModule extends AbstractModule {
.addBinding()
.to(DistributedDeletedMessageVaultDeletionCallback.class);
bind(DistributedDeletedMessageVaultDeletionCallback.class).in(Scopes.SINGLETON);
+
+ Multibinder<SimpleConnectionPool.ReconnectionHandler> reconnectionHandlerMultibinder = Multibinder.newSetBinder(binder(), SimpleConnectionPool.ReconnectionHandler.class);
+ reconnectionHandlerMultibinder.addBinding().to(DeletedMessageVaultWorkQueueReconnectionHandler.class);
}
@ProvidesIntoSet
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
(james-project) 01/03: [ENHANCEMENT] DistributedDeletedMessageVaultDeletionCallback should be singleton
Posted by rc...@apache.org.
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 8b94aece082568c5447397c05c8bca4c85b1262e
Author: Quan Tran <hq...@linagora.com>
AuthorDate: Wed Dec 4 14:34:37 2024 +0700
[ENHANCEMENT] DistributedDeletedMessageVaultDeletionCallback should be singleton
---
.../james/modules/mailbox/DistributedDeletedMessageVaultModule.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/server/container/guice/distributed/src/main/java/org/apache/james/modules/mailbox/DistributedDeletedMessageVaultModule.java b/server/container/guice/distributed/src/main/java/org/apache/james/modules/mailbox/DistributedDeletedMessageVaultModule.java
index a291622a1d..68c1744ea9 100644
--- a/server/container/guice/distributed/src/main/java/org/apache/james/modules/mailbox/DistributedDeletedMessageVaultModule.java
+++ b/server/container/guice/distributed/src/main/java/org/apache/james/modules/mailbox/DistributedDeletedMessageVaultModule.java
@@ -67,6 +67,7 @@ public class DistributedDeletedMessageVaultModule extends AbstractModule {
Multibinder.newSetBinder(binder(), DeleteMessageListener.DeletionCallback.class)
.addBinding()
.to(DistributedDeletedMessageVaultDeletionCallback.class);
+ bind(DistributedDeletedMessageVaultDeletionCallback.class).in(Scopes.SINGLETON);
}
@ProvidesIntoSet
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org