ThingUpdater: Do not schedule ticks for idle things.

Signed-off-by: Yufei Cai <yufei.cai@bosch.io>
eclipse-ditto · Jul 28, 2022 · dc65269 · dc65269
1 parent 26c3d30
commit dc65269
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/...vice/src/main/java/org/eclipse/ditto/thingsearch/service/updater/actors/ThingUpdater.java b/...vice/src/main/java/org/eclipse/ditto/thingsearch/service/updater/actors/ThingUpdater.java
@@ -288,14 +288,10 @@ private void handleTransition(final State previousState, final State nextState)
         if (previousState != nextState) {
             switch (nextState) {
                 case READY, RETRYING -> {
-                    final Duration delay;
-                    if (nextState == State.READY) {
-                        delay = writeInterval;
-                    } else {
+                    if (nextState == State.RETRYING) {
                         backOff = backOff.calculateNextBackOff();
-                        delay = backOff.getRestartDelay();
+                        resetTickTimer(backOff.getRestartDelay());
                     }
-                    startTimerWithFixedDelay(Control.TICK.name(), Control.TICK, delay);
                     unstashAll();
                 }
                 default -> cancelTimer(Control.TICK.name());
@@ -411,6 +407,7 @@ private FSM.State<State, Data> updateThing(final UpdateThing updateThing, final
                 updateThing.getDittoHeaders().getAcknowledgementRequests().contains(SEARCH_PERSISTED_REQUEST)
                         ? metadata.withSender(getSender())
                         : metadata;
+        ensureTickTimer();
         return stay().using(new Data(data.metadata().append(nextMetadata), lastWriteModel));
     }
 
@@ -497,6 +494,7 @@ private Optional<Metadata> computeEventMetadata(final ThingEvent<?> thingEvent,
     }
 
     private FSM.State<State, Data> enqueue(final Metadata newMetadata, final Data data) {
+        ensureTickTimer();
         return stay().using(new Data(data.metadata().append(newMetadata), data.lastWriteModel()));
     }
 
@@ -579,6 +577,17 @@ private void refreshIdleShutdownTimer() {
         startSingleTimer(ShutdownTrigger.IDLE.name(), ShutdownTrigger.IDLE, maxIdleTime);
     }
 
+    private void resetTickTimer(final Duration delay) {
+        startTimerWithFixedDelay(Control.TICK.name(), Control.TICK, delay);
+    }
+
+    private void ensureTickTimer() {
+        final var tickTimerName = Control.TICK.name();
+        if (!isTimerActive(tickTimerName)) {
+            resetTickTimer(writeInterval);
+        }
+    }
+
     private static Data getInitialData(final ThingId thingId) {
         final var deletedMetadata = Metadata.ofDeleted(thingId);
         return new Data(deletedMetadata, ThingDeleteModel.of(deletedMetadata));

diff --git a/.../src/test/java/org/eclipse/ditto/thingsearch/service/updater/actors/ThingUpdaterTest.java b/.../src/test/java/org/eclipse/ditto/thingsearch/service/updater/actors/ThingUpdaterTest.java
@@ -28,7 +28,6 @@
 import org.eclipse.ditto.base.model.acks.DittoAcknowledgementLabel;
 import org.eclipse.ditto.base.model.entity.id.EntityId;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.base.model.signals.acks.Acknowledgement;
 import org.eclipse.ditto.internal.utils.akka.ActorSystemResource;
 import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
 import org.eclipse.ditto.json.JsonPointer;
@@ -88,6 +87,7 @@ public final class ThingUpdaterTest {
                       ditto {
                         search {
                             updater.stream.thing-deletion-timeout = 3s
+                            updater.stream.write-interval = 1ms
                         }
                         mongodb.uri = "mongodb://localhost:27017/test"
                       }