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

Edge session send donwlink msgs refactoring

Browse Source
This commit is contained in:
Volodymyr Babak 2021-05-18 11:03:52 +03:00
parent 71791c6847
commit bb064cbbbd
1 changed files with 18 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
View File

@ -242,7 +242,7 @@ public final class EdgeGrpcSession implements Closeable {
EdgeEvent customerEdgeEvent = EdgeEventUtils.constructEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEvent customerEdgeEvent = EdgeEventUtils.constructEdgeEvent(edge.getTenantId(), edge.getId(),
EdgeEventType.CUSTOMER, EdgeEventActionType.ADDED, edge.getCustomerId(), null); EdgeEventType.CUSTOMER, EdgeEventActionType.ADDED, edge.getCustomerId(), null);
DownlinkMsg customerDownlinkMsg = convertToDownlinkMsg(customerEdgeEvent); DownlinkMsg customerDownlinkMsg = convertToDownlinkMsg(customerEdgeEvent);
sendSingleDownlinkMsg(customerDownlinkMsg); sendDownlinkMsgsPack(Collections.singletonList(customerDownlinkMsg));
startProcessingEdgeEvents(new CustomerUsersEdgeEventFetcher(ctx.getUserService(), edge.getCustomerId())); startProcessingEdgeEvents(new CustomerUsersEdgeEventFetcher(ctx.getUserService(), edge.getCustomerId()));
} }
@ -256,7 +256,7 @@ public final class EdgeGrpcSession implements Closeable {
DownlinkMsg syncCompleteDownlinkMsg = DownlinkMsg.newBuilder() DownlinkMsg syncCompleteDownlinkMsg = DownlinkMsg.newBuilder()
.setSyncCompletedMsg(SyncCompletedMsg.newBuilder().build()) .setSyncCompletedMsg(SyncCompletedMsg.newBuilder().build())
.build(); .build();
sendSingleDownlinkMsg(syncCompleteDownlinkMsg); sendDownlinkMsgsPack(Collections.singletonList(syncCompleteDownlinkMsg));
} catch (Exception e) { } catch (Exception e) {
log.error("[{}][{}] Exception during sync process", edge.getTenantId(), edge.getId(), e); log.error("[{}][{}] Exception during sync process", edge.getTenantId(), edge.getId(), e);
} }
@ -345,59 +345,37 @@ public final class EdgeGrpcSession implements Closeable {
PageLink pageLink = fetcher.getPageLink(ctx.getEdgeEventStorageSettings().getMaxReadRecordsCount()); PageLink pageLink = fetcher.getPageLink(ctx.getEdgeEventStorageSettings().getMaxReadRecordsCount());
PageData<EdgeEvent> pageData; PageData<EdgeEvent> pageData;
UUID ifOffset = null; UUID ifOffset = null;
boolean success = true; boolean success;
do { do {
pageData = fetcher.fetchEdgeEvents(edge.getTenantId(), edge.getId(), pageLink); pageData = fetcher.fetchEdgeEvents(edge.getTenantId(), edge.getId(), pageLink);
if (isConnected() && !pageData.getData().isEmpty()) { if (isConnected() && !pageData.getData().isEmpty()) {
log.trace("[{}] [{}] event(s) are going to be processed.", this.sessionId, pageData.getData().size()); log.trace("[{}] [{}] event(s) are going to be processed.", this.sessionId, pageData.getData().size());
List<DownlinkMsg> downlinkMsgsPack = convertToDownlinkMsgsPack(pageData.getData());
success = processEdgeEventsPack(pageData.getData()); success = sendDownlinkMsgsPack(downlinkMsgsPack);
ifOffset = pageData.getData().get(pageData.getData().size() - 1).getUuidId(); ifOffset = pageData.getData().get(pageData.getData().size() - 1).getUuidId();
}
if (isConnected() && (!success || pageData.hasNext())) {
try {
Thread.sleep(ctx.getEdgeEventStorageSettings().getSleepIntervalBetweenBatches());
} catch (InterruptedException e) {
log.error("[{}] Error during sleep between batches", this.sessionId, e);
}
if (success) { if (success) {
pageLink = pageLink.nextPageLink(); pageLink = pageLink.nextPageLink();
} }
} else {
log.trace("[{}] no event(s) found. Stop processing edge events", this.sessionId);
} }
} while (isConnected() && (!success || pageData.hasNext())); } while (isConnected() && pageData.hasNext());
return ifOffset; return ifOffset;
} }
private boolean processEdgeEventsPack(List<EdgeEvent> edgeEvents) throws InterruptedException { private boolean sendDownlinkMsgsPack(List<DownlinkMsg> downlinkMsgsPack) throws InterruptedException {
List<DownlinkMsg> downlinkMsgsPack = convertToDownlinkMsgsPack(edgeEvents); boolean success;
do {
log.trace("[{}] [{}] downlink msg(s) are going to be send.", this.sessionId, downlinkMsgsPack.size()); log.trace("[{}] [{}] downlink msg(s) are going to be send.", this.sessionId, downlinkMsgsPack.size());
latch = new CountDownLatch(downlinkMsgsPack.size()); latch = new CountDownLatch(downlinkMsgsPack.size());
for (DownlinkMsg downlinkMsg : downlinkMsgsPack) { for (DownlinkMsg downlinkMsg : downlinkMsgsPack) {
sendDownlinkMsg(ResponseMsg.newBuilder() sendDownlinkMsg(ResponseMsg.newBuilder()
.setDownlinkMsg(downlinkMsg) .setDownlinkMsg(downlinkMsg)
.build()); .build());
} }
boolean success = latch.await(10, TimeUnit.SECONDS);
if (!success) {
log.warn("[{}] Failed to deliver the batch: {}", this.sessionId, downlinkMsgsPack);
}
return success;
}
private void sendSingleDownlinkMsg(DownlinkMsg downlinkMsg) throws InterruptedException {
boolean success;
do {
latch = new CountDownLatch(1);
sendDownlinkMsg(ResponseMsg.newBuilder()
.setDownlinkMsg(downlinkMsg)
.build());
success = latch.await(10, TimeUnit.SECONDS); success = latch.await(10, TimeUnit.SECONDS);
if (!success) { if (!success) {
log.warn("[{}] Failed to deliver single downlink msg!", this.sessionId); log.warn("[{}] Failed to deliver the batch: {}", this.sessionId, downlinkMsgsPack);
} }
if (isConnected() && !success) { if (isConnected() && !success) {
try { try {
@ -407,6 +385,7 @@ public final class EdgeGrpcSession implements Closeable {
} }
} }
} while (isConnected() && !success); } while (isConnected() && !success);
return success;
} }
private DownlinkMsg convertToDownlinkMsg(EdgeEvent edgeEvent) { private DownlinkMsg convertToDownlinkMsg(EdgeEvent edgeEvent) {