dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added more debug logs to the device/integration state services and fix return variable

Browse Source
This commit is contained in:
Volodymyr Babak 2021-05-14 09:03:19 +03:00 committed by Andrew Shvayka
parent a96f2d444c
commit fe292248e7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
View File

@ -341,6 +341,7 @@ public class DefaultDeviceStateService extends TbApplicationEventListener<Partit
// Adding only devices that are in new partitions // Adding only devices that are in new partitions
List<Tenant> tenants = tenantService.findTenants(new PageLink(Integer.MAX_VALUE)).getData(); List<Tenant> tenants = tenantService.findTenants(new PageLink(Integer.MAX_VALUE)).getData();
for (Tenant tenant : tenants) { for (Tenant tenant : tenants) {
log.debug("Finding devices for tenant [{}]", tenant.getName());
PageLink pageLink = new PageLink(initFetchPackSize); PageLink pageLink = new PageLink(initFetchPackSize);
while (pageLink != null) { while (pageLink != null) {
List<ListenableFuture<Void>> fetchFutures = new ArrayList<>(); List<ListenableFuture<Void>> fetchFutures = new ArrayList<>();
@ -349,17 +350,23 @@ public class DefaultDeviceStateService extends TbApplicationEventListener<Partit
for (Device device : page.getData()) { for (Device device : page.getData()) {
TopicPartitionInfo tpi = partitionService.resolve(ServiceType.TB_CORE, tenant.getId(), device.getId()); TopicPartitionInfo tpi = partitionService.resolve(ServiceType.TB_CORE, tenant.getId(), device.getId());
if (addedPartitions.contains(tpi)) { if (addedPartitions.contains(tpi)) {
log.debug("[{}][{}] Device belong to current partition. tpi [{}]. Fetching state from DB", device.getName(), device.getId(), tpi);
ListenableFuture<Void> future = Futures.transform(fetchDeviceState(device), new Function<DeviceStateData, Void>() { ListenableFuture<Void> future = Futures.transform(fetchDeviceState(device), new Function<DeviceStateData, Void>() {
@Nullable @Nullable
@Override @Override
public Void apply(@Nullable DeviceStateData state) { public Void apply(@Nullable DeviceStateData state) {
log.debug("[{}][{}] Fetched state from DB [{}]", device.getName(), device.getId(), state);
if (state != null) { if (state != null) {
addDeviceUsingState(tpi, state); addDeviceUsingState(tpi, state);
} else {
log.warn("{}][{}] Fetched null state from DB", device.getName(), device.getId());
} }
return null; return null;
} }
}, executorService); }, executorService);
fetchFutures.add(future); fetchFutures.add(future);
} else {
log.debug("[{}][{}] Device doesn't belong to current partition. tpi [{}]", device.getName(), device.getId(), tpi);
} }
} }
try { try {
@ -475,14 +482,14 @@ public class DefaultDeviceStateService extends TbApplicationEventListener<Partit
TbMsgMetaData md = new TbMsgMetaData(); TbMsgMetaData md = new TbMsgMetaData();
md.putValue("deviceName", device.getName()); md.putValue("deviceName", device.getName());
md.putValue("deviceType", device.getType()); md.putValue("deviceType", device.getType());
DeviceStateData.builder() DeviceStateData deviceStateData = DeviceStateData.builder()
.customerId(device.getCustomerId()) .customerId(device.getCustomerId())
.tenantId(device.getTenantId()) .tenantId(device.getTenantId())
.deviceId(device.getId()) .deviceId(device.getId())
.deviceCreationTime(device.getCreatedTime()) .deviceCreationTime(device.getCreatedTime())
.metaData(md) .metaData(md)
.state(deviceState).build(); .state(deviceState).build();
log.trace("[{}] Fetched device state from the DB {}", device.getId(), deviceStateData); log.debug("[{}] Fetched device state from the DB {}", device.getId(), deviceStateData);
return deviceStateData; return deviceStateData;
} catch (Exception e) { } catch (Exception e) {
log.warn("[{}] Failed to fetch device state data", device.getId(), e); log.warn("[{}] Failed to fetch device state data", device.getId(), e);