tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed Shutdown behaviour

pull/1199/head
Andrew Shvayka 8 years ago
parent
8523ebdaa4
commit
0723988061
2 changed files with 6 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java
  2. 9
      dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java

6
application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java
View File

@ -90,7 +90,7 @@ public class DefaultDeviceRpcService implements DeviceRpcService {
@Override @Override
public void processRestAPIRpcRequestToRuleEngine(ToDeviceRpcRequest request, Consumer<FromDeviceRpcResponse> responseConsumer) { public void processRestAPIRpcRequestToRuleEngine(ToDeviceRpcRequest request, Consumer<FromDeviceRpcResponse> responseConsumer) {
log.trace("[{}] Processing local rpc call to rule engine [{}]", request.getTenantId(), request.getDeviceId()); log.trace("[{}][{}] Processing local rpc call to rule engine [{}]", request.getTenantId(), request.getId(), request.getDeviceId());
UUID requestId = request.getId(); UUID requestId = request.getId();
localToRuleEngineRpcRequests.put(requestId, responseConsumer); localToRuleEngineRpcRequests.put(requestId, responseConsumer);
sendRpcRequestToRuleEngine(request); sendRpcRequestToRuleEngine(request);
@ -110,7 +110,7 @@ public class DefaultDeviceRpcService implements DeviceRpcService {
@Override @Override
public void processRpcRequestToDevice(ToDeviceRpcRequest request, Consumer<FromDeviceRpcResponse> responseConsumer) { public void processRpcRequestToDevice(ToDeviceRpcRequest request, Consumer<FromDeviceRpcResponse> responseConsumer) {
log.trace("[{}] Processing local rpc call to device [{}]", request.getTenantId(), request.getDeviceId()); log.trace("[{}][{}] Processing local rpc call to device [{}]", request.getTenantId(), request.getId(), request.getDeviceId());
UUID requestId = request.getId(); UUID requestId = request.getId();
localToDeviceRpcRequests.put(requestId, responseConsumer); localToDeviceRpcRequests.put(requestId, responseConsumer);
sendRpcRequestToDevice(request); sendRpcRequestToDevice(request);
@ -119,7 +119,7 @@ public class DefaultDeviceRpcService implements DeviceRpcService {
@Override @Override
public void processRpcResponseFromDevice(FromDeviceRpcResponse response) { public void processRpcResponseFromDevice(FromDeviceRpcResponse response) {
log.trace("[{}] response to request: [{}]", this.hashCode(), response.getId()); log.trace("response to request: [{}]", response.getId());
if (routingService.getCurrentServer().equals(response.getServerAddress())) { if (routingService.getCurrentServer().equals(response.getServerAddress())) {
UUID requestId = response.getId(); UUID requestId = response.getId();
Consumer<FromDeviceRpcResponse> consumer = localToDeviceRpcRequests.remove(requestId); Consumer<FromDeviceRpcResponse> consumer = localToDeviceRpcRequests.remove(requestId);

9
dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java
View File

@ -26,7 +26,6 @@ import java.util.UUID;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -46,7 +45,6 @@ public abstract class AbstractBufferedRateExecutor<T extends AsyncTask, F extend
private final ExecutorService callbackExecutor; private final ExecutorService callbackExecutor;
private final ScheduledExecutorService timeoutExecutor; private final ScheduledExecutorService timeoutExecutor;
private final int concurrencyLimit; private final int concurrencyLimit;
private volatile boolean stopped;
protected final AtomicInteger concurrencyLevel = new AtomicInteger(); protected final AtomicInteger concurrencyLevel = new AtomicInteger();
protected final AtomicInteger totalAdded = new AtomicInteger(); protected final AtomicInteger totalAdded = new AtomicInteger();
@ -108,10 +106,7 @@ public abstract class AbstractBufferedRateExecutor<T extends AsyncTask, F extend
AsyncTaskContext<T, V> taskCtx = null; AsyncTaskContext<T, V> taskCtx = null;
try { try {
if (curLvl <= concurrencyLimit) { if (curLvl <= concurrencyLimit) {
taskCtx = queue.poll(1, TimeUnit.SECONDS); taskCtx = queue.take();
if (taskCtx == null) {
continue;
}
final AsyncTaskContext<T, V> finalTaskCtx = taskCtx; final AsyncTaskContext<T, V> finalTaskCtx = taskCtx;
logTask("Processing", finalTaskCtx); logTask("Processing", finalTaskCtx);
concurrencyLevel.incrementAndGet(); concurrencyLevel.incrementAndGet();
@ -151,6 +146,8 @@ public abstract class AbstractBufferedRateExecutor<T extends AsyncTask, F extend
} else { } else {
Thread.sleep(pollMs); Thread.sleep(pollMs);
} }
} catch (InterruptedException e) {
break;
} catch (Throwable e) { } catch (Throwable e) {
if (taskCtx != null) { if (taskCtx != null) {
log.debug("[{}] Failed to execute task: {}", taskCtx.getId(), taskCtx, e); log.debug("[{}] Failed to execute task: {}", taskCtx.getId(), taskCtx, e);

Write Preview
Loading…
Cancel
Save