Fix ThingUpdater stopping timers twice. Change default of expected ro…

…les. Signed-off-by: Yufei Cai <yufei.cai@bosch.io>
eclipse-ditto · Apr 14, 2022 · 1abf05b · 1abf05b
1 parent ad15dde
commit 1abf05b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...src/main/java/org/eclipse/ditto/gateway/service/util/config/health/HealthCheckConfig.java b/...src/main/java/org/eclipse/ditto/gateway/service/util/config/health/HealthCheckConfig.java
@@ -102,7 +102,7 @@ enum ClusterRolesConfigValue implements KnownConfigValue {
             ENABLED("enabled", true),
 
             EXPECTED("expected",
-                    Arrays.asList("policies", "things", "things-search", "gateway", "connectivity", "concierge"));
+                    Arrays.asList("policies", "things", "search", "gateway", "connectivity", "concierge"));
 
             private final String path;
             private final Object defaultValue;

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
@@ -327,7 +327,7 @@ private FSM.State<State, Data> onResult(final Result result, final Data data) {
     private FSM.State<State, Data> onDone(final Done done, final Data data) {
         killSwitch = null;
         log.debug("Update skipped");
-        return goTo(State.READY);
+        return goTo(State.READY).using(new Data(data.metadata().export(), data.lastWriteModel()));
     }
 
     private FSM.State<State, Data> tick(final Control tick, final Data data) {
@@ -504,7 +504,7 @@ private UniqueKillSwitch recoverLastWriteModel(final ThingId thingId,
     }
 
     private void tickNow() {
-        startTimerWithFixedDelay(Control.TICK.name(), Control.TICK, writeInterval);
+        cancelTimer(Control.TICK.name());
         getSelf().tell(Control.TICK, ActorRef.noSender());
     }