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 2020/02/27 08:56:42 UTC
[james-project] 05/05: JAMES-3062: EventDeadLetters healthCheck
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 6e0f2c3f16858bbf39a1f5c81c31b15f0b06cb54
Author: duc91 <du...@gmail.com>
AuthorDate: Tue Feb 25 10:37:16 2020 +0700
JAMES-3062: EventDeadLetters healthCheck
---
.../apache/james/mailbox/events/EventDeadLettersContract.java | 2 +-
.../mailbox/events/EventDeadLettersHealthCheckContract.java | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventDeadLettersContract.java b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventDeadLettersContract.java
index 4ee51ec..ebbbdbc 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventDeadLettersContract.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventDeadLettersContract.java
@@ -459,7 +459,7 @@ interface EventDeadLettersContract {
default void containEventsShouldReturnFalseWhenRemoveAllStoredEvents() {
EventDeadLetters eventDeadLetters = eventDeadLetters();
EventDeadLetters.InsertionId insertionId1 = eventDeadLetters().store(GROUP_A, EVENT_1).block();
- EventDeadLetters.InsertionId insertionId2 = eventDeadLetters().store(GROUP_B, EVENT_2).block();
+ EventDeadLetters.InsertionId insertionId2 = eventDeadLetters().store(GROUP_A, EVENT_2).block();
assertThat(eventDeadLetters.containEvents().block()).isTrue();
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventDeadLettersHealthCheckContract.java b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventDeadLettersHealthCheckContract.java
index 80a3147..6d1c49c 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventDeadLettersHealthCheckContract.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventDeadLettersHealthCheckContract.java
@@ -33,6 +33,7 @@ import org.junit.jupiter.api.Test;
interface EventDeadLettersHealthCheckContract {
ComponentName COMPONENT_NAME = new ComponentName("EventDeadLettersHealthCheck");
+ String EXPECTED_DEGRADED_MESSAGE = "EventDeadLetters contain events. This might indicate transient failure on mailbox event processing.";
Username USERNAME = Username.of("user");
MailboxPath MAILBOX_PATH = new MailboxPath(MailboxConstants.USER_NAMESPACE, USERNAME, "mailboxName");
@@ -67,7 +68,7 @@ interface EventDeadLettersHealthCheckContract {
assertThat(testee().check().isDegraded()).isTrue();
assertThat(testee().check())
- .isEqualTo(Result.degraded(COMPONENT_NAME, "EventDeadLetters contain events"));
+ .isEqualTo(Result.degraded(COMPONENT_NAME, EXPECTED_DEGRADED_MESSAGE));
}
@Test
@@ -77,7 +78,7 @@ interface EventDeadLettersHealthCheckContract {
assertThat(testee().check().isDegraded()).isTrue();
assertThat(testee().check())
- .isEqualTo(Result.degraded(COMPONENT_NAME, "EventDeadLetters contain events"));
+ .isEqualTo(Result.degraded(COMPONENT_NAME, EXPECTED_DEGRADED_MESSAGE));
}
@Test
@@ -87,7 +88,7 @@ interface EventDeadLettersHealthCheckContract {
assertThat(testee().check().isDegraded()).isTrue();
assertThat(testee().check())
- .isEqualTo(Result.degraded(COMPONENT_NAME, "EventDeadLetters contain events"));
+ .isEqualTo(Result.degraded(COMPONENT_NAME, EXPECTED_DEGRADED_MESSAGE));
eventDeadLetters().remove(GROUP_A, insertionId1).block();
eventDeadLetters().remove(GROUP_B, insertionId2).block();
@@ -104,13 +105,13 @@ interface EventDeadLettersHealthCheckContract {
assertThat(testee().check().isDegraded()).isTrue();
assertThat(testee().check())
- .isEqualTo(Result.degraded(COMPONENT_NAME, "EventDeadLetters contain events"));
+ .isEqualTo(Result.degraded(COMPONENT_NAME, EXPECTED_DEGRADED_MESSAGE));
eventDeadLetters().remove(GROUP_A, insertionId1).block();
assertThat(testee().check().isDegraded()).isTrue();
assertThat(testee().check())
- .isEqualTo(Result.degraded(COMPONENT_NAME, "EventDeadLetters contain events"));
+ .isEqualTo(Result.degraded(COMPONENT_NAME, EXPECTED_DEGRADED_MESSAGE));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org