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

Added missing fields for RPC message in cluster mode (#13641)

Browse Source
This commit is contained in:
Viacheslav Klimov 2025-06-25 13:29:30 +03:00 committed by GitHub
commit 8505a57710
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/proto/src/main/java/org/thingsboard/server/common/util/ProtoUtils.java
View File

@ -522,7 +522,7 @@ public class ProtoUtils {
} }
private static TransportProtos.ToDeviceRpcRequestActorMsgProto toProto(ToDeviceRpcRequestActorMsg msg) { private static TransportProtos.ToDeviceRpcRequestActorMsgProto toProto(ToDeviceRpcRequestActorMsg msg) {
TransportProtos.ToDeviceRpcRequestMsg proto = TransportProtos.ToDeviceRpcRequestMsg.newBuilder() TransportProtos.ToDeviceRpcRequestMsg.Builder builder = TransportProtos.ToDeviceRpcRequestMsg.newBuilder()
.setMethodName(msg.getMsg().getBody().getMethod()) .setMethodName(msg.getMsg().getBody().getMethod())
.setParams(msg.getMsg().getBody().getParams()) .setParams(msg.getMsg().getBody().getParams())
.setExpirationTime(msg.getMsg().getExpirationTime()) .setExpirationTime(msg.getMsg().getExpirationTime())
@ -530,7 +530,11 @@ public class ProtoUtils {
.setRequestIdLSB(msg.getMsg().getId().getLeastSignificantBits()) .setRequestIdLSB(msg.getMsg().getId().getLeastSignificantBits())
.setOneway(msg.getMsg().isOneway()) .setOneway(msg.getMsg().isOneway())
.setPersisted(msg.getMsg().isPersisted()) .setPersisted(msg.getMsg().isPersisted())
.build(); .setAdditionalInfo(msg.getMsg().getAdditionalInfo());
if (msg.getMsg().getRetries() != null) {
builder.setRetries(msg.getMsg().getRetries());
}
TransportProtos.ToDeviceRpcRequestMsg proto = builder.build();
return TransportProtos.ToDeviceRpcRequestActorMsgProto.newBuilder() return TransportProtos.ToDeviceRpcRequestActorMsgProto.newBuilder()
.setTenantIdMSB(msg.getTenantId().getId().getMostSignificantBits()) .setTenantIdMSB(msg.getTenantId().getId().getMostSignificantBits())
@ -551,7 +555,7 @@ public class ProtoUtils {
toDeviceRpcRequestMsg.getOneway(), toDeviceRpcRequestMsg.getOneway(),
toDeviceRpcRequestMsg.getExpirationTime(), toDeviceRpcRequestMsg.getExpirationTime(),
new ToDeviceRpcRequestBody(toDeviceRpcRequestMsg.getMethodName(), toDeviceRpcRequestMsg.getParams()), new ToDeviceRpcRequestBody(toDeviceRpcRequestMsg.getMethodName(), toDeviceRpcRequestMsg.getParams()),
toDeviceRpcRequestMsg.getPersisted(), 0, ""); toDeviceRpcRequestMsg.getPersisted(), toDeviceRpcRequestMsg.hasRetries() ? toDeviceRpcRequestMsg.getRetries() : null, toDeviceRpcRequestMsg.getAdditionalInfo());
return new ToDeviceRpcRequestActorMsg(proto.getServiceId(), toDeviceRpcRequest); return new ToDeviceRpcRequestActorMsg(proto.getServiceId(), toDeviceRpcRequest);
} }

2
common/proto/src/main/proto/queue.proto
View File

@ -696,6 +696,8 @@ message ToDeviceRpcRequestMsg {
int64 requestIdLSB = 6; int64 requestIdLSB = 6;
bool oneway = 7; bool oneway = 7;
bool persisted = 8; bool persisted = 8;
optional int32 retries = 9;
string additionalInfo = 10;
} }
message ToDeviceRpcResponseMsg { message ToDeviceRpcResponseMsg {