From 81e6cccac9da1bd12c1120f58c7d5ff300b0d107 Mon Sep 17 00:00:00 2001
From: Andrew Shvayka <ashvayka@thingsboard.io>
Date: Mon, 25 Nov 2019 19:41:25 +0200
Subject: [PATCH] Improved Device State Service load

---
 .../state/DefaultDeviceStateService.java      | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
index 5c83a5f89b..1a57aa8dc3 100644
--- a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
@@ -223,24 +223,28 @@ public class DefaultDeviceStateService implements DeviceStateService {
         List<Tenant> tenants = tenantService.findTenants(new TextPageLink(Integer.MAX_VALUE)).getData();
         for (Tenant tenant : tenants) {
             List<ListenableFuture<DeviceStateData>> fetchFutures = new ArrayList<>();
-            List<Device> devices = deviceService.findDevicesByTenantId(tenant.getId(), new TextPageLink(Integer.MAX_VALUE)).getData();
-            for (Device device : devices) {
-                if (!routingService.resolveById(device.getId()).isPresent()) {
-                    if (!deviceStates.containsKey(device.getId())) {
-                        fetchFutures.add(fetchDeviceState(device));
-                    }
-                } else {
-                    Set<DeviceId> tenantDeviceSet = tenantDevices.get(tenant.getId());
-                    if (tenantDeviceSet != null) {
-                        tenantDeviceSet.remove(device.getId());
+            TextPageLink pageLink = new TextPageLink(initFetchPackSize);
+            while (pageLink != null) {
+                TextPageData<Device> page = deviceService.findDevicesByTenantId(tenant.getId(), pageLink);
+                pageLink = page.getNextPageLink();
+                for (Device device : page.getData()) {
+                    if (!routingService.resolveById(device.getId()).isPresent()) {
+                        if (!deviceStates.containsKey(device.getId())) {
+                            fetchFutures.add(fetchDeviceState(device));
+                        }
+                    } else {
+                        Set<DeviceId> tenantDeviceSet = tenantDevices.get(tenant.getId());
+                        if (tenantDeviceSet != null) {
+                            tenantDeviceSet.remove(device.getId());
+                        }
+                        deviceStates.remove(device.getId());
                     }
-                    deviceStates.remove(device.getId());
                 }
-            }
-            try {
-                Futures.successfulAsList(fetchFutures).get().forEach(this::addDeviceUsingState);
-            } catch (InterruptedException | ExecutionException e) {
-                log.warn("Failed to init device state service from DB", e);
+                try {
+                    Futures.successfulAsList(fetchFutures).get().forEach(this::addDeviceUsingState);
+                } catch (InterruptedException | ExecutionException e) {
+                    log.warn("Failed to init device state service from DB", e);
+                }
             }
         }
     }