You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/05/06 02:58:16 UTC
[james-project] branch master updated (0bb1bc6 -> fa3b6ec)
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git.
from 0bb1bc6 JAMES-2694 add package info for zip archive
new fd92e5d JAMES-2733 Test that removed mailQueueItems can not be dequeued
new fa3b6ec JAMES-2733 RabbitMQ should not dequeue deleted elements
The 2 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:
.../james/queue/api/ManageableMailQueueContract.java | 16 ++++++++++++++++
.../org/apache/james/queue/file/FileMailQueueTest.java | 7 +++++++
.../java/org/apache/james/queue/rabbitmq/Dequeuer.java | 17 +++++++++++++++--
3 files changed, 38 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 01/02: JAMES-2733 Test that removed mailQueueItems
can not be dequeued
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit fd92e5df4aecf6b33ac5618f4e7018fbab81eb53
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri May 3 09:43:17 2019 +0700
JAMES-2733 Test that removed mailQueueItems can not be dequeued
RabbitMQ implementation is failing this test as dequeued items are not checked.
File does not support remove.
---
.../james/queue/api/ManageableMailQueueContract.java | 16 ++++++++++++++++
.../org/apache/james/queue/file/FileMailQueueTest.java | 7 +++++++
.../james/queue/rabbitmq/RabbitMQMailQueueTest.java | 8 ++++++++
3 files changed, 31 insertions(+)
diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/ManageableMailQueueContract.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/ManageableMailQueueContract.java
index 336471a..c911e64 100644
--- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/ManageableMailQueueContract.java
+++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/ManageableMailQueueContract.java
@@ -42,6 +42,7 @@ import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterators;
+
import reactor.core.publisher.Flux;
public interface ManageableMailQueueContract extends MailQueueContract {
@@ -613,4 +614,19 @@ public interface ManageableMailQueueContract extends MailQueueContract {
assertThat(getManageableMailQueue().browse()).isEmpty();
}
+ @Test
+ default void deletedElementsShouldNotBeDequeued() throws Exception {
+ enQueue(defaultMail()
+ .name("name1")
+ .build());
+ enQueue(defaultMail()
+ .name("name2")
+ .build());
+
+ getManageableMailQueue().remove(ManageableMailQueue.Type.Name, "name1");
+
+ assertThat(Flux.from(getManageableMailQueue().deQueue()).blockFirst().getMail().getName())
+ .isEqualTo("name2");
+ }
+
}
diff --git a/server/queue/queue-file/src/test/java/org/apache/james/queue/file/FileMailQueueTest.java b/server/queue/queue-file/src/test/java/org/apache/james/queue/file/FileMailQueueTest.java
index 217c85f..bfc9bd7 100644
--- a/server/queue/queue-file/src/test/java/org/apache/james/queue/file/FileMailQueueTest.java
+++ b/server/queue/queue-file/src/test/java/org/apache/james/queue/file/FileMailQueueTest.java
@@ -111,4 +111,11 @@ public class FileMailQueueTest implements DelayedManageableMailQueueContract {
public void concurrentEnqueueDequeueWithAckNackShouldNotFail() {
}
+
+ @Test
+ @Override
+ @Disabled("JAMES-2544 Not supported yet")
+ public void deletedElementsShouldNotBeDequeued() {
+
+ }
}
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java
index c636b9d..5f44b02 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java
@@ -233,6 +233,14 @@ public class RabbitMQMailQueueTest implements ManageableMailQueueContract, MailQ
}
+ @Disabled("JAMES-2733 Deleted elements are still dequeued")
+ @Test
+ @Override
+ public void deletedElementsShouldNotBeDequeued() {
+
+ }
+
+
private void enqueueSomeMails(Function<Integer, String> namePattern, int emailCount) {
IntStream.rangeClosed(1, emailCount)
.forEach(Throwing.intConsumer(i -> enQueue(defaultMail()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 02/02: JAMES-2733 RabbitMQ should not dequeue
deleted elements
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit fa3b6ecd96cd4d0ae6af15ad56e1e5ad2f1c315c
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri May 3 09:52:26 2019 +0700
JAMES-2733 RabbitMQ should not dequeue deleted elements
We should check upon dequeue if an element had been removed or not.
---
.../java/org/apache/james/queue/rabbitmq/Dequeuer.java | 17 +++++++++++++++--
.../james/queue/rabbitmq/RabbitMQMailQueueTest.java | 8 --------
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java
index d053096..a2e7a7e 100644
--- a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java
+++ b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java
@@ -34,6 +34,7 @@ import org.apache.mailet.Mail;
import com.github.fge.lambdas.consumers.ThrowingConsumer;
import com.rabbitmq.client.Delivery;
+
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.rabbitmq.AcknowledgableDelivery;
@@ -80,8 +81,20 @@ class Dequeuer {
.filter(getResponse -> getResponse.getBody() != null);
}
- Flux<MailQueue.MailQueueItem> deQueue() {
- return flux.flatMap(this::loadItem);
+ Flux<? extends MailQueue.MailQueueItem> deQueue() {
+ return flux.flatMap(this::loadItem)
+ .flatMap(this::filterIfDeleted);
+ }
+
+ private Mono<RabbitMQMailQueueItem> filterIfDeleted(RabbitMQMailQueueItem item) {
+ return mailQueueView.isPresent(item.getMail())
+ .flatMap(isPresent -> {
+ if (isPresent) {
+ return Mono.just(item);
+ }
+ item.done(true);
+ return Mono.empty();
+ });
}
private Mono<RabbitMQMailQueueItem> loadItem(AcknowledgableDelivery response) {
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java
index 5f44b02..c636b9d 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java
@@ -233,14 +233,6 @@ public class RabbitMQMailQueueTest implements ManageableMailQueueContract, MailQ
}
- @Disabled("JAMES-2733 Deleted elements are still dequeued")
- @Test
- @Override
- public void deletedElementsShouldNotBeDequeued() {
-
- }
-
-
private void enqueueSomeMails(Function<Integer, String> namePattern, int emailCount) {
IntStream.rangeClosed(1, emailCount)
.forEach(Throwing.intConsumer(i -> enQueue(defaultMail()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org