tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

improvements due to comments

pull/8212/head
YevhenBondarenko 4 years ago
parent
befa454017
commit
32278beabc
6 changed files with 65 additions and 97 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 68
      application/src/main/java/org/thingsboard/server/service/system/DefaultSystemInfoService.java
  2. 37
      common/queue/src/main/java/org/thingsboard/server/queue/discovery/DefaultTbServiceInfoProvider.java
  3. 2
      common/queue/src/main/java/org/thingsboard/server/queue/discovery/DiscoveryService.java
  4. 5
      common/queue/src/main/java/org/thingsboard/server/queue/discovery/DummyDiscoveryService.java
  5. 7
      common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
  6. 43
      common/util/src/main/java/org/thingsboard/common/util/SystemUtil.java

68
application/src/main/java/org/thingsboard/server/service/system/DefaultSystemInfoService.java
View File

@ -19,7 +19,6 @@ import com.google.common.util.concurrent.FutureCallback;
import com.google.protobuf.ProtocolStringList;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.thingsboard.common.util.JacksonUtil;
import org.thingsboard.common.util.ThingsBoardThreadFactory;
@ -82,19 +81,20 @@ public class DefaultSystemInfoService extends TbApplicationEventListener<Partiti
private final DiscoveryService discoveryService;
private final TelemetrySubscriptionService telemetryService;
private final TbApiUsageStateClient apiUsageStateClient;
private ScheduledExecutorService scheduler;
@Value("${zk.enabled:false}")
private boolean zkEnabled;
private volatile ScheduledExecutorService scheduler;
@Override
protected void onTbApplicationEvent(PartitionChangeEvent partitionChangeEvent) {
if (ServiceType.TB_CORE.equals(partitionChangeEvent.getServiceType())) {
if (scheduler == null && partitionService.resolve(ServiceType.TB_CORE, TenantId.SYS_TENANT_ID, TenantId.SYS_TENANT_ID).isMyPartition()) {
scheduler = Executors.newSingleThreadScheduledExecutor(ThingsBoardThreadFactory.forName("tb-system-info-scheduler"));
scheduler.scheduleAtFixedRate(this::saveCurrentSystemInfo, 0, 1, TimeUnit.MINUTES);
} else {
destroy();
synchronized (this) {
if (partitionService.resolve(ServiceType.TB_CORE, TenantId.SYS_TENANT_ID, TenantId.SYS_TENANT_ID).isMyPartition()) {
if (scheduler == null) {
scheduler = Executors.newSingleThreadScheduledExecutor(ThingsBoardThreadFactory.forName("tb-system-info-scheduler"));
scheduler.scheduleAtFixedRate(this::saveCurrentSystemInfo, 0, 1, TimeUnit.MINUTES);
}
} else {
destroy();
}
}
}
}
@ -105,27 +105,26 @@ public class DefaultSystemInfoService extends TbApplicationEventListener<Partiti
ServiceInfo serviceInfo = serviceInfoProvider.getServiceInfoWithCurrentSystemInfo();
if (zkEnabled) {
systemInfo.setSystemData(getSystemData(serviceInfo));
} else {
if (discoveryService.isMonolith()) {
systemInfo.setMonolith(true);
systemInfo.setSystemData(Collections.singletonList(createSystemInfoData(serviceInfo)));
} else {
systemInfo.setSystemData(getSystemData(serviceInfo));
}
return systemInfo;
}
protected void saveCurrentSystemInfo() {
if (zkEnabled) {
saveCurrentClusterSystemInfo();
} else {
if (discoveryService.isMonolith()) {
saveCurrentMonolithSystemInfo();
} else {
saveCurrentClusterSystemInfo();
}
}
private void saveCurrentClusterSystemInfo() {
long ts = System.currentTimeMillis();
List<SystemInfoData> clusterSystemData = getSystemData(serviceInfoProvider.getServiceInfoWithCurrentSystemInfo());
BasicTsKvEntry clusterDataKv = new BasicTsKvEntry(ts, new JsonDataEntry("clusterSystemData", JacksonUtil.toString(clusterSystemData)));
doSave(Collections.singletonList(clusterDataKv));
@ -135,34 +134,13 @@ public class DefaultSystemInfoService extends TbApplicationEventListener<Partiti
long ts = System.currentTimeMillis();
List<TsKvEntry> tsList = new ArrayList<>();
Long memoryUsage = getMemoryUsage();
if (memoryUsage != null) {
tsList.add(new BasicTsKvEntry(ts, new LongDataEntry("memoryUsage", memoryUsage)));
}
Long totalMemory = getTotalMemory();
if (totalMemory != null) {
tsList.add(new BasicTsKvEntry(ts, new LongDataEntry("totalMemory", totalMemory)));
}
Long freeMemory = getFreeMemory();
if (freeMemory != null) {
tsList.add(new BasicTsKvEntry(ts, new LongDataEntry("freeMemory", freeMemory)));
}
Double cpuUsage = getCpuUsage();
if (cpuUsage != null) {
tsList.add(new BasicTsKvEntry(ts, new DoubleDataEntry("cpuUsage", cpuUsage)));
}
Double totalCpuUsage = getTotalCpuUsage();
if (totalCpuUsage != null) {
tsList.add(new BasicTsKvEntry(ts, new DoubleDataEntry("totalCpuUsage", totalCpuUsage)));
}
Long freeDiscSpace = getFreeDiscSpace();
if (freeDiscSpace != null) {
tsList.add(new BasicTsKvEntry(ts, new LongDataEntry("freeDiscSpace", freeDiscSpace)));
}
Long totalDiscSpace = getTotalDiscSpace();
if (totalDiscSpace != null) {
tsList.add(new BasicTsKvEntry(ts, new LongDataEntry("totalDiscSpace", totalDiscSpace)));
}
getMemoryUsage().ifPresent(v -> tsList.add(new BasicTsKvEntry(ts, new LongDataEntry("memoryUsage", v))));
getTotalMemory().ifPresent(v -> tsList.add(new BasicTsKvEntry(ts, new LongDataEntry("totalMemory", v))));
getFreeMemory().ifPresent(v -> tsList.add(new BasicTsKvEntry(ts, new LongDataEntry("freeMemory", v))));
getCpuUsage().ifPresent(v -> tsList.add(new BasicTsKvEntry(ts, new DoubleDataEntry("cpuUsage", v))));
getTotalCpuUsage().ifPresent(v -> tsList.add(new BasicTsKvEntry(ts, new DoubleDataEntry("totalCpuUsage", v))));
getFreeDiscSpace().ifPresent(v -> tsList.add(new BasicTsKvEntry(ts, new LongDataEntry("freeDiscSpace", v))));
getTotalDiscSpace().ifPresent(v -> tsList.add(new BasicTsKvEntry(ts, new LongDataEntry("totalDiscSpace", v))));
doSave(tsList);
}

37
common/queue/src/main/java/org/thingsboard/server/queue/discovery/DefaultTbServiceInfoProvider.java
View File

@ -37,9 +37,9 @@ import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import static org.thingsboard.common.util.SystemUtil.getFreeMemory;
import static org.thingsboard.common.util.SystemUtil.getCpuUsage;
import static org.thingsboard.common.util.SystemUtil.getFreeDiscSpace;
import static org.thingsboard.common.util.SystemUtil.getFreeMemory;
import static org.thingsboard.common.util.SystemUtil.getMemoryUsage;
import static org.thingsboard.common.util.SystemUtil.getTotalCpuUsage;
import static org.thingsboard.common.util.SystemUtil.getTotalDiscSpace;
@ -118,34 +118,13 @@ public class DefaultTbServiceInfoProvider implements TbServiceInfoProvider {
private TransportProtos.SystemInfoProto getCurrentSystemInfoProto() {
TransportProtos.SystemInfoProto.Builder builder = TransportProtos.SystemInfoProto.newBuilder();
Long memoryUsage = getMemoryUsage();
if (memoryUsage != null) {
builder.setMemoryUsage(memoryUsage);
}
Long totalMemory = getTotalMemory();
if (totalMemory != null) {
builder.setTotalMemory(totalMemory);
}
Long freeMemory = getFreeMemory();
if (freeMemory != null) {
builder.setFreeMemory(freeMemory);
}
Double cpuUsage = getCpuUsage();
if (cpuUsage != null) {
builder.setCpuUsage(cpuUsage);
}
Double totalCpuUsage = getTotalCpuUsage();
if (totalCpuUsage != null) {
builder.setTotalCpuUsage(totalCpuUsage);
}
Long freeDiscSpace = getFreeDiscSpace();
if (freeDiscSpace != null) {
builder.setFreeDiscSpace(freeDiscSpace);
}
Long totalDiscSpace = getTotalDiscSpace();
if (totalDiscSpace != null) {
builder.setTotalDiscSpace(totalDiscSpace);
}
getMemoryUsage().ifPresent(builder::setMemoryUsage);
getTotalMemory().ifPresent(builder::setTotalMemory);
getFreeMemory().ifPresent(builder::setFreeMemory);
getCpuUsage().ifPresent(builder::setCpuUsage);
getTotalCpuUsage().ifPresent(builder::setTotalCpuUsage);
getFreeDiscSpace().ifPresent(builder::setFreeDiscSpace);
getTotalDiscSpace().ifPresent(builder::setTotalDiscSpace);
return builder.build();
}

2
common/queue/src/main/java/org/thingsboard/server/queue/discovery/DiscoveryService.java
View File

@ -23,4 +23,6 @@ public interface DiscoveryService {
List<TransportProtos.ServiceInfo> getOtherServers();
boolean isMonolith();
}

5
common/queue/src/main/java/org/thingsboard/server/queue/discovery/DummyDiscoveryService.java
View File

@ -52,4 +52,9 @@ public class DummyDiscoveryService implements DiscoveryService {
public List<TransportProtos.ServiceInfo> getOtherServers() {
return Collections.emptyList();
}
@Override
public boolean isMonolith() {
return true;
}
}

7
common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
View File

@ -115,6 +115,11 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
.collect(Collectors.toList());
}
@Override
public boolean isMonolith() {
return false;
}
@AfterStartUp(order = AfterStartUp.DISCOVERY_SERVICE)
public void onApplicationEvent(ApplicationReadyEvent event) {
if (stopped) {
@ -288,8 +293,6 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
case CHILD_REMOVED:
recalculatePartitions();
break;
case CHILD_UPDATED:
break;
default:
break;
}

43
common/util/src/main/java/org/thingsboard/common/util/SystemUtil.java
View File

@ -24,6 +24,7 @@ import java.lang.management.MemoryMXBean;
import java.nio.file.FileStore;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Optional;
@Slf4j
public class SystemUtil {
@ -35,70 +36,70 @@ public class SystemUtil {
HARDWARE = si.getHardware();
}
public static Long getMemoryUsage() {
public static Optional<Long> getMemoryUsage() {
try {
MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean();
return memoryMXBean.getHeapMemoryUsage().getUsed();
return Optional.of(memoryMXBean.getHeapMemoryUsage().getUsed());
} catch (Exception e) {
log.debug("Failed to get memory usage!!!", e);
}
return null;
return Optional.empty();
}
public static Long getTotalMemory() {
public static Optional<Long> getTotalMemory() {
try {
return HARDWARE.getMemory().getTotal();
return Optional.of(HARDWARE.getMemory().getTotal());
} catch (Exception e) {
log.debug("Failed to get total memory!!!", e);
}
return null;
return Optional.empty();
}
public static Long getFreeMemory() {
public static Optional<Long> getFreeMemory() {
try {
return HARDWARE.getMemory().getAvailable();
return Optional.of(HARDWARE.getMemory().getAvailable());
} catch (Exception e) {
log.debug("Failed to get free memory!!!", e);
}
return null;
return Optional.empty();
}
public static Double getCpuUsage() {
public static Optional<Double> getCpuUsage() {
try {
return prepare(HARDWARE.getProcessor().getSystemLoadAverage());
return Optional.of(prepare(HARDWARE.getProcessor().getSystemLoadAverage()));
} catch (Exception e) {
log.debug("Failed to get cpu usage!!!", e);
}
return null;
return Optional.empty();
}
public static Double getTotalCpuUsage() {
public static Optional<Double> getTotalCpuUsage() {
try {
return prepare(HARDWARE.getProcessor().getSystemCpuLoad() * 100);
return Optional.of(prepare(HARDWARE.getProcessor().getSystemCpuLoad() * 100));
} catch (Exception e) {
log.debug("Failed to get total cpu usage!!!", e);
}
return null;
return Optional.empty();
}
public static Long getFreeDiscSpace() {
public static Optional<Long> getFreeDiscSpace() {
try {
FileStore store = Files.getFileStore(Paths.get("/"));
return store.getUsableSpace();
return Optional.of(store.getUsableSpace());
} catch (Exception e) {
log.debug("Failed to get free disc space!!!", e);
}
return null;
return Optional.empty();
}
public static Long getTotalDiscSpace() {
public static Optional<Long> getTotalDiscSpace() {
try {
FileStore store = Files.getFileStore(Paths.get("/"));
return store.getTotalSpace();
return Optional.of(store.getTotalSpace());
} catch (Exception e) {
log.debug("Failed to get total disc space!!!", e);
}
return null;
return Optional.empty();
}
private static Double prepare(Double d) {

Write Preview
Loading…
Cancel
Save