#624 : do not launch cleaningTask from registrationStore several time.

eclipse-leshan · Dec 3, 2018 · 5807f49 · 5807f49
1 parent 18f0888
commit 5807f49
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 15 deletions.
diff --git a/...f/src/main/java/org/eclipse/leshan/server/californium/impl/InMemoryRegistrationStore.java b/...f/src/main/java/org/eclipse/leshan/server/californium/impl/InMemoryRegistrationStore.java
@@ -77,6 +77,7 @@ public class InMemoryRegistrationStore implements CaliforniumRegistrationStore,
     private ExpirationListener expirationListener;
 
     private final ScheduledExecutorService schedExecutor;
+    private boolean started = false;
     private final long cleanPeriod; // in seconds
 
     public InMemoryRegistrationStore() {
@@ -438,20 +439,26 @@ public void setExpirationListener(ExpirationListener listener) {
      * start the registration store, will start regular cleanup of dead registrations.
      */
     @Override
-    public void start() {
-        schedExecutor.scheduleAtFixedRate(new Cleaner(), cleanPeriod, cleanPeriod, TimeUnit.SECONDS);
+    public synchronized void start() {
+        if (!started) {
+            started = true;
+            schedExecutor.scheduleAtFixedRate(new Cleaner(), cleanPeriod, cleanPeriod, TimeUnit.SECONDS);
+        }
     }
 
     /**
      * Stop the underlying cleanup of the registrations.
      */
     @Override
     public void stop() {
-        schedExecutor.shutdownNow();
-        try {
-            schedExecutor.awaitTermination(5, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            LOG.warn("Clean up registration thread was interrupted.", e);
+        if (started) {
+            started = false;
+            schedExecutor.shutdownNow();
+            try {
+                schedExecutor.awaitTermination(5, TimeUnit.SECONDS);
+            } catch (InterruptedException e) {
+                LOG.warn("Clean up registration thread was interrupted.", e);
+            }
         }
     }
 

diff --git a/...erver-cluster/src/main/java/org/eclipse/leshan/server/cluster/RedisRegistrationStore.java b/...erver-cluster/src/main/java/org/eclipse/leshan/server/cluster/RedisRegistrationStore.java
@@ -87,6 +87,8 @@ public class RedisRegistrationStore implements CaliforniumRegistrationStore, Sta
     private ExpirationListener expirationListener;
 
     private final ScheduledExecutorService schedExecutor;
+    private boolean started = false;
+
     private final long cleanPeriod; // in seconds
     private final int cleanLimit; // maximum number to clean in a clean period
     private final long gracePeriod; // in seconds
@@ -691,20 +693,26 @@ private Observation build(org.eclipse.californium.core.observe.Observation cfObs
      * Start regular cleanup of dead registrations.
      */
     @Override
-    public void start() {
-        schedExecutor.scheduleAtFixedRate(new Cleaner(), cleanPeriod, cleanPeriod, TimeUnit.SECONDS);
+    public synchronized void start() {
+        if (!started) {
+            started = true;
+            schedExecutor.scheduleAtFixedRate(new Cleaner(), cleanPeriod, cleanPeriod, TimeUnit.SECONDS);
+        }
     }
 
     /**
      * Stop the underlying cleanup of the registrations.
      */
     @Override
-    public void stop() {
-        schedExecutor.shutdownNow();
-        try {
-            schedExecutor.awaitTermination(5, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            LOG.warn("Clean up registration thread was interrupted.", e);
+    public synchronized void stop() {
+        if (started) {
+            started = false;
+            schedExecutor.shutdownNow();
+            try {
+                schedExecutor.awaitTermination(5, TimeUnit.SECONDS);
+            } catch (InterruptedException e) {
+                LOG.warn("Clean up registration thread was interrupted.", e);
+            }
         }
     }