100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Use thread executor in clustering setup for asset creation (#2658)
Koenc79222563322
diff --git a/setup/src/clustering/java/org/openremote/setup/clustering/ManagerClusteringSetup.java b/setup/src/clustering/java/org/openremote/setup/clustering/ManagerSetup.javasimilarity index 72%rename from setup/src/clustering/java/org/openremote/setup/clustering/ManagerClusteringSetup.javarename to setup/src/clustering/java/org/openremote/setup/clustering/ManagerSetup.javaindex ebf70fcd8..97b1fc107 100644--- a/setup/src/clustering/java/org/openremote/setup/clustering/ManagerClusteringSetup.java+++ b/setup/src/clustering/java/org/openremote/setup/clustering/ManagerSetup.java@@ -22,7 +22,6 @@ package org.openremote.setup.clustering;import org.openremote.model.asset.Asset;import org.openremote.model.syslog.SyslogCategory;import org.openremote.model.util.UniqueIdentifierGenerator;-import org.openremote.manager.setup.ManagerSetup;import org.openremote.model.Container;import org.openremote.model.asset.impl.*;import org.openremote.model.attribute.Attribute;@@ -33,24 +32,28 @@ import java.lang.reflect.Modifier;import java.util.Map;import java.util.Random;import java.util.Set;+import java.util.concurrent.Executor;import java.util.logging.Logger;import java.util.stream.Collectors;+import java.util.stream.IntStream;import static org.openremote.model.syslog.SyslogCategory.DATA;import static org.openremote.model.util.MapAccess.getInteger;import static org.openremote.model.util.MapAccess.getString;-public class ManagerClusteringSetup extends ManagerSetup {+public class ManagerSetup extends org.openremote.manager.setup.ManagerSetup {public static final String OR_SETUP_ASSET_TYPES = "OR_SETUP_ASSET_TYPES";public static final String OR_SETUP_ASSETS = "OR_SETUP_ASSETS";- private static final Logger LOG = SyslogCategory.getLogger(DATA, ManagerSetup.class);+ private static final Logger LOG = SyslogCategory.getLogger(DATA, org.openremote.manager.setup.ManagerSetup.class);protected Container container;+ protected Executor executor;- public ManagerClusteringSetup(Container container) {+ public ManagerSetup(Container container, Executor executor) {super(container);this.container = container;+ this.executor = executor;}private static float getRandomNumberInRange(float min, float max) {@@ -67,7 +70,7 @@ public class ManagerClusteringSetup extends ManagerSetup {String defaultTypes = "ThingAsset,LightAsset,RoomAsset,ThermostatAsset";String types = getString(container.getConfig(), OR_SETUP_ASSET_TYPES, defaultTypes);- int assetsPerType = getInteger(container.getConfig(), OR_SETUP_ASSETS, 100);+ int assetsPerType = getInteger(container.getConfig(), OR_SETUP_ASSETS, 10000);Reflections reflections = new Reflections("org.openremote.model.asset.impl");Set<Class<? extends Asset>> allAvailableClasses = reflections.getSubTypesOf(Asset.class);@@ -90,21 +93,31 @@ public class ManagerClusteringSetup extends ManagerSetup {// Skip asset types which either can't directly be initialized or are slow to initif (clazz.equals(UnknownAsset.class) || clazz.equals(GroupAsset.class) || clazz.equals(GatewayAsset.class)) continue;- for (int i = 0; i < assetsPerType; i++) {- String name = clazz.getSimpleName() + i;- Asset<?> asset = clazz.getConstructor(String.class).newInstance(name);+ IntStream.rangeClosed(1, assetsPerType).forEach(i -> {+ executor.execute(() -> {+ try {+ createAsset(clazz, i);+ } catch (Exception e) {+ throw new RuntimeException(e);+ }+ });+ });+ }+ }- asset.setRealm("master");- asset.getAttributes().addOrReplace(- new Attribute<>(Asset.LOCATION, new GeoJSONPoint(- getRandomNumberInRange(4.24f, 4.51f), // West to East- getRandomNumberInRange(51.89f, 51.99f) // South to North- ))- );+ private void createAsset(Class<? extends Asset> clazz, int i) throws Exception {+ String name = clazz.getSimpleName() + i;+ Asset<?> asset = clazz.getConstructor(String.class).newInstance(name);- asset.setId(UniqueIdentifierGenerator.generateId(name));- assetStorageService.merge(asset);- }- }+ asset.setRealm("master");+ asset.getAttributes().addOrReplace(+ new Attribute<>(Asset.LOCATION, new GeoJSONPoint(+ getRandomNumberInRange(4.24f, 4.51f), // West to East+ getRandomNumberInRange(51.89f, 51.99f) // South to North+ ))+ );++ asset.setId(UniqueIdentifierGenerator.generateId(name));+ assetStorageService.merge(asset);}}diff --git a/setup/src/clustering/java/org/openremote/setup/clustering/ClusteringSetupTasks.java b/setup/src/clustering/java/org/openremote/setup/clustering/SetupTasks.javasimilarity index 61%rename from setup/src/clustering/java/org/openremote/setup/clustering/ClusteringSetupTasks.javarename to setup/src/clustering/java/org/openremote/setup/clustering/SetupTasks.javaindex 55d8d17dd..db69917be 100644--- a/setup/src/clustering/java/org/openremote/setup/clustering/ClusteringSetupTasks.java+++ b/setup/src/clustering/java/org/openremote/setup/clustering/SetupTasks.java@@ -21,28 +21,29 @@ package org.openremote.setup.clustering;import org.openremote.model.Container;import org.openremote.model.setup.Setup;-import org.openremote.model.setup.SetupTasks;import java.util.Arrays;import java.util.List;+import java.util.concurrent.ExecutorService;+import java.util.concurrent.Executors;-/**- * Demo setup tasks.- */-public class ClusteringSetupTasks implements SetupTasks {-- public static final String DEMO_SETUP_TYPE = "clustering";+public class SetupTasks implements org.openremote.model.setup.SetupTasks {@Overridepublic List<Setup> createTasks(Container container, String setupType, boolean keycloakEnabled) {+ int totalCores = Runtime.getRuntime().availableProcessors();+ int threadCount = Math.max(1, (int) (totalCores * 0.6));+ ExecutorService executor = Executors.newFixedThreadPool(threadCount);- if (DEMO_SETUP_TYPE.equals(setupType)) {- return Arrays.asList(- new ManagerClusteringSetup(container)- );- }-- // Do nothing otherwise- return null;+ return Arrays.asList(+ new ManagerSetup(container, executor),+ // A hack to allow shutdown of the setup executor+ new Setup() {+ @Override+ public void onStart() throws Exception {+ executor.shutdown();+ }+ }+ );}}diff --git a/setup/src/clustering/resources/META-INF/services/org.openremote.model.setup.SetupTasks b/setup/src/clustering/resources/META-INF/services/org.openremote.model.setup.SetupTasksindex b8f3b5879..f8e68d5c1 100644--- a/setup/src/clustering/resources/META-INF/services/org.openremote.model.setup.SetupTasks+++ b/setup/src/clustering/resources/META-INF/services/org.openremote.model.setup.SetupTasks@@ -1 +1 @@-org.openremote.setup.clustering.ClusteringSetupTasks+org.openremote.setup.clustering.SetupTasks