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

Moved try-catch into loop over versioned node types

Browse Source
This commit is contained in:
ShvaykaD 2024-05-27 19:21:28 +03:00
parent 9273d603e5
commit d35f340abf
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
View File

@ -203,7 +203,6 @@ public class DefaultDataUpdateService implements DataUpdateService {
@Override @Override
public void upgradeRuleNodes() { public void upgradeRuleNodes() {
try {
int totalRuleNodesUpgraded = 0; int totalRuleNodesUpgraded = 0;
log.info("Starting rule nodes upgrade ..."); log.info("Starting rule nodes upgrade ...");
var nodeClassToVersionMap = componentDiscoveryService.getVersionedNodes(); var nodeClassToVersionMap = componentDiscoveryService.getVersionedNodes();
@ -211,6 +210,7 @@ public class DefaultDataUpdateService implements DataUpdateService {
for (var ruleNodeClassInfo : nodeClassToVersionMap) { for (var ruleNodeClassInfo : nodeClassToVersionMap) {
var ruleNodeTypeForLogs = ruleNodeClassInfo.getSimpleName(); var ruleNodeTypeForLogs = ruleNodeClassInfo.getSimpleName();
var toVersion = ruleNodeClassInfo.getCurrentVersion(); var toVersion = ruleNodeClassInfo.getCurrentVersion();
try {
log.debug("Going to check for nodes with type: {} to upgrade to version: {}.", ruleNodeTypeForLogs, toVersion); log.debug("Going to check for nodes with type: {} to upgrade to version: {}.", ruleNodeTypeForLogs, toVersion);
var ruleNodesIdsToUpgrade = getRuleNodesIdsWithTypeAndVersionLessThan(ruleNodeClassInfo.getClassName(), toVersion); var ruleNodesIdsToUpgrade = getRuleNodesIdsWithTypeAndVersionLessThan(ruleNodeClassInfo.getClassName(), toVersion);
if (ruleNodesIdsToUpgrade.isEmpty()) { if (ruleNodesIdsToUpgrade.isEmpty()) {
@ -222,11 +222,11 @@ public class DefaultDataUpdateService implements DataUpdateService {
totalRuleNodesUpgraded += processRuleNodePack(ruleNodePack, ruleNodeClassInfo); totalRuleNodesUpgraded += processRuleNodePack(ruleNodePack, ruleNodeClassInfo);
log.info("{} upgraded rule nodes so far ...", totalRuleNodesUpgraded); log.info("{} upgraded rule nodes so far ...", totalRuleNodesUpgraded);
} }
} catch (Exception e) {
log.error("Unexpected error during {} rule nodes upgrade: ", ruleNodeTypeForLogs, e);
}
} }
log.info("Finished rule nodes upgrade. Upgraded rule nodes count: {}", totalRuleNodesUpgraded); log.info("Finished rule nodes upgrade. Upgraded rule nodes count: {}", totalRuleNodesUpgraded);
} catch (Exception e) {
log.error("Unexpected error during rule nodes upgrade: ", e);
}
} }
private int processRuleNodePack(List<RuleNodeId> ruleNodeIdsBatch, RuleNodeClassInfo ruleNodeClassInfo) { private int processRuleNodePack(List<RuleNodeId> ruleNodeIdsBatch, RuleNodeClassInfo ruleNodeClassInfo) {