Skip to content

[BACKPORT] JAMES-3604 Fix issue when creating quorum rabbitmq queues #1629

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.

Sign up for GitHub

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

Merged
chibenwa merged 2 commits into from
Jul 6, 2023
Merged

[BACKPORT] JAMES-3604 Fix issue when creating quorum rabbitmq queues #1629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c5f6ef
[FIX] JAMES-3919 RabbitMQMailQueue: clean up cassandra projection whe…
Arsnael Jul 5, 2023
c365c33
JAMES-3604 Fix issue when creating quorum rabbitmq queues
Arsnael Sep 29, 2022
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
4 changes: 2 additions & 2 deletions ...mmon/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,9 +722,9 @@ public SSLConfiguration getSslConfiguration() {
return sslConfiguration;
}

public QueueArguments.Builder workQueueArgumentsBuilder() {
public QueueArguments.Builder workQueueArgumentsBuilder(boolean autoDeleteQueue) {
QueueArguments.Builder builder = QueueArguments.builder();
if (useQuorumQueues) {
if (!autoDeleteQueue && useQuorumQueues) {
builder.quorumQueue().replicationFactor(quorumQueueReplicationFactor);
}
queueTTL.ifPresent(builder::queueTTL);
Expand Down
2 changes: 1 addition & 1 deletion event-bus/distributed/src/main/java/org/apache/james/events/GroupRegistration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ private Mono<Void> createGroupWorkQueue() {
.durable(DURABLE)
.exclusive(!EXCLUSIVE)
.autoDelete(!AUTO_DELETE)
.arguments(configuration.workQueueArgumentsBuilder()
.arguments(configuration.workQueueArgumentsBuilder(!AUTO_DELETE)
.deadLetter(namingStrategy.deadLetterExchange())
.build()));
}
Expand Down
2 changes: 1 addition & 1 deletion event-bus/distributed/src/main/java/org/apache/james/events/GroupRegistrationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public void start() {
.durable(DURABLE)
.exclusive(!EXCLUSIVE)
.autoDelete(!AUTO_DELETE)
.arguments(configuration.workQueueArgumentsBuilder()
.arguments(configuration.workQueueArgumentsBuilder(!AUTO_DELETE)
.deadLetter(namingStrategy.deadLetterExchange())
.build()),
BindingSpecification.binding()
Expand Down
2 changes: 1 addition & 1 deletion event-bus/distributed/src/main/java/org/apache/james/events/KeyReconnectionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public Publisher<Void> handleReconnection(Connection connection) {
return Mono.fromRunnable(() -> {
try (Channel channel = connection.createChannel()) {
channel.queueDeclare(namingStrategy.queueName(eventBusId).asString(), DURABLE, !EXCLUSIVE, AUTO_DELETE,
configuration.workQueueArgumentsBuilder().build());
configuration.workQueueArgumentsBuilder(AUTO_DELETE).build());
} catch (Exception e) {
LOGGER.error("Error recovering connection", e);
}
Expand Down
2 changes: 1 addition & 1 deletion event-bus/distributed/src/main/java/org/apache/james/events/KeyRegistrationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ private void declareQueue(Sender sender) {
.durable(DURABLE)
.exclusive(!EXCLUSIVE)
.autoDelete(AUTO_DELETE)
.arguments(configuration.workQueueArgumentsBuilder().build()))
.arguments(configuration.workQueueArgumentsBuilder(AUTO_DELETE).build()))
.timeout(TOPOLOGY_CHANGES_TIMEOUT)
.map(AMQP.Queue.DeclareOk::getQueue)
.retryWhen(Retry.backoff(retryBackoff.getMaxRetries(), retryBackoff.getFirstBackoff()).jitter(retryBackoff.getJitterFactor()))
Expand Down
2 changes: 1 addition & 1 deletion ...ueue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ private RabbitMQMailQueue createQueueIntoRabbitServer(MailQueueName mailQueueNam
.durable(DURABLE)
.exclusive(!EXCLUSIVE)
.autoDelete(!AUTO_DELETE)
.arguments(configuration.workQueueArgumentsBuilder()
.arguments(configuration.workQueueArgumentsBuilder(!AUTO_DELETE)
.deadLetter(mailQueueName.toDeadLetterExchangeName())
.build())),
sender.declareQueue(QueueSpecification.queue(mailQueueName.toDeadLetterQueueName())
Expand Down
4 changes: 2 additions & 2 deletions ...ue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/api/FakeMailQueueView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ public Mono<Boolean> isPresent(EnqueueId id) {
}

@Override
public long delete(DeleteCondition deleteCondition) {
return 0;
public Mono<Long> delete(DeleteCondition deleteCondition) {
return Mono.just(0L);
}

@Override
Expand Down