Browse Source

Revert "BurstTbRuleEngineSubmitStrategy debug notes to fix the long-running testTheCopyOfAttrsIntoTSForTheView"

This reverts commit 1600fa7f65.
pull/6431/head
Sergey Matvienko 4 years ago
parent
commit
b6911bda41
  1. 1
      application/src/main/java/org/thingsboard/server/service/queue/processing/BurstTbRuleEngineSubmitStrategy.java
  2. 3
      application/src/test/resources/logback-test.xml
  3. 7
      common/actor/src/main/java/org/thingsboard/server/actors/TbActorMailbox.java

1
application/src/main/java/org/thingsboard/server/service/queue/processing/BurstTbRuleEngineSubmitStrategy.java

@ -33,7 +33,6 @@ public class BurstTbRuleEngineSubmitStrategy extends AbstractTbRuleEngineSubmitS
public void submitAttempt(BiConsumer<UUID, TbProtoQueueMsg<TransportProtos.ToRuleEngineMsg>> msgConsumer) {
if (log.isDebugEnabled()) {
log.debug("[{}] submitting [{}] messages to rule engine", queueName, orderedMsgList.size());
orderedMsgList.forEach((pair)->log.trace("submitted uuid {}, msg {}", pair.uuid, pair.msg));
}
orderedMsgList.forEach(pair -> msgConsumer.accept(pair.uuid, pair.msg));
}

3
application/src/test/resources/logback-test.xml

@ -16,9 +16,6 @@
<logger name="org.cassandraunit" level="INFO"/>
<logger name="org.eclipse.leshan" level="INFO"/>
<logger name="org.thingsboard.server.actors.service.ContextAwareActor" level="TRACE"/>
<logger name="org.thingsboard.server.service.queue.processing.BurstTbRuleEngineSubmitStrategy" level="TRACE"/>
<logger name="org.thingsboard.server.service.queue.TbMsgPackCallback" level="TRACE"/>
<root level="WARN">
<appender-ref ref="console"/>

7
common/actor/src/main/java/org/thingsboard/server/actors/TbActorMailbox.java

@ -141,7 +141,6 @@ public final class TbActorMailbox implements TbActorCtx {
log.debug("[{}] Going to process message: {}", selfId, msg);
actor.process(msg);
} catch (TbRuleNodeUpdateException updateException) {
log.debug("[{}] INIT_FAILED: {} {}", selfId, msg, updateException);
stopReason = TbActorStopReason.INIT_FAILED;
destroy();
} catch (Throwable t) {
@ -156,12 +155,6 @@ public final class TbActorMailbox implements TbActorCtx {
break;
}
}
if (noMoreElements && (!normalPriorityMsgs.isEmpty() || !highPriorityMsgs.isEmpty())) {
log.error("noMoreElements=true, but mailbox is not empty!");
}
if (noMoreElements == false && (normalPriorityMsgs.isEmpty() && highPriorityMsgs.isEmpty())) {
log.error("noMoreElements=false, but mailbox is empty!");
}
if (noMoreElements) {
busy.set(FREE);
dispatcher.getExecutor().execute(() -> tryProcessQueue(false));

Loading…
Cancel
Save