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 2021/01/05 04:55:55 UTC
[james-project] 16/24: JAMES-3202 ReIndexerPerformer in corrective
mode should add missing messages in the index
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 b2c9553b600542e09360e4210f575e284b382c4f
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Dec 30 16:55:52 2020 +0700
JAMES-3202 ReIndexerPerformer in corrective mode should add missing messages in the index
The messages were skept
---
.../ElasticSearchListeningMessageSearchIndex.java | 4 +--
...asticSearchListeningMessageSearchIndexTest.java | 6 ++---
.../mailbox/tools/indexer/ReIndexerPerformer.java | 3 ++-
.../mailbox/tools/indexer/ReIndexerImplTest.java | 31 ++++++++++++++++++++++
.../james/webadmin/routes/MailboxesRoutesTest.java | 8 +++---
.../webadmin/routes/UserMailboxesRoutesTest.java | 4 +--
6 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
index b6245a8..f3af769 100644
--- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
+++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
@@ -233,9 +233,7 @@ public class ElasticSearchListeningMessageSearchIndex extends ListeningMessageSe
return elasticSearchIndexer.get(indexIdFor(mailbox.getMailboxId(), uid), routingKey)
.filter(GetResponse::isExists)
.map(GetResponse::getSourceAsMap)
- .map(this::extractFlags)
- .switchIfEmpty(Mono.error(() -> new IndexNotFoundException(
- String.format("Index for message %s in mailbox %s not found", uid.toString(), mailbox.getMailboxId().serialize()))));
+ .map(this::extractFlags);
}
private Flags extractFlags(Map<String, Object> source) {
diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java
index 1c588af..fcfa31e 100644
--- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java
+++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java
@@ -466,9 +466,9 @@ class ElasticSearchListeningMessageSearchIndexTest {
}
@Test
- void retrieveIndexedFlagsShouldPropagateExceptionWhenNotFound() {
- assertThatThrownBy(() -> testee.retrieveIndexedFlags(mailbox, MESSAGE_UID_4).block())
- .isInstanceOf(IndexNotFoundException.class);
+ void retrieveIndexedFlagsShouldReturnEmptyWhenNotFound() {
+ assertThat(testee.retrieveIndexedFlags(mailbox, MESSAGE_UID_4).blockOptional())
+ .isEmpty();
}
}
}
\ No newline at end of file
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexerPerformer.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexerPerformer.java
index ad2f2f3..bff8e27 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexerPerformer.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexerPerformer.java
@@ -340,7 +340,8 @@ public class ReIndexerPerformer {
private Mono<Boolean> isIndexUpToDate(Mailbox mailbox, MailboxMessage message) {
return messageSearchIndex.retrieveIndexedFlags(mailbox, message.getUid())
- .map(flags -> isIndexUpToDate(message, flags));
+ .map(flags -> isIndexUpToDate(message, flags))
+ .switchIfEmpty(Mono.just(false));
}
private boolean isIndexUpToDate(MailboxMessage message, Flags flags) {
diff --git a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ReIndexerImplTest.java b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ReIndexerImplTest.java
index 32135ad..a47f208 100644
--- a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ReIndexerImplTest.java
+++ b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ReIndexerImplTest.java
@@ -242,6 +242,37 @@ public class ReIndexerImplTest {
}
@Test
+ void deltaReindexShouldUpdateMissingMessages() throws Exception {
+ MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
+ MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
+ ComposedMessageId createdMessage = mailboxManager.getMailbox(INBOX, systemSession)
+ .appendMessage(
+ MessageManager.AppendCommand.builder().build("header: value\r\n\r\nbody"),
+ systemSession).getId();
+ when(messageSearchIndex.retrieveIndexedFlags(any(), any())).thenReturn(Mono.empty());
+ when(messageSearchIndex.delete(any(), any(), any())).thenReturn(Mono.empty());
+
+ reIndexer.reIndex(mailboxId,
+ RunningOptions.builder()
+ .mode(RunningOptions.Mode.FIX_OUTDATED)
+ .build())
+ .run();
+ ArgumentCaptor<MailboxMessage> messageCaptor = ArgumentCaptor.forClass(MailboxMessage.class);
+ ArgumentCaptor<Mailbox> mailboxCaptor = ArgumentCaptor.forClass(Mailbox.class);
+
+ verify(messageSearchIndex).retrieveIndexedFlags(any(), any());
+ verify(messageSearchIndex).delete(any(), any(), any());
+ verify(messageSearchIndex).add(any(MailboxSession.class), mailboxCaptor.capture(), messageCaptor.capture());
+ verifyNoMoreInteractions(messageSearchIndex);
+
+ assertThat(mailboxCaptor.getValue()).satisfies(mailbox -> assertThat(mailbox.getMailboxId()).isEqualTo(mailboxId));
+ assertThat(messageCaptor.getValue()).satisfies(message -> {
+ assertThat(message.getMailboxId()).isEqualTo(mailboxId);
+ assertThat(message.getUid()).isEqualTo(createdMessage.getUid());
+ });
+ }
+
+ @Test
void mailboxIdReIndexShouldOnlyDropSearchIndexWhenEmptyMailbox() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java
index 1bbbbdf..ea4afe3 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java
@@ -535,8 +535,8 @@ class MailboxesRoutesTest {
.when()
.get(taskId + "/await");
- assertThatThrownBy(() -> searchIndex.retrieveIndexedFlags(mailbox, uid).block())
- .isInstanceOf(IndexNotFoundException.class);
+ assertThat(searchIndex.retrieveIndexedFlags(mailbox, uid).blockOptional())
+ .isEmpty();
}
}
@@ -956,8 +956,8 @@ class MailboxesRoutesTest {
.when()
.get(taskId + "/await");
- assertThatThrownBy(() -> searchIndex.retrieveIndexedFlags(mailbox, uid).block())
- .isInstanceOf(IndexNotFoundException.class);
+ assertThat(searchIndex.retrieveIndexedFlags(mailbox, uid).blockOptional())
+ .isEmpty();
}
}
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index 7724fec..153641d 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -1574,8 +1574,8 @@ class UserMailboxesRoutesTest {
.when()
.get(taskId + "/await");
- assertThatThrownBy(() -> searchIndex.retrieveIndexedFlags(mailbox, uid).block())
- .isInstanceOf(IndexNotFoundException.class);
+ assertThat(searchIndex.retrieveIndexedFlags(mailbox, uid).blockOptional())
+ .isEmpty();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org