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

Merge pull request #13570 from thingsboard/fix/oom

Browse Source 
Memory usage improvements
This commit is contained in:
Viacheslav Klimov 2025-06-19 08:07:03 +03:00 committed by GitHub
commit a55f4d386a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 26 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/actor/src/main/java/org/thingsboard/server/actors/TbActorMailbox.java
View File

@ -237,8 +237,14 @@ public final class TbActorMailbox implements TbActorCtx {
try {
ready.set(NOT_READY);
actor.destroy(stopReason, cause);
highPriorityMsgs.forEach(msg -> msg.onTbActorStopped(stopReason));
normalPriorityMsgs.forEach(msg -> msg.onTbActorStopped(stopReason));
highPriorityMsgs.removeIf(msg -> {
msg.onTbActorStopped(stopReason);
return true;
});
normalPriorityMsgs.removeIf(msg -> {
msg.onTbActorStopped(stopReason);
return true;
});
} catch (Throwable t) {
log.warn("[{}] Failed to destroy actor: ", selfId, t);
}

2
common/data/src/main/java/org/thingsboard/server/common/data/AdminSettings.java
View File

@ -32,7 +32,7 @@ public class AdminSettings extends BaseData<AdminSettingsId> implements HasTenan
@NoXss
@Length(fieldName = "key")
private String key;
private transient JsonNode jsonValue;
private JsonNode jsonValue;
public AdminSettings() {
super();

2
common/data/src/main/java/org/thingsboard/server/common/data/BaseData.java
View File

@ -53,7 +53,7 @@ public abstract class BaseData<I extends UUIDBased> extends IdBased<I> implement
public int hashCode() {
final int prime = 31;
int result = super.hashCode();
result = prime * result + (int) (createdTime ^ (createdTime >>> 32));
result = prime * result + Long.hashCode(createdTime);
return result;
}

12
common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java
View File

@ -62,9 +62,7 @@ public class RuleNode extends BaseDataWithAdditionalInfo<RuleNodeId> implements
@Schema(description = "Version of rule node configuration. ", example = "0")
private int configurationVersion;
@Schema(description = "JSON with the rule node configuration. Structure depends on the rule node implementation.", implementation = JsonNode.class)
private transient JsonNode configuration;
@JsonIgnore
private byte[] configurationBytes;
private JsonNode configuration;
private RuleNodeId externalId;
@ -92,14 +90,6 @@ public class RuleNode extends BaseDataWithAdditionalInfo<RuleNodeId> implements
return name;
}
public JsonNode getConfiguration() {
return BaseDataWithAdditionalInfo.getJson(() -> configuration, () -> configurationBytes);
}
public void setConfiguration(JsonNode data) {
setJson(data, json -> this.configuration = json, bytes -> this.configurationBytes = bytes);
}
@Schema(description = "JSON object with the Rule Node Id. " +
"Specify this field to update the Rule Node. " +
"Referencing non-existing Rule Node Id will cause error. " +

18
common/data/src/main/java/org/thingsboard/server/common/data/settings/UserSettings.java
View File

@ -15,20 +15,15 @@
*/
package org.thingsboard.server.common.data.settings;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.JsonNode;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.ToString;
import org.thingsboard.server.common.data.id.UserId;
import org.thingsboard.server.common.data.validation.Length;
import org.thingsboard.server.common.data.validation.NoXss;
import java.io.Serializable;
import static org.thingsboard.server.common.data.BaseDataWithAdditionalInfo.getJson;
import static org.thingsboard.server.common.data.BaseDataWithAdditionalInfo.setJson;
@Schema
@Data
public class UserSettings implements Serializable {
@ -46,17 +41,6 @@ public class UserSettings implements Serializable {
@Schema(description = "JSON object with user settings.", implementation = com.fasterxml.jackson.databind.JsonNode.class)
@NoXss
@Length(fieldName = "settings", max = 100000)
private transient JsonNode settings;
private JsonNode settings;
@JsonIgnore
@ToString.Exclude
private byte[] settingsBytes;
public JsonNode getSettings() {
return getJson(() -> settings, () -> settingsBytes);
}
public void setSettings(JsonNode settings) {
setJson(settings, json -> this.settings = json, bytes -> this.settingsBytes = bytes);
}
}

4
common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetType.java
View File

@ -21,15 +21,17 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.thingsboard.server.common.data.id.WidgetTypeId;
import java.util.Optional;
@EqualsAndHashCode(callSuper = true)
@Data
public class WidgetType extends BaseWidgetType {
@Schema(description = "Complex JSON object that describes the widget type", accessMode = Schema.AccessMode.READ_ONLY)
private transient JsonNode descriptor;
private JsonNode descriptor;
public WidgetType() {
super();

2
common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/config/ssl/KeystoreSslCredentials.java
View File

@ -26,7 +26,7 @@ import java.security.GeneralSecurityException;
import java.security.KeyStore;
@Data
@EqualsAndHashCode(callSuper = false)
@EqualsAndHashCode(callSuper = true)
public class KeystoreSslCredentials extends AbstractSslCredentials {
private String type;

2
common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/config/ssl/PemSslCredentials.java
View File

@ -46,7 +46,7 @@ import java.util.List;
import java.util.stream.Collectors;
@Data
@EqualsAndHashCode(callSuper = false)
@EqualsAndHashCode(callSuper = true)
public class PemSslCredentials extends AbstractSslCredentials {
private static final String DEFAULT_KEY_ALIAS = "server";