fixed that ThingUpdater was already stopped when processing "ThingDel…

…eted" events with a consistency-lag > 5 seconds * also added IntelliJ run-configurations in .run/ folder Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Feb 18, 2022 · 0c1f4dc · 0c1f4dc
1 parent 3129cfe
commit 0c1f4dc
Show file tree

Hide file tree

Showing 8 changed files with 157 additions and 2 deletions.
diff --git a/.run/ConciergeService.run.xml b/.run/ConciergeService.run.xml
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ConciergeService" type="Application" factoryName="Application" folderName="Ditto" nameIsGenerated="true">
+    <option name="ALTERNATIVE_JRE_PATH" value="11" />
+    <envs>
+      <env name="ENFORCEMENT_SPECIAL_LOGGING_INSPECTED_NAMESPACES.0" value="org.eclipse.ditto" />
+      <env name="DITTO_DEVOPS_FEATURE_WOT_INTEGRATION_ENABLED" value="true" />
+    </envs>
+    <option name="MAIN_CLASS_NAME" value="org.eclipse.ditto.concierge.service.starter.ConciergeService" />
+    <module name="ditto-concierge-service" />
+    <option name="VM_PARAMETERS" value="-Xms512m -Xmx512m" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="org.eclipse.ditto.services.concierge.starter.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/ConnectivityService.run.xml b/.run/ConnectivityService.run.xml
@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ConnectivityService" type="Application" factoryName="Application" folderName="Ditto" nameIsGenerated="true">
+    <option name="ALTERNATIVE_JRE_PATH" value="11" />
+    <envs>
+      <env name="LOG_LEVEL_APPLICATION" value="INFO" />
+      <env name="CONNECTIVITY_HTTP_PROXY_ENABLED" value="false" />
+      <env name="CONNECTIVITY_HTTP_PROXY_HOST" value="localhost" />
+      <env name="CONNECTIVITY_HTTP_PROXY_PORT" value="3128" />
+    </envs>
+    <option name="MAIN_CLASS_NAME" value="org.eclipse.ditto.connectivity.service.ConnectivityService" />
+    <module name="ditto-connectivity-service" />
+    <option name="VM_PARAMETERS" value="-Xms512m -Xmx512m --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="org.eclipse.ditto.services.connectivity.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/Ditto.run.xml b/.run/Ditto.run.xml
@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Ditto" type="CompoundRunConfigurationType">
+    <toRun name="ConciergeService" type="Application" />
+    <toRun name="ConnectivityService" type="Application" />
+    <toRun name="GatewayService" type="Application" />
+    <toRun name="PoliciesService" type="Application" />
+    <toRun name="SearchService" type="Application" />
+    <toRun name="ThingsService" type="Application" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/GatewayService.run.xml b/.run/GatewayService.run.xml
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="GatewayService" type="Application" factoryName="Application" folderName="Ditto">
+    <option name="ALTERNATIVE_JRE_PATH" value="11" />
+    <envs>
+      <env name="LOG_LEVEL_APPLICATION" value="INFO" />
+      <env name="DITTO_DEVOPS_FEATURE_WOT_INTEGRATION_ENABLED" value="true" />
+    </envs>
+    <option name="MAIN_CLASS_NAME" value="org.eclipse.ditto.gateway.service.starter.GatewayService" />
+    <module name="ditto-gateway-service" />
+    <option name="VM_PARAMETERS" value="-Xms512m -Xmx512m -Dcom.sun.management.jmxremote.port=9301 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="org.eclipse.ditto.services.gateway.starter.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/PoliciesService.run.xml b/.run/PoliciesService.run.xml
@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PoliciesService" type="Application" factoryName="Application" folderName="Ditto" nameIsGenerated="true">
+    <option name="ALTERNATIVE_JRE_PATH" value="11" />
+    <envs>
+      <env name="LOG_LEVEL_APPLICATION" value="INFO" />
+    </envs>
+    <option name="MAIN_CLASS_NAME" value="org.eclipse.ditto.policies.service.starter.PoliciesService" />
+    <module name="ditto-policies-service" />
+    <option name="VM_PARAMETERS" value="-Xms512m -Xmx512m" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="org.eclipse.ditto.services.policies.starter.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/SearchService.run.xml b/.run/SearchService.run.xml
@@ -0,0 +1,36 @@
+<!--
+  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
+  ~
+  ~ See the NOTICE file(s) distributed with this work for additional
+  ~ information regarding copyright ownership.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License 2.0 which is available at
+  ~ http://www.eclipse.org/legal/epl-2.0
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+  -->
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="SearchService" type="Application" factoryName="Application" folderName="Ditto" nameIsGenerated="true">
+    <option name="ALTERNATIVE_JRE_PATH" value="11" />
+    <envs>
+      <env name="LOG_LEVEL_APPLICATION" value="INFO" />
+      <env name="ACTIVITY_CHECK_INTERVAL" value="1h" />
+      <env name="BACKGROUND_SYNC_QUIET_PERIOD" value="1h" />
+      <env name="THINGS_SEARCH_UPDATER_STREAM_PERSISTENCE_PARALLELISM" value="4" />
+      <env name="THINGS_SEARCH_UPDATER_STREAM_WRITE_INTERVAL" value="30s" />
+    </envs>
+    <option name="MAIN_CLASS_NAME" value="org.eclipse.ditto.thingsearch.service.starter.SearchService" />
+    <module name="ditto-thingsearch-service" />
+    <option name="VM_PARAMETERS" value="-Xms512m -Xmx512m" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="org.eclipse.ditto.services.thingsearch.starter.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/ThingsService.run.xml b/.run/ThingsService.run.xml
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ThingsService" type="Application" factoryName="Application" folderName="Ditto" nameIsGenerated="true">
+    <option name="ALTERNATIVE_JRE_PATH" value="11" />
+    <envs>
+      <env name="DITTO_DEVOPS_FEATURE_WOT_INTEGRATION_ENABLED" value="true" />
+      <env name="LOG_LEVEL_APPLICATION" value="INFO" />
+    </envs>
+    <option name="MAIN_CLASS_NAME" value="org.eclipse.ditto.things.service.starter.ThingsService" />
+    <module name="ditto-things-service" />
+    <option name="VM_PARAMETERS" value="-Xms512m -Xmx512m" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="org.eclipse.ditto.services.things.starter.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
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
@@ -406,8 +406,10 @@ private void processThingEvent(final ThingEvent<?> thingEvent) {
         }
 
         if (thingEvent instanceof ThingDeleted) {
-            // will stop this actor after 5 seconds (finishing up updating the index):
-            getContext().setReceiveTimeout(Duration.ofSeconds(5));
+            // will stop this actor after 5 minutes (finishing up updating the index):
+            // this time should be longer than the consistency lag, otherwise the actor will be stopped before the
+            // actual "delete" is applied to the search index:
+            getContext().setReceiveTimeout(Duration.ofMinutes(5));
         }
     }