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:56 UTC
[james-project] 17/24: JAMES-3202 ReIndexerPerformer in corrective
mode: add missing error handling
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 8630f345ccb9ab26e245c0d992c1f67eadfff7a4
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Dec 30 17:01:10 2020 +0700
JAMES-3202 ReIndexerPerformer in corrective mode: add missing error handling
---
.../events/ElasticSearchListeningMessageSearchIndex.java | 1 -
.../java/org/apache/mailbox/tools/indexer/ReIndexerPerformer.java | 8 ++++++--
2 files changed, 6 insertions(+), 3 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 f3af769..6554bb6 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
@@ -62,7 +62,6 @@ import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex;
import org.elasticsearch.action.get.GetResponse;
-import org.elasticsearch.index.IndexNotFoundException;
import org.elasticsearch.index.query.TermQueryBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 bff8e27..2dd9cde 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
@@ -327,10 +327,14 @@ public class ReIndexerPerformer {
.flatMap(message -> isIndexUpToDate(entry.getMailbox(), message)
.flatMap(upToDate -> {
if (upToDate) {
- return Mono.just(Either.right(Result.COMPLETED));
+ return Mono.just(Either.<Failure, Result>right(Result.COMPLETED));
}
return correct(entry, message);
- }));
+ }))
+ .onErrorResume(e -> {
+ LOGGER.warn("ReIndexing failed for {} {}", entry.getMailbox().generateAssociatedPath(), entry.getUid(), e);
+ return Mono.just(Either.left(new MessageFailure(entry.getMailbox().getMailboxId(), entry.getUid())));
+ });
}
private Mono<Either<Failure, Result>> correct(ReIndexingEntry entry, MailboxMessage message) {
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org