You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/08/22 15:59:41 UTC

[james-project] 03/04: [BUILD] Reference counting for MemoryMailQueue resource release

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 40010e675d8e61ab40e4bb3a373138a9bb1986b8
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Aug 22 10:46:11 2022 +0700

    [BUILD] Reference counting for MemoryMailQueue resource release
---
 server/queue/queue-memory/pom.xml                  |  4 +++
 .../james/queue/memory/MemoryMailQueueFactory.java | 30 +++++++++++++++++++---
 .../queue/memory/MemoryCacheableMailQueueTest.java |  6 +++++
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/server/queue/queue-memory/pom.xml b/server/queue/queue-memory/pom.xml
index d79901cce6..2e3c77ff73 100644
--- a/server/queue/queue-memory/pom.xml
+++ b/server/queue/queue-memory/pom.xml
@@ -43,6 +43,10 @@
             <artifactId>testing-base</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
diff --git a/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java b/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
index 68b04b8a6e..36805f3baf 100644
--- a/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
+++ b/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
@@ -34,13 +34,16 @@ import java.util.concurrent.DelayQueue;
 import java.util.concurrent.Delayed;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
+import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 
 import org.apache.commons.lang3.NotImplementedException;
 import org.apache.james.core.MailAddress;
+import org.apache.james.lifecycle.api.LifecycleUtil;
 import org.apache.james.queue.api.MailQueue;
 import org.apache.james.queue.api.MailQueueFactory;
 import org.apache.james.queue.api.MailQueueItemDecoratorFactory;
@@ -73,6 +76,11 @@ public class MemoryMailQueueFactory implements MailQueueFactory<MemoryMailQueueF
         this.mailQueueItemDecoratorFactory = mailQueueItemDecoratorFactory;
     }
 
+    @PreDestroy
+    public void clean() {
+        mailQueues.clear();
+    }
+
     @Override
     public Set<MailQueueName> listCreatedMailQueues() {
         return mailQueues.values()
@@ -83,15 +91,20 @@ public class MemoryMailQueueFactory implements MailQueueFactory<MemoryMailQueueF
 
     @Override
     public Optional<MemoryCacheableMailQueue> getQueue(MailQueueName name, PrefetchCount count) {
-        return Optional.ofNullable(mailQueues.get(name));
+        Optional<MemoryCacheableMailQueue> queue = Optional.ofNullable(mailQueues.get(name));
+        queue.ifPresent(MemoryCacheableMailQueue::reference);
+        return queue;
     }
 
     @Override
     public MemoryCacheableMailQueue createQueue(MailQueueName name, PrefetchCount prefetchCount) {
-        return mailQueues.computeIfAbsent(name, mailQueueName -> new MemoryCacheableMailQueue(mailQueueName, mailQueueItemDecoratorFactory));
+        MemoryCacheableMailQueue queue = mailQueues.computeIfAbsent(name, mailQueueName -> new MemoryCacheableMailQueue(mailQueueName, mailQueueItemDecoratorFactory));
+        queue.reference();
+        return queue;
     }
 
     public static class MemoryCacheableMailQueue implements ManageableMailQueue {
+        private final AtomicInteger references = new AtomicInteger(0);
         private final DelayQueue<MemoryMailQueueItem> mailItems;
         private final LinkedBlockingDeque<MemoryMailQueueItem> inProcessingMailItems;
         private final MailQueueName name;
@@ -111,9 +124,20 @@ public class MemoryMailQueueFactory implements MailQueueFactory<MemoryMailQueueF
                 .map(item -> mailQueueItemDecoratorFactory.decorate(item, name));
         }
 
+        public void reference() {
+            references.incrementAndGet();
+        }
+
         @Override
         public void close() {
-            this.scheduler.dispose();
+            if (references.decrementAndGet() <= 0) {
+                this.scheduler.dispose();
+
+                mailItems.forEach(LifecycleUtil::dispose);
+                inProcessingMailItems.forEach(LifecycleUtil::dispose);
+                mailItems.clear();
+                inProcessingMailItems.clear();
+            }
         }
 
         @Override
diff --git a/server/queue/queue-memory/src/test/java/org/apache/james/queue/memory/MemoryCacheableMailQueueTest.java b/server/queue/queue-memory/src/test/java/org/apache/james/queue/memory/MemoryCacheableMailQueueTest.java
index f8b4566f13..a2fb680ab6 100644
--- a/server/queue/queue-memory/src/test/java/org/apache/james/queue/memory/MemoryCacheableMailQueueTest.java
+++ b/server/queue/queue-memory/src/test/java/org/apache/james/queue/memory/MemoryCacheableMailQueueTest.java
@@ -27,6 +27,7 @@ import org.apache.james.queue.api.MailQueue;
 import org.apache.james.queue.api.MailQueueName;
 import org.apache.james.queue.api.ManageableMailQueue;
 import org.apache.james.queue.api.RawMailQueueItemDecoratorFactory;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -39,6 +40,11 @@ public class MemoryCacheableMailQueueTest implements DelayedManageableMailQueueC
         mailQueue = new MemoryMailQueueFactory.MemoryCacheableMailQueue(MailQueueName.of("test"), new RawMailQueueItemDecoratorFactory());
     }
 
+    @AfterEach
+    public void tearDown() {
+        mailQueue.close();
+    }
+
     @Override
     public MailQueue getMailQueue() {
         return mailQueue;


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org