CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

FINERACT-1971: Fix marking external events sent in parallel

Browse Source
This commit is contained in:
Adam Saghy
2024-04-16 18:07:39 +02:00
parent 40a65eda15
commit 0761c39d16
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-core/src/main/java/org/apache/fineract/infrastructure/event/external/jobs/SendAsynchronousEventsTasklet.java
Vendored
+5
View File
@@ -34,7 +34,9 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.fineract.avro.MessageV1; import org.apache.fineract.avro.MessageV1;
import org.apache.fineract.infrastructure.configuration.domain.ConfigurationDomainService; import org.apache.fineract.infrastructure.configuration.domain.ConfigurationDomainService;
import org.apache.fineract.infrastructure.core.config.FineractProperties; import org.apache.fineract.infrastructure.core.config.FineractProperties;
import org.apache.fineract.infrastructure.core.domain.FineractContext;
import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.DateUtils;
import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil;
import org.apache.fineract.infrastructure.event.external.producer.ExternalEventProducer; import org.apache.fineract.infrastructure.event.external.producer.ExternalEventProducer;
import org.apache.fineract.infrastructure.event.external.repository.ExternalEventRepository; import org.apache.fineract.infrastructure.event.external.repository.ExternalEventRepository;
import org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEventStatus; import org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEventStatus;
@@ -104,11 +106,14 @@ public class SendAsynchronousEventsTasklet implements Tasklet {
// Partitioning dataset to avoid exception: PreparedStatement can have at most 65,535 parameters // Partitioning dataset to avoid exception: PreparedStatement can have at most 65,535 parameters
final int partitionSize = fineractProperties.getEvents().getExternal().getPartitionSize(); final int partitionSize = fineractProperties.getEvents().getExternal().getPartitionSize();
List<List<Long>> partitions = Lists.partition(eventIds, partitionSize); List<List<Long>> partitions = Lists.partition(eventIds, partitionSize);
FineractContext context = ThreadLocalContextUtil.getContext();
partitions.stream() // partitions.stream() //
.parallel() // .parallel() //
.forEach(partitionedEventIds -> { .forEach(partitionedEventIds -> {
measure(() -> { measure(() -> {
ThreadLocalContextUtil.init(context);
repository.markEventsSent(partitionedEventIds, sentAt); repository.markEventsSent(partitionedEventIds, sentAt);
ThreadLocalContextUtil.reset();
}, timeTaken -> { }, timeTaken -> {
log.debug("Took {}ms to update {} events", timeTaken.toMillis(), partitionedEventIds.size()); log.debug("Took {}ms to update {} events", timeTaken.toMillis(), partitionedEventIds.size());
}); });
fineract-core/src/main/java/org/apache/fineract/infrastructure/event/external/repository/ExternalEventRepository.java
Vendored
+2
View File
@@ -18,6 +18,7 @@
*/ */
package org.apache.fineract.infrastructure.event.external.repository; package org.apache.fineract.infrastructure.event.external.repository;
import jakarta.transaction.Transactional;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import java.util.List; import java.util.List;
@@ -40,6 +41,7 @@ public interface ExternalEventRepository extends JpaRepository<ExternalEvent, Lo
void deleteOlderEventsWithSentStatus(@Param("status") ExternalEventStatus status, void deleteOlderEventsWithSentStatus(@Param("status") ExternalEventStatus status,
@Param("dateForPurgeCriteria") LocalDate dateForPurgeCriteria); @Param("dateForPurgeCriteria") LocalDate dateForPurgeCriteria);
@Transactional
@Modifying @Modifying
@Query("UPDATE ExternalEvent e SET e.status = org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEventStatus.SENT, e.sentAt = :sentAt WHERE e.id IN :ids") @Query("UPDATE ExternalEvent e SET e.status = org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEventStatus.SENT, e.sentAt = :sentAt WHERE e.id IN :ids")
void markEventsSent(@Param("ids") List<Long> ids, @Param("sentAt") OffsetDateTime sentAt); void markEventsSent(@Param("ids") List<Long> ids, @Param("sentAt") OffsetDateTime sentAt);