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

removed ScheduledFuture from ToDeviceRpcRequestMetadata and updated logic in DeviceActorMessageProcessor

Browse Source
This commit is contained in:
ShvaykaD 2023-08-03 12:05:05 +03:00
parent d46bd36c87
commit ad912e1d28
2 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
View File

@ -136,6 +136,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
private String deviceType; private String deviceType;
private TbMsgMetaData defaultMetaData; private TbMsgMetaData defaultMetaData;
private EdgeId edgeId; private EdgeId edgeId;
private ScheduledFuture<?> awaitRpcResponseFuture;
DeviceActorMessageProcessor(ActorSystemContext systemContext, TenantId tenantId, DeviceId deviceId) { DeviceActorMessageProcessor(ActorSystemContext systemContext, TenantId tenantId, DeviceId deviceId) {
super(systemContext); super(systemContext);
@ -311,9 +312,9 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
} }
Integer requestId = entry.getKey(); Integer requestId = entry.getKey();
if (entry.getValue().isDelivered()) { if (entry.getValue().isDelivered()) {
var md = toDeviceRpcPendingMap.remove(requestId); toDeviceRpcPendingMap.remove(requestId);
if (rpcSubmitStrategy.equals(RpcSubmitStrategy.SEQUENTIAL_ON_RESPONSE_FROM_DEVICE)) { if (rpcSubmitStrategy.equals(RpcSubmitStrategy.SEQUENTIAL_ON_RESPONSE_FROM_DEVICE)) {
clearAwaitRpcResponseScheduler(md); clearAwaitRpcResponseScheduler();
sendNextPendingRequest(rpcId, requestId, "Removed pending RPC!"); sendNextPendingRequest(rpcId, requestId, "Removed pending RPC!");
} }
return; return;
@ -355,7 +356,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
return; return;
} }
if (rpcSubmitStrategy.equals(RpcSubmitStrategy.SEQUENTIAL_ON_RESPONSE_FROM_DEVICE)) { if (rpcSubmitStrategy.equals(RpcSubmitStrategy.SEQUENTIAL_ON_RESPONSE_FROM_DEVICE)) {
clearAwaitRpcResponseScheduler(requestMd); clearAwaitRpcResponseScheduler();
sendNextPendingRequest(rpcId, requestId, "Pending RPC timeout detected!"); sendNextPendingRequest(rpcId, requestId, "Pending RPC timeout detected!");
} }
} }
@ -390,9 +391,9 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
.findFirst().filter(entry -> { .findFirst().filter(entry -> {
var md = entry.getValue(); var md = entry.getValue();
if (md.isDelivered()) { if (md.isDelivered()) {
if (md.getAwaitRpcResponseFuture() == null || md.getAwaitRpcResponseFuture().isCancelled()) { if (awaitRpcResponseFuture == null || awaitRpcResponseFuture.isCancelled()) {
var toDeviceRpcRequest = md.getMsg().getMsg(); var toDeviceRpcRequest = md.getMsg().getMsg();
scheduleAwaitRpcResponseFuture(toDeviceRpcRequest.getId(), entry.getKey()); awaitRpcResponseFuture = scheduleAwaitRpcResponseFuture(toDeviceRpcRequest.getId(), entry.getKey());
} }
return false; return false;
} }
@ -649,7 +650,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
} }
} finally { } finally {
if (rpcSubmitStrategy.equals(RpcSubmitStrategy.SEQUENTIAL_ON_RESPONSE_FROM_DEVICE)) { if (rpcSubmitStrategy.equals(RpcSubmitStrategy.SEQUENTIAL_ON_RESPONSE_FROM_DEVICE)) {
clearAwaitRpcResponseScheduler(requestMd); clearAwaitRpcResponseScheduler();
String errorResponse = hasError ? "error " : ""; String errorResponse = hasError ? "error " : "";
String rpcState = delivered ? "" : "undelivered "; String rpcState = delivered ? "" : "undelivered ";
sendNextPendingRequest(rpcId, requestId, String.format("Received %sresponse for %sRPC!", errorResponse, rpcState)); sendNextPendingRequest(rpcId, requestId, String.format("Received %sresponse for %sRPC!", errorResponse, rpcState));
@ -685,7 +686,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
} else { } else {
md.setDelivered(true); md.setDelivered(true);
if (rpcSubmitStrategy.equals(RpcSubmitStrategy.SEQUENTIAL_ON_RESPONSE_FROM_DEVICE)) { if (rpcSubmitStrategy.equals(RpcSubmitStrategy.SEQUENTIAL_ON_RESPONSE_FROM_DEVICE)) {
md.setAwaitRpcResponseFuture(scheduleAwaitRpcResponseFuture(rpcId, requestId)); awaitRpcResponseFuture = scheduleAwaitRpcResponseFuture(rpcId, requestId);
} }
} }
} else if (status.equals(RpcStatus.TIMEOUT)) { } else if (status.equals(RpcStatus.TIMEOUT)) {
@ -740,7 +741,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
if (subscribeCmd.getUnsubscribe()) { if (subscribeCmd.getUnsubscribe()) {
log.debug("[{}] Canceling RPC subscription for session: [{}]", deviceId, sessionId); log.debug("[{}] Canceling RPC subscription for session: [{}]", deviceId, sessionId);
rpcSubscriptions.remove(sessionId); rpcSubscriptions.remove(sessionId);
clearAwaitRpcResponseSchedulers(); clearAwaitRpcResponseScheduler();
return; return;
} }
SessionInfoMetaData sessionMD = sessions.get(sessionId); SessionInfoMetaData sessionMD = sessions.get(sessionId);
@ -775,7 +776,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
sessions.remove(sessionId); sessions.remove(sessionId);
attributeSubscriptions.remove(sessionId); attributeSubscriptions.remove(sessionId);
rpcSubscriptions.remove(sessionId); rpcSubscriptions.remove(sessionId);
clearAwaitRpcResponseSchedulers(); clearAwaitRpcResponseScheduler();
if (sessions.isEmpty()) { if (sessions.isEmpty()) {
reportSessionClose(); reportSessionClose();
} }
@ -798,20 +799,12 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
}, systemContext.getRpcResponseTimeout(), TimeUnit.MILLISECONDS); }, systemContext.getRpcResponseTimeout(), TimeUnit.MILLISECONDS);
} }
private void clearAwaitRpcResponseSchedulers() { private void clearAwaitRpcResponseScheduler() {
if (rpcSubmitStrategy.equals(RpcSubmitStrategy.SEQUENTIAL_ON_RESPONSE_FROM_DEVICE)) { if (rpcSubmitStrategy.equals(RpcSubmitStrategy.SEQUENTIAL_ON_RESPONSE_FROM_DEVICE) && awaitRpcResponseFuture != null) {
toDeviceRpcPendingMap.forEach((integer, md) -> clearAwaitRpcResponseScheduler(md)); awaitRpcResponseFuture.cancel(true);
} }
} }
private void clearAwaitRpcResponseScheduler(ToDeviceRpcRequestMetadata md) {
var awaitRpcResponseFuture = md.getAwaitRpcResponseFuture();
if (awaitRpcResponseFuture == null) {
return;
}
awaitRpcResponseFuture.cancel(true);
}
private void handleSessionActivity(SessionInfoProto sessionInfoProto, SubscriptionInfoProto subscriptionInfo) { private void handleSessionActivity(SessionInfoProto sessionInfoProto, SubscriptionInfoProto subscriptionInfo) {
UUID sessionId = getSessionId(sessionInfoProto); UUID sessionId = getSessionId(sessionInfoProto);
Objects.requireNonNull(sessionId); Objects.requireNonNull(sessionId);

3
application/src/main/java/org/thingsboard/server/actors/device/ToDeviceRpcRequestMetadata.java
View File

@ -18,8 +18,6 @@ package org.thingsboard.server.actors.device;
import lombok.Data; import lombok.Data;
import org.thingsboard.server.service.rpc.ToDeviceRpcRequestActorMsg; import org.thingsboard.server.service.rpc.ToDeviceRpcRequestActorMsg;
import java.util.concurrent.ScheduledFuture;
/** /**
* @author Andrew Shvayka * @author Andrew Shvayka
*/ */
@ -29,5 +27,4 @@ public class ToDeviceRpcRequestMetadata {
private final boolean sent; private final boolean sent;
private int retries; private int retries;
private boolean delivered; private boolean delivered;
private ScheduledFuture<?> awaitRpcResponseFuture;
} }