Merge remote-tracking branch 'upstream/develop/2.5.3' into feature/edge

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>
         <groupId>org.thingsboard</groupId>
         <groupId>org.thingsboard</groupId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.5.3-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
         <artifactId>thingsboard</artifactId>
     </parent>
     </parent>
     <artifactId>application</artifactId>
     <artifactId>application</artifactId>
@@ -59,6 +59,10 @@
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.thingsboard.common</groupId>
             <groupId>org.thingsboard.common</groupId>
+            <artifactId>actor</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thingsboard.common</groupId>
             <artifactId>util</artifactId>
             <artifactId>util</artifactId>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
@@ -178,14 +182,6 @@
             <artifactId>spring-context-support</artifactId>
             <artifactId>spring-context-support</artifactId>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-actor_${scala.version}</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-slf4j_${scala.version}</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.slf4j</groupId>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
         </dependency>
@@ -375,7 +371,7 @@
         <repository>
         <repository>
             <id>jenkins</id>
             <id>jenkins</id>
             <name>Jenkins Repository</name>
             <name>Jenkins Repository</name>
-            <url>http://repo.jenkins-ci.org/releases</url>
+            <url>https://repo.jenkins-ci.org/releases</url>
             <snapshots>
             <snapshots>
                 <enabled>false</enabled>
                 <enabled>false</enabled>
             </snapshots>
             </snapshots>

@@ -35,7 +35,6 @@
     </appender>
     </appender>
 
 
     <logger name="org.thingsboard.server" level="INFO" />
     <logger name="org.thingsboard.server" level="INFO" />
-    <logger name="akka" level="INFO" />
     <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />
     <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />
 
 
     <root level="INFO">
     <root level="INFO">

@@ -15,9 +15,6 @@
  */
  */
 package org.thingsboard.server.actors;
 package org.thingsboard.server.actors;
 
 
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Scheduler;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -25,8 +22,6 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.MoreExecutors;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -93,12 +88,13 @@ import java.io.StringWriter;
 import java.util.Optional;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicInteger;
 
 
 @Slf4j
 @Slf4j
 @Component
 @Component
 public class ActorSystemContext {
 public class ActorSystemContext {
-    private static final String AKKA_CONF_FILE_NAME = "actor-system.conf";
 
 
     protected final ObjectMapper mapper = new ObjectMapper();
     protected final ObjectMapper mapper = new ObjectMapper();
 
 
@@ -272,14 +268,6 @@ public class ActorSystemContext {
     @Getter
     @Getter
     private long syncSessionTimeout;
     private long syncSessionTimeout;
 
 
-    @Value("${actors.queue.enabled}")
-    @Getter
-    private boolean queuePersistenceEnabled;
-
-    @Value("${actors.queue.timeout}")
-    @Getter
-    private long queuePersistenceTimeout;
-
     @Value("${actors.rule.chain.error_persist_frequency}")
     @Value("${actors.rule.chain.error_persist_frequency}")
     @Getter
     @Getter
     private long ruleChainErrorPersistFrequency;
     private long ruleChainErrorPersistFrequency;
@@ -339,17 +327,14 @@ public class ActorSystemContext {
 
 
     @Getter
     @Getter
     @Setter
     @Setter
-    private ActorSystem actorSystem;
+    private TbActorSystem actorSystem;
 
 
     @Setter
     @Setter
-    private ActorRef appActor;
+    private TbActorRef appActor;
 
 
     @Getter
     @Getter
     @Setter
     @Setter
-    private ActorRef statsActor;
-
-    @Getter
-    private final Config config;
+    private TbActorRef statsActor;
 
 
     @Autowired(required = false)
     @Autowired(required = false)
     @Getter
     @Getter
@@ -363,14 +348,8 @@ public class ActorSystemContext {
     @Getter
     @Getter
     private RedisTemplate<String, Object> redisTemplate;
     private RedisTemplate<String, Object> redisTemplate;
 
 
-    public ActorSystemContext() {
-        config = ConfigFactory.parseResources(AKKA_CONF_FILE_NAME).withFallback(ConfigFactory.load());
-    }
-
-
-
-    public Scheduler getScheduler() {
-        return actorSystem.scheduler();
+    public ScheduledExecutorService getScheduler() {
+        return actorSystem.getScheduler();
     }
     }
 
 
     public void persistError(TenantId tenantId, EntityId entityId, String method, Exception e) {
     public void persistError(TenantId tenantId, EntityId entityId, String method, Exception e) {
@@ -543,7 +522,21 @@ public class ActorSystemContext {
         return Exception.class.isInstance(error) ? (Exception) error : new Exception(error);
         return Exception.class.isInstance(error) ? (Exception) error : new Exception(error);
     }
     }
 
 
-    public void tell(TbActorMsg tbActorMsg, ActorRef sender) {
-        appActor.tell(tbActorMsg, sender);
+    public void tell(TbActorMsg tbActorMsg) {
+        appActor.tell(tbActorMsg);
+    }
+
+    public void tellWithHighPriority(TbActorMsg tbActorMsg) {
+        appActor.tellWithHighPriority(tbActorMsg);
+    }
+
+    public void schedulePeriodicMsgWithDelay(TbActorRef ctx, TbActorMsg msg, long delayInMs, long periodInMs) {
+        log.debug("Scheduling periodic msg {} every {} ms with delay {} ms", msg, periodInMs, delayInMs);
+        getScheduler().scheduleWithFixedDelay(() -> ctx.tell(msg), delayInMs, periodInMs, TimeUnit.MILLISECONDS);
+    }
+
+    public void scheduleMsgWithDelay(TbActorRef ctx, TbActorMsg msg, long delayInMs) {
+        log.debug("Scheduling msg {} with delay {} ms", msg, delayInMs);
+        getScheduler().schedule(() -> ctx.tell(msg), delayInMs, TimeUnit.MILLISECONDS);
     }
     }
 }
 }

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import lombok.RequiredArgsConstructor;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.id.EntityId;
+
+import java.util.function.Predicate;
+
+@RequiredArgsConstructor
+public class TbEntityTypeActorIdPredicate implements Predicate<TbActorId> {
+
+    private final EntityType entityType;
+
+    @Override
+    public boolean test(TbActorId actorId) {
+        return actorId instanceof TbEntityActorId && testEntityId(((TbEntityActorId) actorId).getEntityId());
+    }
+
+    protected boolean testEntityId(EntityId entityId) {
+        return entityId.getEntityType().equals(entityType);
+    }
+}

@@ -15,21 +15,19 @@
  */
  */
 package org.thingsboard.server.actors.app;
 package org.thingsboard.server.actors.app;
 
 
-import akka.actor.ActorRef;
-import akka.actor.LocalActorRef;
-import akka.actor.OneForOneStrategy;
-import akka.actor.Props;
-import akka.actor.SupervisorStrategy;
-import akka.actor.Terminated;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
+import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.TbActor;
+import org.thingsboard.server.actors.TbActorId;
+import org.thingsboard.server.actors.TbActorRef;
+import org.thingsboard.server.actors.TbEntityActorId;
 import org.thingsboard.server.actors.service.ContextAwareActor;
 import org.thingsboard.server.actors.service.ContextAwareActor;
 import org.thingsboard.server.actors.service.ContextBasedCreator;
 import org.thingsboard.server.actors.service.ContextBasedCreator;
 import org.thingsboard.server.actors.service.DefaultActorService;
 import org.thingsboard.server.actors.service.DefaultActorService;
 import org.thingsboard.server.actors.tenant.TenantActor;
 import org.thingsboard.server.actors.tenant.TenantActor;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageDataIterable;
 import org.thingsboard.server.common.data.page.PageDataIterable;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
@@ -43,38 +41,27 @@ import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.service.transport.msg.TransportToDeviceActorMsgWrapper;
 import org.thingsboard.server.service.transport.msg.TransportToDeviceActorMsgWrapper;
-import scala.concurrent.duration.Duration;
 
 
 import java.util.HashSet;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Optional;
 import java.util.Set;
 import java.util.Set;
 
 
+@Slf4j
 public class AppActor extends ContextAwareActor {
 public class AppActor extends ContextAwareActor {
 
 
     private static final TenantId SYSTEM_TENANT = new TenantId(ModelConstants.NULL_UUID);
     private static final TenantId SYSTEM_TENANT = new TenantId(ModelConstants.NULL_UUID);
     private final TenantService tenantService;
     private final TenantService tenantService;
-    private final BiMap<TenantId, ActorRef> tenantActors;
     private final Set<TenantId> deletedTenants;
     private final Set<TenantId> deletedTenants;
     private boolean ruleChainsInitialized;
     private boolean ruleChainsInitialized;
 
 
     private AppActor(ActorSystemContext systemContext) {
     private AppActor(ActorSystemContext systemContext) {
         super(systemContext);
         super(systemContext);
         this.tenantService = systemContext.getTenantService();
         this.tenantService = systemContext.getTenantService();
-        this.tenantActors = HashBiMap.create();
         this.deletedTenants = new HashSet<>();
         this.deletedTenants = new HashSet<>();
     }
     }
 
 
     @Override
     @Override
-    public SupervisorStrategy supervisorStrategy() {
-        return strategy;
-    }
-
-    @Override
-    public void preStart() {
-    }
-
-    @Override
-    protected boolean process(TbActorMsg msg) {
+    protected boolean doProcess(TbActorMsg msg) {
         if (!ruleChainsInitialized) {
         if (!ruleChainsInitialized) {
             initTenantActors();
             initTenantActors();
             ruleChainsInitialized = true;
             ruleChainsInitialized = true;
@@ -86,7 +73,7 @@ public class AppActor extends ContextAwareActor {
             case APP_INIT_MSG:
             case APP_INIT_MSG:
                 break;
                 break;
             case PARTITION_CHANGE_MSG:
             case PARTITION_CHANGE_MSG:
-                broadcast(msg);
+                ctx.broadcastToChildren(msg);
                 break;
                 break;
             case COMPONENT_LIFE_CYCLE_MSG:
             case COMPONENT_LIFE_CYCLE_MSG:
                 onComponentLifecycleMsg((ComponentLifecycleMsg) msg);
                 onComponentLifecycleMsg((ComponentLifecycleMsg) msg);
@@ -95,12 +82,14 @@ public class AppActor extends ContextAwareActor {
                 onQueueToRuleEngineMsg((QueueToRuleEngineMsg) msg);
                 onQueueToRuleEngineMsg((QueueToRuleEngineMsg) msg);
                 break;
                 break;
             case TRANSPORT_TO_DEVICE_ACTOR_MSG:
             case TRANSPORT_TO_DEVICE_ACTOR_MSG:
+                onToDeviceActorMsg((TenantAwareMsg) msg, false);
+                break;
             case DEVICE_ATTRIBUTES_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_ATTRIBUTES_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_CREDENTIALS_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_CREDENTIALS_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_NAME_OR_TYPE_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_NAME_OR_TYPE_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG:
             case DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG:
             case SERVER_RPC_RESPONSE_TO_DEVICE_ACTOR_MSG:
             case SERVER_RPC_RESPONSE_TO_DEVICE_ACTOR_MSG:
-                onToDeviceActorMsg((TenantAwareMsg) msg);
+                onToDeviceActorMsg((TenantAwareMsg) msg, true);
                 break;
                 break;
             default:
             default:
                 return false;
                 return false;
@@ -145,19 +134,15 @@ public class AppActor extends ContextAwareActor {
             msg.getTbMsg().getCallback().onFailure(new RuleEngineException("Message has system tenant id!"));
             msg.getTbMsg().getCallback().onFailure(new RuleEngineException("Message has system tenant id!"));
         } else {
         } else {
             if (!deletedTenants.contains(msg.getTenantId())) {
             if (!deletedTenants.contains(msg.getTenantId())) {
-                getOrCreateTenantActor(msg.getTenantId()).tell(msg, self());
+                getOrCreateTenantActor(msg.getTenantId()).tell(msg);
             } else {
             } else {
                 msg.getTbMsg().getCallback().onSuccess();
                 msg.getTbMsg().getCallback().onSuccess();
             }
             }
         }
         }
     }
     }
 
 
-    protected void broadcast(Object msg) {
-        tenantActors.values().forEach(actorRef -> actorRef.tell(msg, ActorRef.noSender()));
-    }
-
     private void onComponentLifecycleMsg(ComponentLifecycleMsg msg) {
     private void onComponentLifecycleMsg(ComponentLifecycleMsg msg) {
-        ActorRef target = null;
+        TbActorRef target = null;
         if (SYSTEM_TENANT.equals(msg.getTenantId())) {
         if (SYSTEM_TENANT.equals(msg.getTenantId())) {
             log.warn("Message has system tenant id: {}", msg);
             log.warn("Message has system tenant id: {}", msg);
         } else {
         } else {
@@ -166,25 +151,26 @@ public class AppActor extends ContextAwareActor {
                 log.info("[{}] Handling tenant deleted notification: {}", msg.getTenantId(), msg);
                 log.info("[{}] Handling tenant deleted notification: {}", msg.getTenantId(), msg);
                 TenantId tenantId = new TenantId(msg.getEntityId().getId());
                 TenantId tenantId = new TenantId(msg.getEntityId().getId());
                 deletedTenants.add(tenantId);
                 deletedTenants.add(tenantId);
-                ActorRef tenantActor = tenantActors.get(tenantId);
-                if (tenantActor != null) {
-                    log.debug("[{}] Deleting tenant actor: {}", msg.getTenantId(), tenantActor);
-                    context().stop(tenantActor);
-                }
+                ctx.stop(new TbEntityActorId(tenantId));
             } else {
             } else {
                 target = getOrCreateTenantActor(msg.getTenantId());
                 target = getOrCreateTenantActor(msg.getTenantId());
             }
             }
         }
         }
         if (target != null) {
         if (target != null) {
-            target.tell(msg, ActorRef.noSender());
+            target.tellWithHighPriority(msg);
         } else {
         } else {
             log.debug("[{}] Invalid component lifecycle msg: {}", msg.getTenantId(), msg);
             log.debug("[{}] Invalid component lifecycle msg: {}", msg.getTenantId(), msg);
         }
         }
     }
     }
 
 
-    private void onToDeviceActorMsg(TenantAwareMsg msg) {
+    private void onToDeviceActorMsg(TenantAwareMsg msg, boolean priority) {
         if (!deletedTenants.contains(msg.getTenantId())) {
         if (!deletedTenants.contains(msg.getTenantId())) {
-            getOrCreateTenantActor(msg.getTenantId()).tell(msg, ActorRef.noSender());
+            TbActorRef tenantActor = getOrCreateTenantActor(msg.getTenantId());
+            if (priority) {
+                tenantActor.tellWithHighPriority(msg);
+            } else {
+                tenantActor.tell(msg);
+            }
         } else {
         } else {
             if (msg instanceof TransportToDeviceActorMsgWrapper) {
             if (msg instanceof TransportToDeviceActorMsgWrapper) {
                 ((TransportToDeviceActorMsgWrapper) msg).getCallback().onSuccess();
                 ((TransportToDeviceActorMsgWrapper) msg).getCallback().onSuccess();
@@ -192,49 +178,27 @@ public class AppActor extends ContextAwareActor {
         }
         }
     }
     }
 
 
-    private ActorRef getOrCreateTenantActor(TenantId tenantId) {
-        return tenantActors.computeIfAbsent(tenantId, k -> {
-            log.info("[{}] Creating tenant actor.", tenantId);
-            ActorRef tenantActor = context().actorOf(Props.create(new TenantActor.ActorCreator(systemContext, tenantId))
-                    .withDispatcher(DefaultActorService.CORE_DISPATCHER_NAME), tenantId.toString());
-            context().watch(tenantActor);
-            log.info("[{}] Created tenant actor: {}.", tenantId, tenantActor);
-            return tenantActor;
-        });
+    private TbActorRef getOrCreateTenantActor(TenantId tenantId) {
+        return ctx.getOrCreateChildActor(new TbEntityActorId(tenantId),
+                () -> DefaultActorService.TENANT_DISPATCHER_NAME,
+                () -> new TenantActor.ActorCreator(systemContext, tenantId));
     }
     }
 
 
-    @Override
-    protected void processTermination(Terminated message) {
-        ActorRef terminated = message.actor();
-        if (terminated instanceof LocalActorRef) {
-            boolean removed = tenantActors.inverse().remove(terminated) != null;
-            if (removed) {
-                log.debug("[{}] Removed actor:", terminated);
-            }
-        } else {
-            throw new IllegalStateException("Remote actors are not supported!");
-        }
-    }
-
-    public static class ActorCreator extends ContextBasedCreator<AppActor> {
-        private static final long serialVersionUID = 1L;
+    public static class ActorCreator extends ContextBasedCreator {
 
 
         public ActorCreator(ActorSystemContext context) {
         public ActorCreator(ActorSystemContext context) {
             super(context);
             super(context);
         }
         }
 
 
         @Override
         @Override
-        public AppActor create() {
+        public TbActorId createActorId() {
+            return new TbEntityActorId(new TenantId(EntityId.NULL_UUID));
+        }
+
+        @Override
+        public TbActor createActor() {
             return new AppActor(context);
             return new AppActor(context);
         }
         }
     }
     }
 
 
-    private final SupervisorStrategy strategy = new OneForOneStrategy(3, Duration.create("1 minute"), t -> {
-        log.warn("Unknown failure", t);
-        if (t instanceof RuntimeException) {
-            return SupervisorStrategy.restart();
-        } else {
-            return SupervisorStrategy.stop();
-        }
-    });
 }
 }

@@ -15,9 +15,12 @@
  */
  */
 package org.thingsboard.server.actors.device;
 package org.thingsboard.server.actors.device;
 
 
+import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.rule.engine.api.msg.DeviceAttributesEventNotificationMsg;
 import org.thingsboard.rule.engine.api.msg.DeviceAttributesEventNotificationMsg;
 import org.thingsboard.rule.engine.api.msg.DeviceNameOrTypeUpdateMsg;
 import org.thingsboard.rule.engine.api.msg.DeviceNameOrTypeUpdateMsg;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.TbActorCtx;
+import org.thingsboard.server.actors.TbActorException;
 import org.thingsboard.server.actors.service.ContextAwareActor;
 import org.thingsboard.server.actors.service.ContextAwareActor;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -26,6 +29,7 @@ import org.thingsboard.server.common.msg.timeout.DeviceActorServerSideRpcTimeout
 import org.thingsboard.server.service.rpc.ToDeviceRpcRequestActorMsg;
 import org.thingsboard.server.service.rpc.ToDeviceRpcRequestActorMsg;
 import org.thingsboard.server.service.transport.msg.TransportToDeviceActorMsgWrapper;
 import org.thingsboard.server.service.transport.msg.TransportToDeviceActorMsgWrapper;
 
 
+@Slf4j
 public class DeviceActor extends ContextAwareActor {
 public class DeviceActor extends ContextAwareActor {
 
 
     private final DeviceActorMessageProcessor processor;
     private final DeviceActorMessageProcessor processor;
@@ -36,29 +40,26 @@ public class DeviceActor extends ContextAwareActor {
     }
     }
 
 
     @Override
     @Override
-    public void preStart() {
+    public void init(TbActorCtx ctx) throws TbActorException {
+        super.init(ctx);
         log.debug("[{}][{}] Starting device actor.", processor.tenantId, processor.deviceId);
         log.debug("[{}][{}] Starting device actor.", processor.tenantId, processor.deviceId);
         try {
         try {
-            processor.initSessionTimeout(context());
+            processor.initSessionTimeout(ctx);
             log.debug("[{}][{}] Device actor started.", processor.tenantId, processor.deviceId);
             log.debug("[{}][{}] Device actor started.", processor.tenantId, processor.deviceId);
         } catch (Exception e) {
         } catch (Exception e) {
             log.warn("[{}][{}] Unknown failure", processor.tenantId, processor.deviceId, e);
             log.warn("[{}][{}] Unknown failure", processor.tenantId, processor.deviceId, e);
+            throw new TbActorException("Failed to initialize device actor", e);
         }
         }
     }
     }
 
 
     @Override
     @Override
-    public void postStop() {
-
-    }
-
-    @Override
-    protected boolean process(TbActorMsg msg) {
+    protected boolean doProcess(TbActorMsg msg) {
         switch (msg.getMsgType()) {
         switch (msg.getMsgType()) {
             case TRANSPORT_TO_DEVICE_ACTOR_MSG:
             case TRANSPORT_TO_DEVICE_ACTOR_MSG:
-                processor.process(context(), (TransportToDeviceActorMsgWrapper) msg);
+                processor.process(ctx, (TransportToDeviceActorMsgWrapper) msg);
                 break;
                 break;
             case DEVICE_ATTRIBUTES_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_ATTRIBUTES_UPDATE_TO_DEVICE_ACTOR_MSG:
-                processor.processAttributesUpdate(context(), (DeviceAttributesEventNotificationMsg) msg);
+                processor.processAttributesUpdate(ctx, (DeviceAttributesEventNotificationMsg) msg);
                 break;
                 break;
             case DEVICE_CREDENTIALS_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_CREDENTIALS_UPDATE_TO_DEVICE_ACTOR_MSG:
                 processor.processCredentialsUpdate();
                 processor.processCredentialsUpdate();
@@ -67,10 +68,10 @@ public class DeviceActor extends ContextAwareActor {
                 processor.processNameOrTypeUpdate((DeviceNameOrTypeUpdateMsg) msg);
                 processor.processNameOrTypeUpdate((DeviceNameOrTypeUpdateMsg) msg);
                 break;
                 break;
             case DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG:
             case DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG:
-                processor.processRpcRequest(context(), (ToDeviceRpcRequestActorMsg) msg);
+                processor.processRpcRequest(ctx, (ToDeviceRpcRequestActorMsg) msg);
                 break;
                 break;
             case DEVICE_ACTOR_SERVER_SIDE_RPC_TIMEOUT_MSG:
             case DEVICE_ACTOR_SERVER_SIDE_RPC_TIMEOUT_MSG:
-                processor.processServerSideRpcTimeout(context(), (DeviceActorServerSideRpcTimeoutMsg) msg);
+                processor.processServerSideRpcTimeout(ctx, (DeviceActorServerSideRpcTimeoutMsg) msg);
                 break;
                 break;
             case SESSION_TIMEOUT_MSG:
             case SESSION_TIMEOUT_MSG:
                 processor.checkSessionsTimeout();
                 processor.checkSessionsTimeout();

@@ -16,12 +16,14 @@
 package org.thingsboard.server.actors.device;
 package org.thingsboard.server.actors.device;
 
 
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.TbActor;
+import org.thingsboard.server.actors.TbActorId;
+import org.thingsboard.server.actors.TbEntityActorId;
 import org.thingsboard.server.actors.service.ContextBasedCreator;
 import org.thingsboard.server.actors.service.ContextBasedCreator;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 
 
-public class DeviceActorCreator extends ContextBasedCreator<DeviceActor> {
-    private static final long serialVersionUID = 1L;
+public class DeviceActorCreator extends ContextBasedCreator {
 
 
     private final TenantId tenantId;
     private final TenantId tenantId;
     private final DeviceId deviceId;
     private final DeviceId deviceId;
@@ -33,7 +35,13 @@ public class DeviceActorCreator extends ContextBasedCreator<DeviceActor> {
     }
     }
 
 
     @Override
     @Override
-    public DeviceActor create() {
+    public TbActorId createActorId() {
+        return new TbEntityActorId(deviceId);
+    }
+
+    @Override
+    public TbActor createActor() {
         return new DeviceActor(context, tenantId, deviceId);
         return new DeviceActor(context, tenantId, deviceId);
     }
     }
+
 }
 }

@@ -15,7 +15,6 @@
  */
  */
 package org.thingsboard.server.actors.device;
 package org.thingsboard.server.actors.device;
 
 
-import akka.actor.ActorContext;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -27,6 +26,7 @@ import org.thingsboard.rule.engine.api.RpcError;
 import org.thingsboard.rule.engine.api.msg.DeviceAttributesEventNotificationMsg;
 import org.thingsboard.rule.engine.api.msg.DeviceAttributesEventNotificationMsg;
 import org.thingsboard.rule.engine.api.msg.DeviceNameOrTypeUpdateMsg;
 import org.thingsboard.rule.engine.api.msg.DeviceNameOrTypeUpdateMsg;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.TbActorCtx;
 import org.thingsboard.server.actors.shared.AbstractContextAwareMsgProcessor;
 import org.thingsboard.server.actors.shared.AbstractContextAwareMsgProcessor;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceId;
@@ -127,7 +127,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         }
         }
     }
     }
 
 
-    void processRpcRequest(ActorContext context, ToDeviceRpcRequestActorMsg msg) {
+    void processRpcRequest(TbActorCtx context, ToDeviceRpcRequestActorMsg msg) {
         ToDeviceRpcRequest request = msg.getMsg();
         ToDeviceRpcRequest request = msg.getMsg();
         ToDeviceRpcRequestBody body = request.getBody();
         ToDeviceRpcRequestBody body = request.getBody();
         ToDeviceRpcRequestMsg rpcRequest = ToDeviceRpcRequestMsg.newBuilder().setRequestId(
         ToDeviceRpcRequestMsg rpcRequest = ToDeviceRpcRequestMsg.newBuilder().setRequestId(
@@ -162,13 +162,13 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         }
         }
     }
     }
 
 
-    private void registerPendingRpcRequest(ActorContext context, ToDeviceRpcRequestActorMsg msg, boolean sent, ToDeviceRpcRequestMsg rpcRequest, long timeout) {
+    private void registerPendingRpcRequest(TbActorCtx context, ToDeviceRpcRequestActorMsg msg, boolean sent, ToDeviceRpcRequestMsg rpcRequest, long timeout) {
         toDeviceRpcPendingMap.put(rpcRequest.getRequestId(), new ToDeviceRpcRequestMetadata(msg, sent));
         toDeviceRpcPendingMap.put(rpcRequest.getRequestId(), new ToDeviceRpcRequestMetadata(msg, sent));
         DeviceActorServerSideRpcTimeoutMsg timeoutMsg = new DeviceActorServerSideRpcTimeoutMsg(rpcRequest.getRequestId(), timeout);
         DeviceActorServerSideRpcTimeoutMsg timeoutMsg = new DeviceActorServerSideRpcTimeoutMsg(rpcRequest.getRequestId(), timeout);
         scheduleMsgWithDelay(context, timeoutMsg, timeoutMsg.getTimeout());
         scheduleMsgWithDelay(context, timeoutMsg, timeoutMsg.getTimeout());
     }
     }
 
 
-    void processServerSideRpcTimeout(ActorContext context, DeviceActorServerSideRpcTimeoutMsg msg) {
+    void processServerSideRpcTimeout(TbActorCtx context, DeviceActorServerSideRpcTimeoutMsg msg) {
         ToDeviceRpcRequestMetadata requestMd = toDeviceRpcPendingMap.remove(msg.getId());
         ToDeviceRpcRequestMetadata requestMd = toDeviceRpcPendingMap.remove(msg.getId());
         if (requestMd != null) {
         if (requestMd != null) {
             log.debug("[{}] RPC request [{}] timeout detected!", deviceId, msg.getId());
             log.debug("[{}] RPC request [{}] timeout detected!", deviceId, msg.getId());
@@ -177,7 +177,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         }
         }
     }
     }
 
 
-    private void sendPendingRequests(ActorContext context, UUID sessionId, SessionInfoProto sessionInfo) {
+    private void sendPendingRequests(TbActorCtx context, UUID sessionId, SessionInfoProto sessionInfo) {
         SessionType sessionType = getSessionType(sessionId);
         SessionType sessionType = getSessionType(sessionId);
         if (!toDeviceRpcPendingMap.isEmpty()) {
         if (!toDeviceRpcPendingMap.isEmpty()) {
             log.debug("[{}] Pushing {} pending RPC messages to new async session [{}]", deviceId, toDeviceRpcPendingMap.size(), sessionId);
             log.debug("[{}] Pushing {} pending RPC messages to new async session [{}]", deviceId, toDeviceRpcPendingMap.size(), sessionId);
@@ -198,7 +198,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         sentOneWayIds.forEach(toDeviceRpcPendingMap::remove);
         sentOneWayIds.forEach(toDeviceRpcPendingMap::remove);
     }
     }
 
 
-    private Consumer<Map.Entry<Integer, ToDeviceRpcRequestMetadata>> processPendingRpc(ActorContext context, UUID sessionId, String nodeId, Set<Integer> sentOneWayIds) {
+    private Consumer<Map.Entry<Integer, ToDeviceRpcRequestMetadata>> processPendingRpc(TbActorCtx context, UUID sessionId, String nodeId, Set<Integer> sentOneWayIds) {
         return entry -> {
         return entry -> {
             ToDeviceRpcRequest request = entry.getValue().getMsg().getMsg();
             ToDeviceRpcRequest request = entry.getValue().getMsg().getMsg();
             ToDeviceRpcRequestBody body = request.getBody();
             ToDeviceRpcRequestBody body = request.getBody();
@@ -212,7 +212,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         };
         };
     }
     }
 
 
-    void process(ActorContext context, TransportToDeviceActorMsgWrapper wrapper) {
+    void process(TbActorCtx context, TransportToDeviceActorMsgWrapper wrapper) {
         TransportToDeviceActorMsg msg = wrapper.getMsg();
         TransportToDeviceActorMsg msg = wrapper.getMsg();
         TbCallback callback = wrapper.getCallback();
         TbCallback callback = wrapper.getCallback();
         if (msg.hasSessionEvent()) {
         if (msg.hasSessionEvent()) {
@@ -239,7 +239,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         callback.onSuccess();
         callback.onSuccess();
     }
     }
 
 
-    private void handleClaimDeviceMsg(ActorContext context, SessionInfoProto sessionInfo, TransportProtos.ClaimDeviceMsg msg) {
+    private void handleClaimDeviceMsg(TbActorCtx context, SessionInfoProto sessionInfo, TransportProtos.ClaimDeviceMsg msg) {
         DeviceId deviceId = new DeviceId(new UUID(msg.getDeviceIdMSB(), msg.getDeviceIdLSB()));
         DeviceId deviceId = new DeviceId(new UUID(msg.getDeviceIdMSB(), msg.getDeviceIdLSB()));
         systemContext.getClaimDevicesService().registerClaimingInfo(tenantId, deviceId, msg.getSecretKey(), msg.getDurationMs());
         systemContext.getClaimDevicesService().registerClaimingInfo(tenantId, deviceId, msg.getSecretKey(), msg.getDurationMs());
     }
     }
@@ -252,7 +252,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         systemContext.getDeviceStateService().onDeviceDisconnect(deviceId);
         systemContext.getDeviceStateService().onDeviceDisconnect(deviceId);
     }
     }
 
 
-    private void handleGetAttributesRequest(ActorContext context, SessionInfoProto sessionInfo, GetAttributeRequestMsg request) {
+    private void handleGetAttributesRequest(TbActorCtx context, SessionInfoProto sessionInfo, GetAttributeRequestMsg request) {
         int requestId = request.getRequestId();
         int requestId = request.getRequestId();
         Futures.addCallback(getAttributesKvEntries(request), new FutureCallback<List<List<AttributeKvEntry>>>() {
         Futures.addCallback(getAttributesKvEntries(request), new FutureCallback<List<List<AttributeKvEntry>>>() {
             @Override
             @Override
@@ -310,7 +310,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         return sessions.containsKey(sessionId) ? SessionType.ASYNC : SessionType.SYNC;
         return sessions.containsKey(sessionId) ? SessionType.ASYNC : SessionType.SYNC;
     }
     }
 
 
-    void processAttributesUpdate(ActorContext context, DeviceAttributesEventNotificationMsg msg) {
+    void processAttributesUpdate(TbActorCtx context, DeviceAttributesEventNotificationMsg msg) {
         if (attributeSubscriptions.size() > 0) {
         if (attributeSubscriptions.size() > 0) {
             boolean hasNotificationData = false;
             boolean hasNotificationData = false;
             AttributeUpdateNotificationMsg.Builder notification = AttributeUpdateNotificationMsg.newBuilder();
             AttributeUpdateNotificationMsg.Builder notification = AttributeUpdateNotificationMsg.newBuilder();
@@ -349,7 +349,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         }
         }
     }
     }
 
 
-    private void processRpcResponses(ActorContext context, SessionInfoProto sessionInfo, ToDeviceRpcResponseMsg responseMsg) {
+    private void processRpcResponses(TbActorCtx context, SessionInfoProto sessionInfo, ToDeviceRpcResponseMsg responseMsg) {
         UUID sessionId = getSessionId(sessionInfo);
         UUID sessionId = getSessionId(sessionInfo);
         log.debug("[{}] Processing rpc command response [{}]", deviceId, sessionId);
         log.debug("[{}] Processing rpc command response [{}]", deviceId, sessionId);
         ToDeviceRpcRequestMetadata requestMd = toDeviceRpcPendingMap.remove(responseMsg.getRequestId());
         ToDeviceRpcRequestMetadata requestMd = toDeviceRpcPendingMap.remove(responseMsg.getRequestId());
@@ -362,7 +362,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         }
         }
     }
     }
 
 
-    private void processSubscriptionCommands(ActorContext context, SessionInfoProto sessionInfo, SubscribeToAttributeUpdatesMsg subscribeCmd) {
+    private void processSubscriptionCommands(TbActorCtx context, SessionInfoProto sessionInfo, SubscribeToAttributeUpdatesMsg subscribeCmd) {
         UUID sessionId = getSessionId(sessionInfo);
         UUID sessionId = getSessionId(sessionInfo);
         if (subscribeCmd.getUnsubscribe()) {
         if (subscribeCmd.getUnsubscribe()) {
             log.debug("[{}] Canceling attributes subscription for session [{}]", deviceId, sessionId);
             log.debug("[{}] Canceling attributes subscription for session [{}]", deviceId, sessionId);
@@ -383,7 +383,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         return new UUID(sessionInfo.getSessionIdMSB(), sessionInfo.getSessionIdLSB());
         return new UUID(sessionInfo.getSessionIdMSB(), sessionInfo.getSessionIdLSB());
     }
     }
 
 
-    private void processSubscriptionCommands(ActorContext context, SessionInfoProto sessionInfo, SubscribeToRPCMsg subscribeCmd) {
+    private void processSubscriptionCommands(TbActorCtx context, SessionInfoProto sessionInfo, SubscribeToRPCMsg subscribeCmd) {
         UUID sessionId = getSessionId(sessionInfo);
         UUID sessionId = getSessionId(sessionInfo);
         if (subscribeCmd.getUnsubscribe()) {
         if (subscribeCmd.getUnsubscribe()) {
             log.debug("[{}] Canceling rpc subscription for session [{}]", deviceId, sessionId);
             log.debug("[{}] Canceling rpc subscription for session [{}]", deviceId, sessionId);
@@ -433,7 +433,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         }
         }
     }
     }
 
 
-    private void handleSessionActivity(ActorContext context, SessionInfoProto sessionInfoProto, SubscriptionInfoProto subscriptionInfo) {
+    private void handleSessionActivity(TbActorCtx context, SessionInfoProto sessionInfoProto, SubscriptionInfoProto subscriptionInfo) {
         UUID sessionId = getSessionId(sessionInfoProto);
         UUID sessionId = getSessionId(sessionInfoProto);
         SessionInfoMetaData sessionMD = sessions.computeIfAbsent(sessionId,
         SessionInfoMetaData sessionMD = sessions.computeIfAbsent(sessionId,
                 id -> new SessionInfoMetaData(new SessionInfo(SessionType.ASYNC, sessionInfoProto.getNodeId()), 0L));
                 id -> new SessionInfoMetaData(new SessionInfo(SessionType.ASYNC, sessionInfoProto.getNodeId()), 0L));
@@ -612,8 +612,8 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
                         .addAllSessions(sessionsList).build().toByteArray());
                         .addAllSessions(sessionsList).build().toByteArray());
     }
     }
 
 
-    void initSessionTimeout(ActorContext context) {
-        schedulePeriodicMsgWithDelay(context, SessionTimeoutCheckMsg.instance(), systemContext.getSessionInactivityTimeout(), systemContext.getSessionInactivityTimeout());
+    void initSessionTimeout(TbActorCtx ctx) {
+        schedulePeriodicMsgWithDelay(ctx, SessionTimeoutCheckMsg.instance(), systemContext.getSessionInactivityTimeout(), systemContext.getSessionInactivityTimeout());
     }
     }
 
 
     void checkSessionsTimeout() {
     void checkSessionsTimeout() {

@@ -15,7 +15,6 @@
  */
  */
 package org.thingsboard.server.actors.ruleChain;
 package org.thingsboard.server.actors.ruleChain;
 
 
-import akka.actor.ActorRef;
 import com.datastax.driver.core.ResultSetFuture;
 import com.datastax.driver.core.ResultSetFuture;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -30,6 +29,7 @@ import org.thingsboard.rule.engine.api.ScriptEngine;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbRelationTypes;
 import org.thingsboard.rule.engine.api.TbRelationTypes;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.TbActorRef;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Device;
@@ -40,6 +40,7 @@ import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.common.data.rule.RuleNode;
+import org.thingsboard.server.common.msg.TbActorMsg;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.ServiceType;
@@ -64,7 +65,6 @@ import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.TbQueueCallback;
 import org.thingsboard.server.queue.TbQueueCallback;
 import org.thingsboard.server.queue.TbQueueMsgMetadata;
 import org.thingsboard.server.queue.TbQueueMsgMetadata;
 import org.thingsboard.server.service.script.RuleNodeJsScriptEngine;
 import org.thingsboard.server.service.script.RuleNodeJsScriptEngine;
-import scala.concurrent.duration.Duration;
 
 
 import java.util.Collections;
 import java.util.Collections;
 import java.util.Set;
 import java.util.Set;
@@ -106,7 +106,7 @@ class DefaultTbContext implements TbContext {
         if (nodeCtx.getSelf().isDebugMode()) {
         if (nodeCtx.getSelf().isDebugMode()) {
             relationTypes.forEach(relationType -> mainCtx.persistDebugOutput(nodeCtx.getTenantId(), nodeCtx.getSelf().getId(), msg, relationType, th));
             relationTypes.forEach(relationType -> mainCtx.persistDebugOutput(nodeCtx.getTenantId(), nodeCtx.getSelf().getId(), msg, relationType, th));
         }
         }
-        nodeCtx.getChainActor().tell(new RuleNodeToRuleChainTellNextMsg(nodeCtx.getSelf().getId(), relationTypes, msg, th != null ? th.getMessage() : null), nodeCtx.getSelfActor());
+        nodeCtx.getChainActor().tell(new RuleNodeToRuleChainTellNextMsg(nodeCtx.getSelf().getId(), relationTypes, msg, th != null ? th.getMessage() : null));
     }
     }
 
 
     @Override
     @Override
@@ -132,7 +132,7 @@ class DefaultTbContext implements TbContext {
                 .setTenantIdMSB(getTenantId().getId().getMostSignificantBits())
                 .setTenantIdMSB(getTenantId().getId().getMostSignificantBits())
                 .setTenantIdLSB(getTenantId().getId().getLeastSignificantBits())
                 .setTenantIdLSB(getTenantId().getId().getLeastSignificantBits())
                 .setTbMsg(TbMsg.toByteString(tbMsg)).build();
                 .setTbMsg(TbMsg.toByteString(tbMsg)).build();
-        mainCtx.getClusterService().pushMsgToRuleEngine(tpi, tbMsg.getId(),  msg, new SimpleTbQueueCallback(onSuccess, onFailure));
+        mainCtx.getClusterService().pushMsgToRuleEngine(tpi, tbMsg.getId(), msg, new SimpleTbQueueCallback(onSuccess, onFailure));
     }
     }
 
 
     @Override
     @Override
@@ -189,7 +189,7 @@ class DefaultTbContext implements TbContext {
         if (failureMessage != null) {
         if (failureMessage != null) {
             msg.setFailureMessage(failureMessage);
             msg.setFailureMessage(failureMessage);
         }
         }
-        mainCtx.getClusterService().pushMsgToRuleEngine(tpi, tbMsg.getId(),  msg.build(), new SimpleTbQueueCallback(onSuccess, onFailure));
+        mainCtx.getClusterService().pushMsgToRuleEngine(tpi, tbMsg.getId(), msg.build(), new SimpleTbQueueCallback(onSuccess, onFailure));
     }
     }
 
 
     @Override
     @Override
@@ -205,8 +205,8 @@ class DefaultTbContext implements TbContext {
         return mainCtx.resolve(ServiceType.TB_RULE_ENGINE, getTenantId(), entityId).isMyPartition();
         return mainCtx.resolve(ServiceType.TB_RULE_ENGINE, getTenantId(), entityId).isMyPartition();
     }
     }
 
 
-    private void scheduleMsgWithDelay(Object msg, long delayInMs, ActorRef target) {
-        mainCtx.getScheduler().scheduleOnce(Duration.create(delayInMs, TimeUnit.MILLISECONDS), target, msg, mainCtx.getActorSystem().dispatcher(), nodeCtx.getSelfActor());
+    private void scheduleMsgWithDelay(TbActorMsg msg, long delayInMs, TbActorRef target) {
+        mainCtx.scheduleMsgWithDelay(target, msg, delayInMs);
     }
     }
 
 
     @Override
     @Override
@@ -215,7 +215,7 @@ class DefaultTbContext implements TbContext {
             mainCtx.persistDebugOutput(nodeCtx.getTenantId(), nodeCtx.getSelf().getId(), msg, TbRelationTypes.FAILURE, th);
             mainCtx.persistDebugOutput(nodeCtx.getTenantId(), nodeCtx.getSelf().getId(), msg, TbRelationTypes.FAILURE, th);
         }
         }
         nodeCtx.getChainActor().tell(new RuleNodeToRuleChainTellNextMsg(nodeCtx.getSelf().getId(), Collections.singleton(TbRelationTypes.FAILURE),
         nodeCtx.getChainActor().tell(new RuleNodeToRuleChainTellNextMsg(nodeCtx.getSelf().getId(), Collections.singleton(TbRelationTypes.FAILURE),
-                msg, th != null ? th.getMessage() : null), nodeCtx.getSelfActor());
+                msg, th != null ? th.getMessage() : null));
     }
     }
 
 
     public void updateSelf(RuleNode self) {
     public void updateSelf(RuleNode self) {
@@ -223,8 +223,8 @@ class DefaultTbContext implements TbContext {
     }
     }
 
 
     @Override
     @Override
-    public TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, String data) {
-        return TbMsg.newMsg(type, originator, metaData, data, nodeCtx.getSelf().getRuleChainId(), nodeCtx.getSelf().getId());
+    public TbMsg newMsg(String queueName, String type, EntityId originator, TbMsgMetaData metaData, String data) {
+        return TbMsg.newMsg(queueName, type, originator, metaData, data, nodeCtx.getSelf().getRuleChainId(), nodeCtx.getSelf().getId());
     }
     }
 
 
     @Override
     @Override

@@ -15,9 +15,11 @@
  */
  */
 package org.thingsboard.server.actors.ruleChain;
 package org.thingsboard.server.actors.ruleChain;
 
 
-import akka.actor.OneForOneStrategy;
-import akka.actor.SupervisorStrategy;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.TbActor;
+import org.thingsboard.server.actors.TbActorCtx;
+import org.thingsboard.server.actors.TbActorId;
+import org.thingsboard.server.actors.TbEntityActorId;
 import org.thingsboard.server.actors.service.ComponentActor;
 import org.thingsboard.server.actors.service.ComponentActor;
 import org.thingsboard.server.actors.service.ContextBasedCreator;
 import org.thingsboard.server.actors.service.ContextBasedCreator;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleChainId;
@@ -27,18 +29,24 @@ import org.thingsboard.server.common.msg.TbActorMsg;
 import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
 import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
 import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
 import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
 import org.thingsboard.server.common.msg.queue.QueueToRuleEngineMsg;
 import org.thingsboard.server.common.msg.queue.QueueToRuleEngineMsg;
-import scala.concurrent.duration.Duration;
 
 
 public class RuleChainActor extends ComponentActor<RuleChainId, RuleChainActorMessageProcessor> {
 public class RuleChainActor extends ComponentActor<RuleChainId, RuleChainActorMessageProcessor> {
 
 
+    private final RuleChain ruleChain;
+
     private RuleChainActor(ActorSystemContext systemContext, TenantId tenantId, RuleChain ruleChain) {
     private RuleChainActor(ActorSystemContext systemContext, TenantId tenantId, RuleChain ruleChain) {
         super(systemContext, tenantId, ruleChain.getId());
         super(systemContext, tenantId, ruleChain.getId());
-        setProcessor(new RuleChainActorMessageProcessor(tenantId, ruleChain, systemContext,
-                context().parent(), context().self()));
+        this.ruleChain = ruleChain;
     }
     }
 
 
     @Override
     @Override
-    protected boolean process(TbActorMsg msg) {
+    protected RuleChainActorMessageProcessor createProcessor(TbActorCtx ctx) {
+        return new RuleChainActorMessageProcessor(tenantId, ruleChain, systemContext,
+                ctx.getParentRef(), ctx);
+    }
+
+    @Override
+    protected boolean doProcess(TbActorMsg msg) {
         switch (msg.getMsgType()) {
         switch (msg.getMsgType()) {
             case COMPONENT_LIFE_CYCLE_MSG:
             case COMPONENT_LIFE_CYCLE_MSG:
                 onComponentLifecycleMsg((ComponentLifecycleMsg) msg);
                 onComponentLifecycleMsg((ComponentLifecycleMsg) msg);
@@ -64,7 +72,7 @@ public class RuleChainActor extends ComponentActor<RuleChainId, RuleChainActorMe
         return true;
         return true;
     }
     }
 
 
-    public static class ActorCreator extends ContextBasedCreator<RuleChainActor> {
+    public static class ActorCreator extends ContextBasedCreator {
         private static final long serialVersionUID = 1L;
         private static final long serialVersionUID = 1L;
 
 
         private final TenantId tenantId;
         private final TenantId tenantId;
@@ -77,7 +85,12 @@ public class RuleChainActor extends ComponentActor<RuleChainId, RuleChainActorMe
         }
         }
 
 
         @Override
         @Override
-        public RuleChainActor create() {
+        public TbActorId createActorId() {
+            return new TbEntityActorId(ruleChain.getId());
+        }
+
+        @Override
+        public TbActor createActor() {
             return new RuleChainActor(context, tenantId, ruleChain);
             return new RuleChainActor(context, tenantId, ruleChain);
         }
         }
     }
     }
@@ -87,13 +100,4 @@ public class RuleChainActor extends ComponentActor<RuleChainId, RuleChainActorMe
         return systemContext.getRuleChainErrorPersistFrequency();
         return systemContext.getRuleChainErrorPersistFrequency();
     }
     }
 
 
-    @Override
-    public SupervisorStrategy supervisorStrategy() {
-        return strategy;
-    }
-
-    private final SupervisorStrategy strategy = new OneForOneStrategy(3, Duration.create("1 minute"), t -> {
-        logAndPersist("Unknown Failure", ActorSystemContext.toException(t));
-        return SupervisorStrategy.resume();
-    });
 }
 }

@@ -15,12 +15,12 @@
  */
  */
 package org.thingsboard.server.actors.ruleChain;
 package org.thingsboard.server.actors.ruleChain;
 
 
-import akka.actor.ActorContext;
-import akka.actor.ActorRef;
-import akka.actor.Props;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.rule.engine.api.TbRelationTypes;
 import org.thingsboard.rule.engine.api.TbRelationTypes;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.TbActorCtx;
+import org.thingsboard.server.actors.TbActorRef;
+import org.thingsboard.server.actors.TbEntityActorId;
 import org.thingsboard.server.actors.service.DefaultActorService;
 import org.thingsboard.server.actors.service.DefaultActorService;
 import org.thingsboard.server.actors.shared.ComponentMsgProcessor;
 import org.thingsboard.server.actors.shared.ComponentMsgProcessor;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityType;
@@ -64,20 +64,21 @@ import java.util.stream.Collectors;
 @Slf4j
 @Slf4j
 public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleChainId> {
 public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleChainId> {
 
 
-    private final ActorRef parent;
-    private final ActorRef self;
+    private final TbActorRef parent;
+    private final TbActorRef self;
     private final Map<RuleNodeId, RuleNodeCtx> nodeActors;
     private final Map<RuleNodeId, RuleNodeCtx> nodeActors;
     private final Map<RuleNodeId, List<RuleNodeRelation>> nodeRoutes;
     private final Map<RuleNodeId, List<RuleNodeRelation>> nodeRoutes;
     private final RuleChainService service;
     private final RuleChainService service;
     private final TbClusterService clusterService;
     private final TbClusterService clusterService;
     private final EdgeService edgeService;
     private final EdgeService edgeService;
     private String ruleChainName;
     private String ruleChainName;
+
     private RuleNodeId firstId;
     private RuleNodeId firstId;
     private RuleNodeCtx firstNode;
     private RuleNodeCtx firstNode;
     private boolean started;
     private boolean started;
 
 
     RuleChainActorMessageProcessor(TenantId tenantId, RuleChain ruleChain, ActorSystemContext systemContext
     RuleChainActorMessageProcessor(TenantId tenantId, RuleChain ruleChain, ActorSystemContext systemContext
-            , ActorRef parent, ActorRef self) {
+            , TbActorRef parent, TbActorRef self) {
         super(systemContext, tenantId, ruleChain.getId());
         super(systemContext, tenantId, ruleChain.getId());
         this.ruleChainName = ruleChain.getName();
         this.ruleChainName = ruleChain.getName();
         this.parent = parent;
         this.parent = parent;
@@ -95,7 +96,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
     }
     }
 
 
     @Override
     @Override
-    public void start(ActorContext context) {
+    public void start(TbActorCtx context) {
         if (!started) {
         if (!started) {
             RuleChain ruleChain = service.findRuleChainById(tenantId, entityId);
             RuleChain ruleChain = service.findRuleChainById(tenantId, entityId);
             if (ruleChain != null) {
             if (ruleChain != null) {
@@ -105,7 +106,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
                     // Creating and starting the actors;
                     // Creating and starting the actors;
                     for (RuleNode ruleNode : ruleNodeList) {
                     for (RuleNode ruleNode : ruleNodeList) {
                         log.trace("[{}][{}] Creating rule node [{}]: {}", entityId, ruleNode.getId(), ruleNode.getName(), ruleNode);
                         log.trace("[{}][{}] Creating rule node [{}]: {}", entityId, ruleNode.getId(), ruleNode.getName(), ruleNode);
-                        ActorRef ruleNodeActor = createRuleNodeActor(context, ruleNode);
+                        TbActorRef ruleNodeActor = createRuleNodeActor(context, ruleNode);
                         nodeActors.put(ruleNode.getId(), new RuleNodeCtx(tenantId, self, ruleNodeActor, ruleNode));
                         nodeActors.put(ruleNode.getId(), new RuleNodeCtx(tenantId, self, ruleNodeActor, ruleNode));
                     }
                     }
                     initRoutes(ruleChain, ruleNodeList);
                     initRoutes(ruleChain, ruleNodeList);
@@ -118,7 +119,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
     }
     }
 
 
     @Override
     @Override
-    public void onUpdate(ActorContext context) {
+    public void onUpdate(TbActorCtx context) {
         RuleChain ruleChain = service.findRuleChainById(tenantId, entityId);
         RuleChain ruleChain = service.findRuleChainById(tenantId, entityId);
         if (ruleChain != null) {
         if (ruleChain != null) {
             if (ruleChain.getType().equals(RuleChainType.CORE)) {
             if (ruleChain.getType().equals(RuleChainType.CORE)) {
@@ -129,22 +130,22 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
                     RuleNodeCtx existing = nodeActors.get(ruleNode.getId());
                     RuleNodeCtx existing = nodeActors.get(ruleNode.getId());
                     if (existing == null) {
                     if (existing == null) {
                         log.trace("[{}][{}] Creating rule node [{}]: {}", entityId, ruleNode.getId(), ruleNode.getName(), ruleNode);
                         log.trace("[{}][{}] Creating rule node [{}]: {}", entityId, ruleNode.getId(), ruleNode.getName(), ruleNode);
-                        ActorRef ruleNodeActor = createRuleNodeActor(context, ruleNode);
+                        TbActorRef ruleNodeActor = createRuleNodeActor(context, ruleNode);
                         nodeActors.put(ruleNode.getId(), new RuleNodeCtx(tenantId, self, ruleNodeActor, ruleNode));
                         nodeActors.put(ruleNode.getId(), new RuleNodeCtx(tenantId, self, ruleNodeActor, ruleNode));
                     } else {
                     } else {
                         log.trace("[{}][{}] Updating rule node [{}]: {}", entityId, ruleNode.getId(), ruleNode.getName(), ruleNode);
                         log.trace("[{}][{}] Updating rule node [{}]: {}", entityId, ruleNode.getId(), ruleNode.getName(), ruleNode);
                         existing.setSelf(ruleNode);
                         existing.setSelf(ruleNode);
-                        existing.getSelfActor().tell(new ComponentLifecycleMsg(tenantId, existing.getSelf().getId(), ComponentLifecycleEvent.UPDATED), self);
+                        existing.getSelfActor().tellWithHighPriority(new ComponentLifecycleMsg(tenantId, existing.getSelf().getId(), ComponentLifecycleEvent.UPDATED));
                     }
                     }
                 }
                 }
 
 
-                Set<RuleNodeId> existingNodes = ruleNodeList.stream().map(RuleNode::getId).collect(Collectors.toSet());
-                List<RuleNodeId> removedRules = nodeActors.keySet().stream().filter(node -> !existingNodes.contains(node)).collect(Collectors.toList());
-                removedRules.forEach(ruleNodeId -> {
-                    log.trace("[{}][{}] Removing rule node [{}]", tenantId, entityId, ruleNodeId);
-                    RuleNodeCtx removed = nodeActors.remove(ruleNodeId);
-                    removed.getSelfActor().tell(new ComponentLifecycleMsg(tenantId, removed.getSelf().getId(), ComponentLifecycleEvent.DELETED), self);
-                });
+            Set<RuleNodeId> existingNodes = ruleNodeList.stream().map(RuleNode::getId).collect(Collectors.toSet());
+            List<RuleNodeId> removedRules = nodeActors.keySet().stream().filter(node -> !existingNodes.contains(node)).collect(Collectors.toList());
+            removedRules.forEach(ruleNodeId -> {
+                log.trace("[{}][{}] Removing rule node [{}]", tenantId, entityId, ruleNodeId);
+                RuleNodeCtx removed = nodeActors.remove(ruleNodeId);
+                removed.getSelfActor().tellWithHighPriority(new ComponentLifecycleMsg(tenantId, removed.getSelf().getId(), ComponentLifecycleEvent.DELETED));
+            });
 
 
                 initRoutes(ruleChain, ruleNodeList);
                 initRoutes(ruleChain, ruleNodeList);
             } else if (ruleChain.getType().equals(RuleChainType.EDGE)) {
             } else if (ruleChain.getType().equals(RuleChainType.EDGE)) {
@@ -154,26 +155,23 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
     }
     }
 
 
     @Override
     @Override
-    public void stop(ActorContext context) {
+    public void stop(TbActorCtx ctx) {
         log.trace("[{}][{}] Stopping rule chain with {} nodes", tenantId, entityId, nodeActors.size());
         log.trace("[{}][{}] Stopping rule chain with {} nodes", tenantId, entityId, nodeActors.size());
-        nodeActors.values().stream().map(RuleNodeCtx::getSelfActor).forEach(context::stop);
+        nodeActors.values().stream().map(RuleNodeCtx::getSelfActor).map(TbActorRef::getActorId).forEach(ctx::stop);
         nodeActors.clear();
         nodeActors.clear();
         nodeRoutes.clear();
         nodeRoutes.clear();
-        context.stop(self);
         started = false;
         started = false;
     }
     }
 
 
     @Override
     @Override
     public void onPartitionChangeMsg(PartitionChangeMsg msg) {
     public void onPartitionChangeMsg(PartitionChangeMsg msg) {
-        nodeActors.values().stream().map(RuleNodeCtx::getSelfActor).forEach(actorRef -> actorRef.tell(msg, self));
+        nodeActors.values().stream().map(RuleNodeCtx::getSelfActor).forEach(actorRef -> actorRef.tellWithHighPriority(msg));
     }
     }
 
 
-    private ActorRef createRuleNodeActor(ActorContext context, RuleNode ruleNode) {
-        String dispatcherName = tenantId.getId().equals(EntityId.NULL_UUID) ?
-                DefaultActorService.SYSTEM_RULE_DISPATCHER_NAME : DefaultActorService.TENANT_RULE_DISPATCHER_NAME;
-        return context.actorOf(
-                Props.create(new RuleNodeActor.ActorCreator(systemContext, tenantId, entityId, ruleNode.getName(), ruleNode.getId()))
-                        .withDispatcher(dispatcherName), ruleNode.getId().toString());
+    private TbActorRef createRuleNodeActor(TbActorCtx ctx, RuleNode ruleNode) {
+        return ctx.getOrCreateChildActor(new TbEntityActorId(ruleNode.getId()),
+                () -> DefaultActorService.RULE_DISPATCHER_NAME,
+                () -> new RuleNodeActor.ActorCreator(systemContext, tenantId, entityId, ruleNode.getName(), ruleNode.getId()));
     }
     }
 
 
     private void initRoutes(RuleChain ruleChain, List<RuleNode> ruleNodeList) {
     private void initRoutes(RuleChain ruleChain, List<RuleNode> ruleNodeList) {
@@ -256,7 +254,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
         try {
         try {
             checkActive(msg);
             checkActive(msg);
             EntityId entityId = msg.getOriginator();
             EntityId entityId = msg.getOriginator();
-            TopicPartitionInfo tpi = systemContext.resolve(ServiceType.TB_RULE_ENGINE, tenantId, entityId);
+            TopicPartitionInfo tpi = systemContext.resolve(ServiceType.TB_RULE_ENGINE, msg.getQueueName(), tenantId, entityId);
             List<RuleNodeRelation> relations = nodeRoutes.get(originatorNodeId).stream()
             List<RuleNodeRelation> relations = nodeRoutes.get(originatorNodeId).stream()
                     .filter(r -> contains(relationTypes, r.getType()))
                     .filter(r -> contains(relationTypes, r.getType()))
                     .collect(Collectors.toList());
                     .collect(Collectors.toList());
@@ -312,7 +310,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
                     pushMsgToNode(nodeActors.get(new RuleNodeId(target.getId())), msg, fromRelationType);
                     pushMsgToNode(nodeActors.get(new RuleNodeId(target.getId())), msg, fromRelationType);
                     break;
                     break;
                 case RULE_CHAIN:
                 case RULE_CHAIN:
-                    parent.tell(new RuleChainToRuleChainMsg(new RuleChainId(target.getId()), entityId, msg, fromRelationType), self);
+                    parent.tell(new RuleChainToRuleChainMsg(new RuleChainId(target.getId()), entityId, msg, fromRelationType));
                     break;
                     break;
             }
             }
         } else {
         } else {
@@ -343,7 +341,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
 
 
     private void pushMsgToNode(RuleNodeCtx nodeCtx, TbMsg msg, String fromRelationType) {
     private void pushMsgToNode(RuleNodeCtx nodeCtx, TbMsg msg, String fromRelationType) {
         if (nodeCtx != null) {
         if (nodeCtx != null) {
-            nodeCtx.getSelfActor().tell(new RuleChainToRuleNodeMsg(new DefaultTbContext(systemContext, nodeCtx), msg, fromRelationType), self);
+            nodeCtx.getSelfActor().tell(new RuleChainToRuleNodeMsg(new DefaultTbContext(systemContext, nodeCtx), msg, fromRelationType));
         } else {
         } else {
             log.error("[{}][{}] RuleNodeCtx is empty", entityId, ruleChainName);
             log.error("[{}][{}] RuleNodeCtx is empty", entityId, ruleChainName);
             msg.getCallback().onFailure(new RuleEngineException("Rule Node CTX is empty"));
             msg.getCallback().onFailure(new RuleEngineException("Rule Node CTX is empty"));

@@ -15,21 +15,22 @@
  */
  */
 package org.thingsboard.server.actors.ruleChain;
 package org.thingsboard.server.actors.ruleChain;
 
 
-import akka.actor.ActorContext;
-import akka.actor.ActorRef;
-import akka.actor.Props;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
 import lombok.Getter;
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.TbActorRef;
+import org.thingsboard.server.actors.TbEntityActorId;
+import org.thingsboard.server.actors.TbEntityTypeActorIdPredicate;
 import org.thingsboard.server.actors.service.ContextAwareActor;
 import org.thingsboard.server.actors.service.ContextAwareActor;
 import org.thingsboard.server.actors.service.DefaultActorService;
 import org.thingsboard.server.actors.service.DefaultActorService;
+import org.thingsboard.server.actors.tenant.TenantActor;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageDataIterable;
 import org.thingsboard.server.common.data.page.PageDataIterable;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleChain;
+import org.thingsboard.server.common.msg.TbActorMsg;
 import org.thingsboard.server.common.data.rule.RuleChainType;
 import org.thingsboard.server.common.data.rule.RuleChainType;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 
 
@@ -38,20 +39,19 @@ import java.util.function.Function;
 /**
 /**
  * Created by ashvayka on 15.03.18.
  * Created by ashvayka on 15.03.18.
  */
  */
+@Slf4j
 public abstract class RuleChainManagerActor extends ContextAwareActor {
 public abstract class RuleChainManagerActor extends ContextAwareActor {
 
 
     protected final TenantId tenantId;
     protected final TenantId tenantId;
     private final RuleChainService ruleChainService;
     private final RuleChainService ruleChainService;
-    private final BiMap<RuleChainId, ActorRef> actors;
     @Getter
     @Getter
     protected RuleChain rootChain;
     protected RuleChain rootChain;
     @Getter
     @Getter
-    protected ActorRef rootChainActor;
+    protected TbActorRef rootChainActor;
 
 
     public RuleChainManagerActor(ActorSystemContext systemContext, TenantId tenantId) {
     public RuleChainManagerActor(ActorSystemContext systemContext, TenantId tenantId) {
         super(systemContext);
         super(systemContext);
         this.tenantId = tenantId;
         this.tenantId = tenantId;
-        this.actors = HashBiMap.create();
         this.ruleChainService = systemContext.getRuleChainService();
         this.ruleChainService = systemContext.getRuleChainService();
     }
     }
 
 
@@ -59,46 +59,41 @@ public abstract class RuleChainManagerActor extends ContextAwareActor {
         for (RuleChain ruleChain : new PageDataIterable<>(link -> ruleChainService.findTenantRuleChainsByType(tenantId, RuleChainType.CORE, link), ContextAwareActor.ENTITY_PACK_LIMIT)) {
         for (RuleChain ruleChain : new PageDataIterable<>(link -> ruleChainService.findTenantRuleChainsByType(tenantId, RuleChainType.CORE, link), ContextAwareActor.ENTITY_PACK_LIMIT)) {
             RuleChainId ruleChainId = ruleChain.getId();
             RuleChainId ruleChainId = ruleChain.getId();
             log.debug("[{}|{}] Creating rule chain actor", ruleChainId.getEntityType(), ruleChain.getId());
             log.debug("[{}|{}] Creating rule chain actor", ruleChainId.getEntityType(), ruleChain.getId());
-            //TODO: remove this cast making UUIDBased subclass of EntityId an interface and vice versa.
-            ActorRef actorRef = getOrCreateActor(this.context(), ruleChainId, id -> ruleChain);
+            TbActorRef actorRef = getOrCreateActor(ruleChainId, id -> ruleChain);
             visit(ruleChain, actorRef);
             visit(ruleChain, actorRef);
             log.debug("[{}|{}] Rule Chain actor created.", ruleChainId.getEntityType(), ruleChainId.getId());
             log.debug("[{}|{}] Rule Chain actor created.", ruleChainId.getEntityType(), ruleChainId.getId());
         }
         }
     }
     }
 
 
-    protected void visit(RuleChain entity, ActorRef actorRef) {
+    protected void visit(RuleChain entity, TbActorRef actorRef) {
         if (entity != null && entity.isRoot() && entity.getType().equals(RuleChainType.CORE)) {
         if (entity != null && entity.isRoot() && entity.getType().equals(RuleChainType.CORE)) {
             rootChain = entity;
             rootChain = entity;
             rootChainActor = actorRef;
             rootChainActor = actorRef;
         }
         }
     }
     }
 
 
-    public ActorRef getOrCreateActor(akka.actor.ActorContext context, RuleChainId ruleChainId) {
-        return getOrCreateActor(context, ruleChainId, eId -> ruleChainService.findRuleChainById(TenantId.SYS_TENANT_ID, eId));
+    protected TbActorRef getOrCreateActor(RuleChainId ruleChainId) {
+        return getOrCreateActor(ruleChainId, eId -> ruleChainService.findRuleChainById(TenantId.SYS_TENANT_ID, eId));
     }
     }
 
 
-    public ActorRef getOrCreateActor(akka.actor.ActorContext context, RuleChainId ruleChainId, Function<RuleChainId, RuleChain> provider) {
-        return actors.computeIfAbsent(ruleChainId, eId -> {
-            RuleChain ruleChain = provider.apply(eId);
-            return context.actorOf(Props.create(new RuleChainActor.ActorCreator(systemContext, tenantId, ruleChain))
-                    .withDispatcher(DefaultActorService.TENANT_RULE_DISPATCHER_NAME), eId.toString());
-        });
+    protected TbActorRef getOrCreateActor(RuleChainId ruleChainId, Function<RuleChainId, RuleChain> provider) {
+        return ctx.getOrCreateChildActor(new TbEntityActorId(ruleChainId),
+                () -> DefaultActorService.RULE_DISPATCHER_NAME,
+                () -> {
+                    RuleChain ruleChain = provider.apply(ruleChainId);
+                    return new RuleChainActor.ActorCreator(systemContext, tenantId, ruleChain);
+                });
     }
     }
 
 
-    protected ActorRef getEntityActorRef(EntityId entityId) {
-        ActorRef target = null;
+    protected TbActorRef getEntityActorRef(EntityId entityId) {
+        TbActorRef target = null;
         if (entityId.getEntityType() == EntityType.RULE_CHAIN) {
         if (entityId.getEntityType() == EntityType.RULE_CHAIN) {
-            target = getOrCreateActor(this.context(), (RuleChainId) entityId);
+            target = getOrCreateActor((RuleChainId) entityId);
         }
         }
         return target;
         return target;
     }
     }
 
 
-    protected void broadcast(Object msg) {
-        actors.values().forEach(actorRef -> actorRef.tell(msg, ActorRef.noSender()));
+    protected void broadcast(TbActorMsg msg) {
+        ctx.broadcastToChildren(msg, new TbEntityTypeActorIdPredicate(EntityType.RULE_CHAIN));
     }
     }
-
-    public ActorRef get(RuleChainId id) {
-        return actors.get(id);
-    }
-
 }
 }

@@ -15,31 +15,43 @@
  */
  */
 package org.thingsboard.server.actors.ruleChain;
 package org.thingsboard.server.actors.ruleChain;
 
 
+import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.TbActor;
+import org.thingsboard.server.actors.TbActorCtx;
+import org.thingsboard.server.actors.TbActorId;
+import org.thingsboard.server.actors.TbEntityActorId;
 import org.thingsboard.server.actors.service.ComponentActor;
 import org.thingsboard.server.actors.service.ComponentActor;
 import org.thingsboard.server.actors.service.ContextBasedCreator;
 import org.thingsboard.server.actors.service.ContextBasedCreator;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.msg.TbActorMsg;
 import org.thingsboard.server.common.msg.TbActorMsg;
 import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
 import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
 import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
 import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
 
 
+@Slf4j
 public class RuleNodeActor extends ComponentActor<RuleNodeId, RuleNodeActorMessageProcessor> {
 public class RuleNodeActor extends ComponentActor<RuleNodeId, RuleNodeActorMessageProcessor> {
 
 
     private final String ruleChainName;
     private final String ruleChainName;
     private final RuleChainId ruleChainId;
     private final RuleChainId ruleChainId;
+    private final RuleNodeId ruleNodeId;
 
 
     private RuleNodeActor(ActorSystemContext systemContext, TenantId tenantId, RuleChainId ruleChainId, String ruleChainName, RuleNodeId ruleNodeId) {
     private RuleNodeActor(ActorSystemContext systemContext, TenantId tenantId, RuleChainId ruleChainId, String ruleChainName, RuleNodeId ruleNodeId) {
         super(systemContext, tenantId, ruleNodeId);
         super(systemContext, tenantId, ruleNodeId);
         this.ruleChainName = ruleChainName;
         this.ruleChainName = ruleChainName;
         this.ruleChainId = ruleChainId;
         this.ruleChainId = ruleChainId;
-        setProcessor(new RuleNodeActorMessageProcessor(tenantId, this.ruleChainName, ruleNodeId, systemContext,
-                context().parent(), context().self()));
+        this.ruleNodeId = ruleNodeId;
     }
     }
 
 
     @Override
     @Override
-    protected boolean process(TbActorMsg msg) {
+    protected RuleNodeActorMessageProcessor createProcessor(TbActorCtx ctx) {
+        return new RuleNodeActorMessageProcessor(tenantId, this.ruleChainName, ruleNodeId, systemContext, ctx.getParentRef(), ctx);
+    }
+
+    @Override
+    protected boolean doProcess(TbActorMsg msg) {
         switch (msg.getMsgType()) {
         switch (msg.getMsgType()) {
             case COMPONENT_LIFE_CYCLE_MSG:
             case COMPONENT_LIFE_CYCLE_MSG:
                 onComponentLifecycleMsg((ComponentLifecycleMsg) msg);
                 onComponentLifecycleMsg((ComponentLifecycleMsg) msg);
@@ -93,8 +105,7 @@ public class RuleNodeActor extends ComponentActor<RuleNodeId, RuleNodeActorMessa
         logAndPersist("onRuleMsg", ActorSystemContext.toException(msg.getError()));
         logAndPersist("onRuleMsg", ActorSystemContext.toException(msg.getError()));
     }
     }
 
 
-    public static class ActorCreator extends ContextBasedCreator<RuleNodeActor> {
-        private static final long serialVersionUID = 1L;
+    public static class ActorCreator extends ContextBasedCreator {
 
 
         private final TenantId tenantId;
         private final TenantId tenantId;
         private final RuleChainId ruleChainId;
         private final RuleChainId ruleChainId;
@@ -111,7 +122,12 @@ public class RuleNodeActor extends ComponentActor<RuleNodeId, RuleNodeActorMessa
         }
         }
 
 
         @Override
         @Override
-        public RuleNodeActor create() throws Exception {
+        public TbActorId createActorId() {
+            return new TbEntityActorId(ruleNodeId);
+        }
+
+        @Override
+        public TbActor createActor() {
             return new RuleNodeActor(context, tenantId, ruleChainId, ruleChainName, ruleNodeId);
             return new RuleNodeActor(context, tenantId, ruleChainId, ruleChainName, ruleNodeId);
         }
         }
     }
     }

@@ -15,11 +15,11 @@
  */
  */
 package org.thingsboard.server.actors.ruleChain;
 package org.thingsboard.server.actors.ruleChain;
 
 
-import akka.actor.ActorContext;
-import akka.actor.ActorRef;
 import org.thingsboard.rule.engine.api.TbNode;
 import org.thingsboard.rule.engine.api.TbNode;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.TbActorCtx;
+import org.thingsboard.server.actors.TbActorRef;
 import org.thingsboard.server.actors.shared.ComponentMsgProcessor;
 import org.thingsboard.server.actors.shared.ComponentMsgProcessor;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -34,13 +34,13 @@ import org.thingsboard.server.common.msg.queue.RuleNodeException;
 public class RuleNodeActorMessageProcessor extends ComponentMsgProcessor<RuleNodeId> {
 public class RuleNodeActorMessageProcessor extends ComponentMsgProcessor<RuleNodeId> {
 
 
     private final String ruleChainName;
     private final String ruleChainName;
-    private final ActorRef self;
+    private final TbActorRef self;
     private RuleNode ruleNode;
     private RuleNode ruleNode;
     private TbNode tbNode;
     private TbNode tbNode;
     private DefaultTbContext defaultCtx;
     private DefaultTbContext defaultCtx;
 
 
     RuleNodeActorMessageProcessor(TenantId tenantId, String ruleChainName, RuleNodeId ruleNodeId, ActorSystemContext systemContext
     RuleNodeActorMessageProcessor(TenantId tenantId, String ruleChainName, RuleNodeId ruleNodeId, ActorSystemContext systemContext
-            , ActorRef parent, ActorRef self) {
+            , TbActorRef parent, TbActorRef self) {
         super(systemContext, tenantId, ruleNodeId);
         super(systemContext, tenantId, ruleNodeId);
         this.ruleChainName = ruleChainName;
         this.ruleChainName = ruleChainName;
         this.self = self;
         this.self = self;
@@ -49,7 +49,7 @@ public class RuleNodeActorMessageProcessor extends ComponentMsgProcessor<RuleNod
     }
     }
 
 
     @Override
     @Override
-    public void start(ActorContext context) throws Exception {
+    public void start(TbActorCtx context) throws Exception {
         tbNode = initComponent(ruleNode);
         tbNode = initComponent(ruleNode);
         if (tbNode != null) {
         if (tbNode != null) {
             state = ComponentLifecycleState.ACTIVE;
             state = ComponentLifecycleState.ACTIVE;
@@ -57,7 +57,7 @@ public class RuleNodeActorMessageProcessor extends ComponentMsgProcessor<RuleNod
     }
     }
 
 
     @Override
     @Override
-    public void onUpdate(ActorContext context) throws Exception {
+    public void onUpdate(TbActorCtx context) throws Exception {
         RuleNode newRuleNode = systemContext.getRuleChainService().findRuleNodeById(tenantId, entityId);
         RuleNode newRuleNode = systemContext.getRuleChainService().findRuleNodeById(tenantId, entityId);
         boolean restartRequired = state != ComponentLifecycleState.ACTIVE ||
         boolean restartRequired = state != ComponentLifecycleState.ACTIVE ||
                 !(ruleNode.getType().equals(newRuleNode.getType()) && ruleNode.getConfiguration().equals(newRuleNode.getConfiguration()));
                 !(ruleNode.getType().equals(newRuleNode.getType()) && ruleNode.getConfiguration().equals(newRuleNode.getConfiguration()));
@@ -72,11 +72,11 @@ public class RuleNodeActorMessageProcessor extends ComponentMsgProcessor<RuleNod
     }
     }
 
 
     @Override
     @Override
-    public void stop(ActorContext context) {
+    public void stop(TbActorCtx context) {
         if (tbNode != null) {
         if (tbNode != null) {
             tbNode.destroy();
             tbNode.destroy();
+            state = ComponentLifecycleState.SUSPENDED;
         }
         }
-        context.stop(self);
     }
     }
 
 
     @Override
     @Override

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.actors.ruleChain;
 package org.thingsboard.server.actors.ruleChain;
 
 
-import akka.actor.ActorRef;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;
+import org.thingsboard.server.actors.TbActorRef;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.common.data.rule.RuleNode;
 
 
@@ -28,7 +28,7 @@ import org.thingsboard.server.common.data.rule.RuleNode;
 @AllArgsConstructor
 @AllArgsConstructor
 final class RuleNodeCtx {
 final class RuleNodeCtx {
     private final TenantId tenantId;
     private final TenantId tenantId;
-    private final ActorRef chainActor;
-    private final ActorRef selfActor;
+    private final TbActorRef chainActor;
+    private final TbActorRef selfActor;
     private RuleNode self;
     private RuleNode self;
 }
 }

@@ -15,19 +15,23 @@
  */
  */
 package org.thingsboard.server.actors.service;
 package org.thingsboard.server.actors.service;
 
 
-import akka.actor.ActorRef;
+import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.TbActor;
+import org.thingsboard.server.actors.TbActorCtx;
+import org.thingsboard.server.actors.TbActorException;
 import org.thingsboard.server.actors.shared.ComponentMsgProcessor;
 import org.thingsboard.server.actors.shared.ComponentMsgProcessor;
 import org.thingsboard.server.actors.stats.StatsPersistMsg;
 import org.thingsboard.server.actors.stats.StatsPersistMsg;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
-import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
 import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
 import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
+import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
 
 
 /**
 /**
  * @author Andrew Shvayka
  * @author Andrew Shvayka
  */
  */
+@Slf4j
 public abstract class ComponentActor<T extends EntityId, P extends ComponentMsgProcessor<T>> extends ContextAwareActor {
 public abstract class ComponentActor<T extends EntityId, P extends ComponentMsgProcessor<T>> extends ContextAwareActor {
 
 
     private long lastPersistedErrorTs = 0L;
     private long lastPersistedErrorTs = 0L;
@@ -43,30 +47,34 @@ public abstract class ComponentActor<T extends EntityId, P extends ComponentMsgP
         this.id = id;
         this.id = id;
     }
     }
 
 
-    protected void setProcessor(P processor) {
-        this.processor = processor;
-    }
+    abstract protected P createProcessor(TbActorCtx ctx);
 
 
     @Override
     @Override
-    public void preStart() {
+    public void init(TbActorCtx ctx) throws TbActorException {
+        super.init(ctx);
+        this.processor = createProcessor(ctx);
+        initProcessor(ctx);
+    }
+
+    protected void initProcessor(TbActorCtx ctx) throws TbActorException {
         try {
         try {
             log.debug("[{}][{}][{}] Starting processor.", tenantId, id, id.getEntityType());
             log.debug("[{}][{}][{}] Starting processor.", tenantId, id, id.getEntityType());
-            processor.start(context());
+            processor.start(ctx);
             logLifecycleEvent(ComponentLifecycleEvent.STARTED);
             logLifecycleEvent(ComponentLifecycleEvent.STARTED);
             if (systemContext.isStatisticsEnabled()) {
             if (systemContext.isStatisticsEnabled()) {
                 scheduleStatsPersistTick();
                 scheduleStatsPersistTick();
             }
             }
         } catch (Exception e) {
         } catch (Exception e) {
-            log.warn("[{}][{}] Failed to start {} processor.", tenantId, id, id.getEntityType());
-            log.warn("Error:", e);
+            log.debug("[{}][{}] Failed to start {} processor.", tenantId, id, id.getEntityType(), e);
             logAndPersist("OnStart", e, true);
             logAndPersist("OnStart", e, true);
             logLifecycleEvent(ComponentLifecycleEvent.STARTED, e);
             logLifecycleEvent(ComponentLifecycleEvent.STARTED, e);
+            throw new TbActorException("Failed to init actor", e);
         }
         }
     }
     }
 
 
     private void scheduleStatsPersistTick() {
     private void scheduleStatsPersistTick() {
         try {
         try {
-            processor.scheduleStatsPersistTick(context(), systemContext.getStatisticsPersistFrequency());
+            processor.scheduleStatsPersistTick(ctx, systemContext.getStatisticsPersistFrequency());
         } catch (Exception e) {
         } catch (Exception e) {
             log.error("[{}][{}] Failed to schedule statistics store message. No statistics is going to be stored: {}", tenantId, id, e.getMessage());
             log.error("[{}][{}] Failed to schedule statistics store message. No statistics is going to be stored: {}", tenantId, id, e.getMessage());
             logAndPersist("onScheduleStatsPersistMsg", e);
             logAndPersist("onScheduleStatsPersistMsg", e);
@@ -74,10 +82,12 @@ public abstract class ComponentActor<T extends EntityId, P extends ComponentMsgP
     }
     }
 
 
     @Override
     @Override
-    public void postStop() {
+    public void destroy() {
         try {
         try {
-            log.debug("[{}][{}] Stopping processor.", tenantId, id, id.getEntityType());
-            processor.stop(context());
+            log.debug("[{}][{}][{}] Stopping processor.", tenantId, id, id.getEntityType());
+            if (processor != null) {
+                processor.stop(ctx);
+            }
             logLifecycleEvent(ComponentLifecycleEvent.STOPPED);
             logLifecycleEvent(ComponentLifecycleEvent.STOPPED);
         } catch (Exception e) {
         } catch (Exception e) {
             log.warn("[{}][{}] Failed to stop {} processor: {}", tenantId, id, id.getEntityType(), e.getMessage());
             log.warn("[{}][{}] Failed to stop {} processor: {}", tenantId, id, id.getEntityType(), e.getMessage());
@@ -91,19 +101,20 @@ public abstract class ComponentActor<T extends EntityId, P extends ComponentMsgP
         try {
         try {
             switch (msg.getEvent()) {
             switch (msg.getEvent()) {
                 case CREATED:
                 case CREATED:
-                    processor.onCreated(context());
+                    processor.onCreated(ctx);
                     break;
                     break;
                 case UPDATED:
                 case UPDATED:
-                    processor.onUpdate(context());
+                    processor.onUpdate(ctx);
                     break;
                     break;
                 case ACTIVATED:
                 case ACTIVATED:
-                    processor.onActivate(context());
+                    processor.onActivate(ctx);
                     break;
                     break;
                 case SUSPENDED:
                 case SUSPENDED:
-                    processor.onSuspend(context());
+                    processor.onSuspend(ctx);
                     break;
                     break;
                 case DELETED:
                 case DELETED:
-                    processor.onStop(context());
+                    processor.onStop(ctx);
+                    ctx.stop(ctx.getSelf());
                     break;
                     break;
                 default:
                 default:
                     break;
                     break;
@@ -125,7 +136,7 @@ public abstract class ComponentActor<T extends EntityId, P extends ComponentMsgP
 
 
     protected void onStatsPersistTick(EntityId entityId) {
     protected void onStatsPersistTick(EntityId entityId) {
         try {
         try {
-            systemContext.getStatsActor().tell(new StatsPersistMsg(messagesProcessed, errorsOccurred, tenantId, entityId), ActorRef.noSender());
+            systemContext.getStatsActor().tell(new StatsPersistMsg(messagesProcessed, errorsOccurred, tenantId, entityId));
             resetStatsCounters();
             resetStatsCounters();
         } catch (Exception e) {
         } catch (Exception e) {
             logAndPersist("onStatsPersistTick", e);
             logAndPersist("onStatsPersistTick", e);
@@ -149,11 +160,11 @@ public abstract class ComponentActor<T extends EntityId, P extends ComponentMsgP
         errorsOccurred++;
         errorsOccurred++;
         String componentName = processor != null ? processor.getComponentName() : "Unknown";
         String componentName = processor != null ? processor.getComponentName() : "Unknown";
         if (critical) {
         if (critical) {
-            log.warn("[{}][{}][{}] Failed to process {} msg: {}", id, tenantId, componentName, method);
-            log.warn("Critical Error: ", e);
+            log.debug("[{}][{}][{}] Failed to process method: {}", id, tenantId, componentName, method);
+            log.debug("Critical Error: ", e);
         } else {
         } else {
-            log.debug("[{}][{}][{}] Failed to process {} msg: {}", id, tenantId, componentName, method);
-            log.debug("Debug Error: ", e);
+            log.trace("[{}][{}][{}] Failed to process method: {}", id, tenantId, componentName, method);
+            log.trace("Debug Error: ", e);
         }
         }
         long ts = System.currentTimeMillis();
         long ts = System.currentTimeMillis();
         if (ts - lastPersistedErrorTs > getErrorPersistFrequency()) {
         if (ts - lastPersistedErrorTs > getErrorPersistFrequency()) {

@@ -15,17 +15,18 @@
  */
  */
 package org.thingsboard.server.actors.service;
 package org.thingsboard.server.actors.service;
 
 
-import akka.actor.Terminated;
-import akka.actor.UntypedAbstractActor;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
+import org.thingsboard.server.actors.AbstractTbActor;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.ProcessFailureStrategy;
+import org.thingsboard.server.actors.TbActor;
+import org.thingsboard.server.actors.TbActorCtx;
 import org.thingsboard.server.common.msg.TbActorMsg;
 import org.thingsboard.server.common.msg.TbActorMsg;
 
 
-
-public abstract class ContextAwareActor extends UntypedAbstractActor {
-
-    protected final Logger log = LoggerFactory.getLogger(getClass());
+@Slf4j
+public abstract class ContextAwareActor extends AbstractTbActor {
 
 
     public static final int ENTITY_PACK_LIMIT = 1024;
     public static final int ENTITY_PACK_LIMIT = 1024;
 
 
@@ -37,27 +38,29 @@ public abstract class ContextAwareActor extends UntypedAbstractActor {
     }
     }
 
 
     @Override
     @Override
-    public void onReceive(Object msg) {
+    public boolean process(TbActorMsg msg) {
         if (log.isDebugEnabled()) {
         if (log.isDebugEnabled()) {
             log.debug("Processing msg: {}", msg);
             log.debug("Processing msg: {}", msg);
         }
         }
-        if (msg instanceof TbActorMsg) {
-            try {
-                if (!process((TbActorMsg) msg)) {
-                    log.warn("Unknown message: {}!", msg);
-                }
-            } catch (Exception e) {
-                throw e;
-            }
-        } else if (msg instanceof Terminated) {
-            processTermination((Terminated) msg);
-        } else {
-            log.warn("Unknown message: {}!", msg);
+        if (!doProcess(msg)) {
+            log.warn("Unprocessed message: {}!", msg);
         }
         }
+        return false;
     }
     }
 
 
-    protected void processTermination(Terminated msg) {
+    protected abstract boolean doProcess(TbActorMsg msg);
+
+    @Override
+    public ProcessFailureStrategy onProcessFailure(Throwable t) {
+        log.debug("[{}] Processing failure: ", getActorRef().getActorId(), t);
+        return doProcessFailure(t);
     }
     }
 
 
-    protected abstract boolean process(TbActorMsg msg);
+    protected ProcessFailureStrategy doProcessFailure(Throwable t) {
+        if (t instanceof Error) {
+            return ProcessFailureStrategy.stop();
+        } else {
+            return ProcessFailureStrategy.resume();
+        }
+    }
 }
 }

@@ -15,12 +15,10 @@
  */
  */
 package org.thingsboard.server.actors.service;
 package org.thingsboard.server.actors.service;
 
 
-import akka.japi.Creator;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.TbActorCreator;
 
 
-public abstract class ContextBasedCreator<T> implements Creator<T> {
-
-    private static final long serialVersionUID = 1L;
+public abstract class ContextBasedCreator implements TbActorCreator {
 
 
     protected final transient ActorSystemContext context;
     protected final transient ActorSystemContext context;
 
 

@@ -15,85 +15,121 @@
  */
  */
 package org.thingsboard.server.actors.service;
 package org.thingsboard.server.actors.service;
 
 
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Props;
-import akka.actor.Terminated;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.context.event.EventListener;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.DefaultTbActorSystem;
+import org.thingsboard.server.actors.TbActorId;
+import org.thingsboard.server.actors.TbActorRef;
+import org.thingsboard.server.actors.TbActorSystem;
+import org.thingsboard.server.actors.TbActorSystemSettings;
 import org.thingsboard.server.actors.app.AppActor;
 import org.thingsboard.server.actors.app.AppActor;
 import org.thingsboard.server.actors.app.AppInitMsg;
 import org.thingsboard.server.actors.app.AppInitMsg;
 import org.thingsboard.server.actors.stats.StatsActor;
 import org.thingsboard.server.actors.stats.StatsActor;
 import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
 import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
 import org.thingsboard.server.queue.discovery.PartitionChangeEvent;
 import org.thingsboard.server.queue.discovery.PartitionChangeEvent;
-import scala.concurrent.Await;
-import scala.concurrent.Future;
-import scala.concurrent.duration.Duration;
 
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.annotation.PreDestroy;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 
 
 @Service
 @Service
 @Slf4j
 @Slf4j
 public class DefaultActorService implements ActorService {
 public class DefaultActorService implements ActorService {
 
 
-    private static final String ACTOR_SYSTEM_NAME = "Akka";
-
     public static final String APP_DISPATCHER_NAME = "app-dispatcher";
     public static final String APP_DISPATCHER_NAME = "app-dispatcher";
-    public static final String CORE_DISPATCHER_NAME = "core-dispatcher";
-    public static final String SYSTEM_RULE_DISPATCHER_NAME = "system-rule-dispatcher";
-    public static final String TENANT_RULE_DISPATCHER_NAME = "rule-dispatcher";
+    public static final String TENANT_DISPATCHER_NAME = "tenant-dispatcher";
+    public static final String DEVICE_DISPATCHER_NAME = "device-dispatcher";
+    public static final String RULE_DISPATCHER_NAME = "rule-dispatcher";
 
 
     @Autowired
     @Autowired
     private ActorSystemContext actorContext;
     private ActorSystemContext actorContext;
 
 
-    private ActorSystem system;
+    private TbActorSystem system;
+
+    private TbActorRef appActor;
+
+    @Value("${actors.system.throughput:5}")
+    private int actorThroughput;
+
+    @Value("${actors.system.max_actor_init_attempts:10}")
+    private int maxActorInitAttempts;
+
+    @Value("${actors.system.scheduler_pool_size:1}")
+    private int schedulerPoolSize;
+
+    @Value("${actors.system.app_dispatcher_pool_size:1}")
+    private int appDispatcherSize;
+
+    @Value("${actors.system.tenant_dispatcher_pool_size:2}")
+    private int tenantDispatcherSize;
 
 
-    private ActorRef appActor;
+    @Value("${actors.system.device_dispatcher_pool_size:4}")
+    private int deviceDispatcherSize;
+
+    @Value("${actors.system.rule_dispatcher_pool_size:4}")
+    private int ruleDispatcherSize;
 
 
     @PostConstruct
     @PostConstruct
     public void initActorSystem() {
     public void initActorSystem() {
-        log.info("Initializing Actor system.");
+        log.info("Initializing actor system.");
         actorContext.setActorService(this);
         actorContext.setActorService(this);
-        system = ActorSystem.create(ACTOR_SYSTEM_NAME, actorContext.getConfig());
+        TbActorSystemSettings settings = new TbActorSystemSettings(actorThroughput, schedulerPoolSize, maxActorInitAttempts);
+        system = new DefaultTbActorSystem(settings);
+
+        system.createDispatcher(APP_DISPATCHER_NAME, initDispatcherExecutor(APP_DISPATCHER_NAME, appDispatcherSize));
+        system.createDispatcher(TENANT_DISPATCHER_NAME, initDispatcherExecutor(TENANT_DISPATCHER_NAME, tenantDispatcherSize));
+        system.createDispatcher(DEVICE_DISPATCHER_NAME, initDispatcherExecutor(DEVICE_DISPATCHER_NAME, deviceDispatcherSize));
+        system.createDispatcher(RULE_DISPATCHER_NAME, initDispatcherExecutor(RULE_DISPATCHER_NAME, ruleDispatcherSize));
+
         actorContext.setActorSystem(system);
         actorContext.setActorSystem(system);
 
 
-        appActor = system.actorOf(Props.create(new AppActor.ActorCreator(actorContext)).withDispatcher(APP_DISPATCHER_NAME), "appActor");
+        appActor = system.createRootActor(APP_DISPATCHER_NAME, new AppActor.ActorCreator(actorContext));
         actorContext.setAppActor(appActor);
         actorContext.setAppActor(appActor);
 
 
-        ActorRef statsActor = system.actorOf(Props.create(new StatsActor.ActorCreator(actorContext)).withDispatcher(CORE_DISPATCHER_NAME), "statsActor");
+        TbActorRef statsActor = system.createRootActor(TENANT_DISPATCHER_NAME, new StatsActor.ActorCreator(actorContext, "StatsActor"));
         actorContext.setStatsActor(statsActor);
         actorContext.setStatsActor(statsActor);
 
 
         log.info("Actor system initialized.");
         log.info("Actor system initialized.");
     }
     }
 
 
+    private ExecutorService initDispatcherExecutor(String dispatcherName, int poolSize) {
+        if (poolSize == 0) {
+            int cores = Runtime.getRuntime().availableProcessors();
+            poolSize = Math.max(1, cores / 2);
+        }
+        if (poolSize == 1) {
+            return Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName(dispatcherName));
+        } else {
+            return Executors.newWorkStealingPool(poolSize);
+        }
+    }
+
     @EventListener(ApplicationReadyEvent.class)
     @EventListener(ApplicationReadyEvent.class)
     public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
     public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
         log.info("Received application ready event. Sending application init message to actor system");
         log.info("Received application ready event. Sending application init message to actor system");
-        appActor.tell(new AppInitMsg(), ActorRef.noSender());
+        appActor.tellWithHighPriority(new AppInitMsg());
     }
     }
 
 
     @EventListener(PartitionChangeEvent.class)
     @EventListener(PartitionChangeEvent.class)
     public void onApplicationEvent(PartitionChangeEvent partitionChangeEvent) {
     public void onApplicationEvent(PartitionChangeEvent partitionChangeEvent) {
         log.info("Received partition change event.");
         log.info("Received partition change event.");
-        this.appActor.tell(new PartitionChangeMsg(partitionChangeEvent.getServiceQueueKey(), partitionChangeEvent.getPartitions()), ActorRef.noSender());
+        this.appActor.tellWithHighPriority(new PartitionChangeMsg(partitionChangeEvent.getServiceQueueKey(), partitionChangeEvent.getPartitions()));
     }
     }
 
 
     @PreDestroy
     @PreDestroy
     public void stopActorSystem() {
     public void stopActorSystem() {
-        Future<Terminated> status = system.terminate();
-        try {
-            Terminated terminated = Await.result(status, Duration.Inf());
-            log.info("Actor system terminated: {}", terminated);
-        } catch (Exception e) {
-            log.error("Failed to terminate actor system.", e);
+        if (system != null) {
+            log.info("Stopping actor system.");
+            system.stop();
+            log.info("Actor system stopped.");
         }
         }
     }
     }
 
 

@@ -15,18 +15,13 @@
  */
  */
 package org.thingsboard.server.actors.shared;
 package org.thingsboard.server.actors.shared;
 
 
-import akka.actor.ActorContext;
-import akka.actor.ActorRef;
-import akka.actor.Scheduler;
-import akka.event.LoggingAdapter;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
-import scala.concurrent.ExecutionContextExecutor;
-import scala.concurrent.duration.Duration;
+import org.thingsboard.server.actors.TbActorCtx;
+import org.thingsboard.server.common.msg.TbActorMsg;
 
 
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
 
 
 @Slf4j
 @Slf4j
@@ -40,31 +35,16 @@ public abstract class AbstractContextAwareMsgProcessor {
         this.systemContext = systemContext;
         this.systemContext = systemContext;
     }
     }
 
 
-    private Scheduler getScheduler() {
+    private ScheduledExecutorService getScheduler() {
         return systemContext.getScheduler();
         return systemContext.getScheduler();
     }
     }
 
 
-    private ExecutionContextExecutor getSystemDispatcher() {
-        return systemContext.getActorSystem().dispatcher();
+    protected void schedulePeriodicMsgWithDelay(TbActorCtx ctx, TbActorMsg msg, long delayInMs, long periodInMs) {
+        systemContext.schedulePeriodicMsgWithDelay(ctx, msg, delayInMs, periodInMs);
     }
     }
 
 
-    protected void schedulePeriodicMsgWithDelay(ActorContext ctx, Object msg, long delayInMs, long periodInMs) {
-        schedulePeriodicMsgWithDelay(msg, delayInMs, periodInMs, ctx.self());
+    protected void scheduleMsgWithDelay(TbActorCtx ctx, TbActorMsg msg, long delayInMs) {
+        systemContext.scheduleMsgWithDelay(ctx, msg, delayInMs);
     }
     }
 
 
-    private void schedulePeriodicMsgWithDelay(Object msg, long delayInMs, long periodInMs, ActorRef target) {
-        log.debug("Scheduling periodic msg {} every {} ms with delay {} ms", msg, periodInMs, delayInMs);
-        getScheduler().schedule(Duration.create(delayInMs, TimeUnit.MILLISECONDS), Duration.create(periodInMs, TimeUnit.MILLISECONDS), target, msg, getSystemDispatcher(), null);
-    }
-
-    protected void scheduleMsgWithDelay(ActorContext ctx, Object msg, long delayInMs) {
-        scheduleMsgWithDelay(msg, delayInMs, ctx.self());
-    }
-
-    private void scheduleMsgWithDelay(Object msg, long delayInMs, ActorRef target) {
-        log.debug("Scheduling msg {} with delay {} ms", msg, delayInMs);
-        getScheduler().scheduleOnce(Duration.create(delayInMs, TimeUnit.MILLISECONDS), target, msg, getSystemDispatcher(), null);
-    }
-
-
 }
 }

@@ -15,16 +15,15 @@
  */
  */
 package org.thingsboard.server.actors.shared;
 package org.thingsboard.server.actors.shared;
 
 
-import akka.actor.ActorContext;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.TbActorCtx;
 import org.thingsboard.server.actors.stats.StatsPersistTick;
 import org.thingsboard.server.actors.stats.StatsPersistTick;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleState;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleState;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
 import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
-import org.thingsboard.server.common.msg.queue.RuleEngineException;
 import org.thingsboard.server.common.msg.queue.RuleNodeException;
 import org.thingsboard.server.common.msg.queue.RuleNodeException;
 
 
 @Slf4j
 @Slf4j
@@ -42,38 +41,38 @@ public abstract class ComponentMsgProcessor<T extends EntityId> extends Abstract
 
 
     public abstract String getComponentName();
     public abstract String getComponentName();
 
 
-    public abstract void start(ActorContext context) throws Exception;
+    public abstract void start(TbActorCtx context) throws Exception;
 
 
-    public abstract void stop(ActorContext context) throws Exception;
+    public abstract void stop(TbActorCtx context) throws Exception;
 
 
     public abstract void onPartitionChangeMsg(PartitionChangeMsg msg) throws Exception;
     public abstract void onPartitionChangeMsg(PartitionChangeMsg msg) throws Exception;
 
 
-    public void onCreated(ActorContext context) throws Exception {
+    public void onCreated(TbActorCtx context) throws Exception {
         start(context);
         start(context);
     }
     }
 
 
-    public void onUpdate(ActorContext context) throws Exception {
+    public void onUpdate(TbActorCtx context) throws Exception {
         restart(context);
         restart(context);
     }
     }
 
 
-    public void onActivate(ActorContext context) throws Exception {
+    public void onActivate(TbActorCtx context) throws Exception {
         restart(context);
         restart(context);
     }
     }
 
 
-    public void onSuspend(ActorContext context) throws Exception {
+    public void onSuspend(TbActorCtx context) throws Exception {
         stop(context);
         stop(context);
     }
     }
 
 
-    public void onStop(ActorContext context) throws Exception {
+    public void onStop(TbActorCtx context) throws Exception {
         stop(context);
         stop(context);
     }
     }
 
 
-    private void restart(ActorContext context) throws Exception {
+    private void restart(TbActorCtx context) throws Exception {
         stop(context);
         stop(context);
         start(context);
         start(context);
     }
     }
 
 
-    public void scheduleStatsPersistTick(ActorContext context, long statsPersistFrequency) {
+    public void scheduleStatsPersistTick(TbActorCtx context, long statsPersistFrequency) {
         schedulePeriodicMsgWithDelay(context, new StatsPersistTick(), statsPersistFrequency, statsPersistFrequency);
         schedulePeriodicMsgWithDelay(context, new StatsPersistTick(), statsPersistFrequency, statsPersistFrequency);
     }
     }
 
 

@@ -19,10 +19,15 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.TbActor;
+import org.thingsboard.server.actors.TbActorCtx;
+import org.thingsboard.server.actors.TbActorId;
+import org.thingsboard.server.actors.TbStringActorId;
 import org.thingsboard.server.actors.service.ContextAwareActor;
 import org.thingsboard.server.actors.service.ContextAwareActor;
 import org.thingsboard.server.actors.service.ContextBasedCreator;
 import org.thingsboard.server.actors.service.ContextBasedCreator;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Event;
 import org.thingsboard.server.common.data.Event;
+import org.thingsboard.server.common.msg.MsgType;
 import org.thingsboard.server.common.msg.TbActorMsg;
 import org.thingsboard.server.common.msg.TbActorMsg;
 
 
 @Slf4j
 @Slf4j
@@ -35,24 +40,17 @@ public class StatsActor extends ContextAwareActor {
     }
     }
 
 
     @Override
     @Override
-    protected boolean process(TbActorMsg msg) {
-        //TODO Move everything here, to work with TbActorMsg\
-        return false;
-    }
-
-    @Override
-    public void onReceive(Object msg) {
+    protected boolean doProcess(TbActorMsg msg) {
         log.debug("Received message: {}", msg);
         log.debug("Received message: {}", msg);
-        if (msg instanceof StatsPersistMsg) {
-            try {
-                onStatsPersistMsg((StatsPersistMsg) msg);
-            } catch (Exception e) {
-                log.warn("Failed to persist statistics: {}", msg, e);
-            }
+        if (msg.getMsgType().equals(MsgType.STATS_PERSIST_MSG)) {
+            onStatsPersistMsg((StatsPersistMsg) msg);
+            return true;
+        } else {
+            return false;
         }
         }
     }
     }
 
 
-    public void onStatsPersistMsg(StatsPersistMsg msg) throws Exception {
+    public void onStatsPersistMsg(StatsPersistMsg msg) {
         Event event = new Event();
         Event event = new Event();
         event.setEntityId(msg.getEntityId());
         event.setEntityId(msg.getEntityId());
         event.setTenantId(msg.getTenantId());
         event.setTenantId(msg.getTenantId());
@@ -65,15 +63,21 @@ public class StatsActor extends ContextAwareActor {
         return mapper.createObjectNode().put("server", serviceId).put("messagesProcessed", messagesProcessed).put("errorsOccurred", errorsOccurred);
         return mapper.createObjectNode().put("server", serviceId).put("messagesProcessed", messagesProcessed).put("errorsOccurred", errorsOccurred);
     }
     }
 
 
-    public static class ActorCreator extends ContextBasedCreator<StatsActor> {
-        private static final long serialVersionUID = 1L;
+    public static class ActorCreator extends ContextBasedCreator {
+        private final String actorId;
 
 
-        public ActorCreator(ActorSystemContext context) {
+        public ActorCreator(ActorSystemContext context, String actorId) {
             super(context);
             super(context);
+            this.actorId = actorId;
+        }
+
+        @Override
+        public TbActorId createActorId() {
+            return new TbStringActorId(actorId);
         }
         }
 
 
         @Override
         @Override
-        public StatsActor create() {
+        public TbActor createActor() {
             return new StatsActor(context);
             return new StatsActor(context);
         }
         }
     }
     }

@@ -20,13 +20,21 @@ import lombok.Getter;
 import lombok.ToString;
 import lombok.ToString;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.msg.MsgType;
+import org.thingsboard.server.common.msg.TbActorMsg;
 
 
 @AllArgsConstructor
 @AllArgsConstructor
 @Getter
 @Getter
 @ToString
 @ToString
-public final class StatsPersistMsg {
+public final class StatsPersistMsg implements TbActorMsg {
+
     private long messagesProcessed;
     private long messagesProcessed;
     private long errorsOccurred;
     private long errorsOccurred;
     private TenantId tenantId;
     private TenantId tenantId;
     private EntityId entityId;
     private EntityId entityId;
+
+    @Override
+    public MsgType getMsgType() {
+        return MsgType.STATS_PERSIST_MSG;
+    }
 }
 }

@@ -15,16 +15,16 @@
  */
  */
 package org.thingsboard.server.actors.tenant;
 package org.thingsboard.server.actors.tenant;
 
 
-import akka.actor.ActorInitializationException;
-import akka.actor.ActorRef;
-import akka.actor.LocalActorRef;
-import akka.actor.OneForOneStrategy;
-import akka.actor.Props;
-import akka.actor.SupervisorStrategy;
-import akka.actor.Terminated;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
+import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.TbActor;
+import org.thingsboard.server.actors.TbActorCtx;
+import org.thingsboard.server.actors.TbActorException;
+import org.thingsboard.server.actors.TbActorId;
+import org.thingsboard.server.actors.TbActorNotRegisteredException;
+import org.thingsboard.server.actors.TbActorRef;
+import org.thingsboard.server.actors.TbEntityActorId;
+import org.thingsboard.server.actors.TbEntityTypeActorIdPredicate;
 import org.thingsboard.server.actors.device.DeviceActorCreator;
 import org.thingsboard.server.actors.device.DeviceActorCreator;
 import org.thingsboard.server.actors.ruleChain.RuleChainManagerActor;
 import org.thingsboard.server.actors.ruleChain.RuleChainManagerActor;
 import org.thingsboard.server.actors.service.ContextBasedCreator;
 import org.thingsboard.server.actors.service.ContextBasedCreator;
@@ -32,6 +32,7 @@ import org.thingsboard.server.actors.service.DefaultActorService;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleChain;
@@ -46,32 +47,25 @@ import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
 import org.thingsboard.server.common.msg.queue.QueueToRuleEngineMsg;
 import org.thingsboard.server.common.msg.queue.QueueToRuleEngineMsg;
 import org.thingsboard.server.common.msg.queue.RuleEngineException;
 import org.thingsboard.server.common.msg.queue.RuleEngineException;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.ServiceType;
-import scala.concurrent.duration.Duration;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Optional;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 
+@Slf4j
 public class TenantActor extends RuleChainManagerActor {
 public class TenantActor extends RuleChainManagerActor {
 
 
-    private final BiMap<DeviceId, ActorRef> deviceActors;
     private boolean isRuleEngineForCurrentTenant;
     private boolean isRuleEngineForCurrentTenant;
     private boolean isCore;
     private boolean isCore;
 
 
     private TenantActor(ActorSystemContext systemContext, TenantId tenantId) {
     private TenantActor(ActorSystemContext systemContext, TenantId tenantId) {
         super(systemContext, tenantId);
         super(systemContext, tenantId);
-        this.deviceActors = HashBiMap.create();
-    }
-
-    @Override
-    public SupervisorStrategy supervisorStrategy() {
-        return strategy;
     }
     }
 
 
     boolean cantFindTenant = false;
     boolean cantFindTenant = false;
 
 
     @Override
     @Override
-    public void preStart() {
+    public void init(TbActorCtx ctx) throws TbActorException {
+        super.init(ctx);
         log.info("[{}] Starting tenant actor.", tenantId);
         log.info("[{}] Starting tenant actor.", tenantId);
         try {
         try {
             Tenant tenant = systemContext.getTenantService().findTenantById(tenantId);
             Tenant tenant = systemContext.getTenantService().findTenantById(tenantId);
@@ -101,16 +95,18 @@ public class TenantActor extends RuleChainManagerActor {
             }
             }
         } catch (Exception e) {
         } catch (Exception e) {
             log.warn("[{}] Unknown failure", tenantId, e);
             log.warn("[{}] Unknown failure", tenantId, e);
+//            TODO: throw this in 3.1?
+//            throw new TbActorException("Failed to init actor", e);
         }
         }
     }
     }
 
 
     @Override
     @Override
-    public void postStop() {
+    public void destroy() {
         log.info("[{}] Stopping tenant actor.", tenantId);
         log.info("[{}] Stopping tenant actor.", tenantId);
     }
     }
 
 
     @Override
     @Override
-    protected boolean process(TbActorMsg msg) {
+    protected boolean doProcess(TbActorMsg msg) {
         if (cantFindTenant) {
         if (cantFindTenant) {
             log.info("[{}] Processing missing Tenant msg: {}", tenantId, msg);
             log.info("[{}] Processing missing Tenant msg: {}", tenantId, msg);
             if (msg.getMsgType().equals(MsgType.QUEUE_TO_RULE_ENGINE_MSG)) {
             if (msg.getMsgType().equals(MsgType.QUEUE_TO_RULE_ENGINE_MSG)) {
@@ -127,13 +123,13 @@ public class TenantActor extends RuleChainManagerActor {
                     //To Rule Chain Actors
                     //To Rule Chain Actors
                     broadcast(msg);
                     broadcast(msg);
                 } else if (ServiceType.TB_CORE.equals(serviceType)) {
                 } else if (ServiceType.TB_CORE.equals(serviceType)) {
-                    //To Device Actors
-                    List<DeviceId> repartitionedDevices =
-                            deviceActors.keySet().stream().filter(deviceId -> !isMyPartition(deviceId)).collect(Collectors.toList());
-                    for (DeviceId deviceId : repartitionedDevices) {
-                        ActorRef deviceActor = deviceActors.remove(deviceId);
-                        context().stop(deviceActor);
-                    }
+                    List<TbActorId> deviceActorIds = ctx.filterChildren(new TbEntityTypeActorIdPredicate(EntityType.DEVICE) {
+                        @Override
+                        protected boolean testEntityId(EntityId entityId) {
+                            return super.testEntityId(entityId) && !isMyPartition(entityId);
+                        }
+                    });
+                    deviceActorIds.forEach(id -> ctx.stop(id));
                 }
                 }
                 break;
                 break;
             case COMPONENT_LIFE_CYCLE_MSG:
             case COMPONENT_LIFE_CYCLE_MSG:
@@ -143,12 +139,14 @@ public class TenantActor extends RuleChainManagerActor {
                 onQueueToRuleEngineMsg((QueueToRuleEngineMsg) msg);
                 onQueueToRuleEngineMsg((QueueToRuleEngineMsg) msg);
                 break;
                 break;
             case TRANSPORT_TO_DEVICE_ACTOR_MSG:
             case TRANSPORT_TO_DEVICE_ACTOR_MSG:
+                onToDeviceActorMsg((DeviceAwareMsg) msg, false);
+                break;
             case DEVICE_ATTRIBUTES_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_ATTRIBUTES_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_CREDENTIALS_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_CREDENTIALS_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_NAME_OR_TYPE_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_NAME_OR_TYPE_UPDATE_TO_DEVICE_ACTOR_MSG:
             case DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG:
             case DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG:
             case SERVER_RPC_RESPONSE_TO_DEVICE_ACTOR_MSG:
             case SERVER_RPC_RESPONSE_TO_DEVICE_ACTOR_MSG:
-                onToDeviceActorMsg((DeviceAwareMsg) msg);
+                onToDeviceActorMsg((DeviceAwareMsg) msg, true);
                 break;
                 break;
             case RULE_CHAIN_TO_RULE_CHAIN_MSG:
             case RULE_CHAIN_TO_RULE_CHAIN_MSG:
                 onRuleChainMsg((RuleChainAwareMsg) msg);
                 onRuleChainMsg((RuleChainAwareMsg) msg);
@@ -159,8 +157,8 @@ public class TenantActor extends RuleChainManagerActor {
         return true;
         return true;
     }
     }
 
 
-    private boolean isMyPartition(DeviceId deviceId) {
-        return systemContext.resolve(ServiceType.TB_CORE, tenantId, deviceId).isMyPartition();
+    private boolean isMyPartition(EntityId entityId) {
+        return systemContext.resolve(ServiceType.TB_CORE, tenantId, entityId).isMyPartition();
     }
     }
 
 
     private void onQueueToRuleEngineMsg(QueueToRuleEngineMsg msg) {
     private void onQueueToRuleEngineMsg(QueueToRuleEngineMsg msg) {
@@ -171,16 +169,15 @@ public class TenantActor extends RuleChainManagerActor {
         TbMsg tbMsg = msg.getTbMsg();
         TbMsg tbMsg = msg.getTbMsg();
         if (tbMsg.getRuleChainId() == null) {
         if (tbMsg.getRuleChainId() == null) {
             if (getRootChainActor() != null) {
             if (getRootChainActor() != null) {
-                getRootChainActor().tell(msg, self());
+                getRootChainActor().tell(msg);
             } else {
             } else {
                 tbMsg.getCallback().onFailure(new RuleEngineException("No Root Rule Chain available!"));
                 tbMsg.getCallback().onFailure(new RuleEngineException("No Root Rule Chain available!"));
                 log.info("[{}] No Root Chain: {}", tenantId, msg);
                 log.info("[{}] No Root Chain: {}", tenantId, msg);
             }
             }
         } else {
         } else {
-            ActorRef ruleChainActor = get(tbMsg.getRuleChainId());
-            if (ruleChainActor != null) {
-                ruleChainActor.tell(msg, self());
-            } else {
+            try {
+                ctx.tell(new TbEntityActorId(tbMsg.getRuleChainId()), msg);
+            } catch (TbActorNotRegisteredException ex) {
                 log.trace("Received message for non-existing rule chain: [{}]", tbMsg.getRuleChainId());
                 log.trace("Received message for non-existing rule chain: [{}]", tbMsg.getRuleChainId());
                 //TODO: 3.1 Log it to dead letters queue;
                 //TODO: 3.1 Log it to dead letters queue;
                 tbMsg.getCallback().onSuccess();
                 tbMsg.getCallback().onSuccess();
@@ -189,19 +186,24 @@ public class TenantActor extends RuleChainManagerActor {
     }
     }
 
 
     private void onRuleChainMsg(RuleChainAwareMsg msg) {
     private void onRuleChainMsg(RuleChainAwareMsg msg) {
-        getOrCreateActor(context(), msg.getRuleChainId()).tell(msg, self());
+        getOrCreateActor(msg.getRuleChainId()).tell(msg);
     }
     }
 
 
-    private void onToDeviceActorMsg(DeviceAwareMsg msg) {
+    private void onToDeviceActorMsg(DeviceAwareMsg msg, boolean priority) {
         if (!isCore) {
         if (!isCore) {
             log.warn("RECEIVED INVALID MESSAGE: {}", msg);
             log.warn("RECEIVED INVALID MESSAGE: {}", msg);
         }
         }
-        getOrCreateDeviceActor(msg.getDeviceId()).tell(msg, ActorRef.noSender());
+        TbActorRef deviceActor = getOrCreateDeviceActor(msg.getDeviceId());
+        if (priority) {
+            deviceActor.tellWithHighPriority(msg);
+        } else {
+            deviceActor.tell(msg);
+        }
     }
     }
 
 
     private void onComponentLifecycleMsg(ComponentLifecycleMsg msg) {
     private void onComponentLifecycleMsg(ComponentLifecycleMsg msg) {
         if (isRuleEngineForCurrentTenant) {
         if (isRuleEngineForCurrentTenant) {
-            ActorRef target = getEntityActorRef(msg.getEntityId());
+            TbActorRef target = getEntityActorRef(msg.getEntityId());
             if (target != null) {
             if (target != null) {
                 if (msg.getEntityId().getEntityType() == EntityType.RULE_CHAIN) {
                 if (msg.getEntityId().getEntityType() == EntityType.RULE_CHAIN) {
                     RuleChain ruleChain = systemContext.getRuleChainService().
                     RuleChain ruleChain = systemContext.getRuleChainService().
@@ -210,42 +212,20 @@ public class TenantActor extends RuleChainManagerActor {
                         visit(ruleChain, target);
                         visit(ruleChain, target);
                     }
                     }
                 }
                 }
-                target.tell(msg, ActorRef.noSender());
+                target.tellWithHighPriority(msg);
             } else {
             } else {
                 log.debug("[{}] Invalid component lifecycle msg: {}", tenantId, msg);
                 log.debug("[{}] Invalid component lifecycle msg: {}", tenantId, msg);
             }
             }
         }
         }
     }
     }
 
 
-    private ActorRef getOrCreateDeviceActor(DeviceId deviceId) {
-        return deviceActors.computeIfAbsent(deviceId, k -> {
-            log.debug("[{}][{}] Creating device actor.", tenantId, deviceId);
-            ActorRef deviceActor = context().actorOf(Props.create(new DeviceActorCreator(systemContext, tenantId, deviceId))
-                            .withDispatcher(DefaultActorService.CORE_DISPATCHER_NAME)
-                    , deviceId.toString());
-            context().watch(deviceActor);
-            log.debug("[{}][{}] Created device actor: {}.", tenantId, deviceId, deviceActor);
-            return deviceActor;
-        });
-    }
-
-    @Override
-    protected void processTermination(Terminated message) {
-        ActorRef terminated = message.actor();
-        if (terminated instanceof LocalActorRef) {
-            boolean removed = deviceActors.inverse().remove(terminated) != null;
-            if (removed) {
-                log.debug("[{}] Removed actor:", terminated);
-            } else {
-                log.debug("Removed actor was not found in the device map!");
-            }
-        } else {
-            throw new IllegalStateException("Remote actors are not supported!");
-        }
+    private TbActorRef getOrCreateDeviceActor(DeviceId deviceId) {
+        return ctx.getOrCreateChildActor(new TbEntityActorId(deviceId),
+                () -> DefaultActorService.DEVICE_DISPATCHER_NAME,
+                () -> new DeviceActorCreator(systemContext, tenantId, deviceId));
     }
     }
 
 
-    public static class ActorCreator extends ContextBasedCreator<TenantActor> {
-        private static final long serialVersionUID = 1L;
+    public static class ActorCreator extends ContextBasedCreator {
 
 
         private final TenantId tenantId;
         private final TenantId tenantId;
 
 
@@ -255,18 +235,14 @@ public class TenantActor extends RuleChainManagerActor {
         }
         }
 
 
         @Override
         @Override
-        public TenantActor create() {
-            return new TenantActor(context, tenantId);
+        public TbActorId createActorId() {
+            return new TbEntityActorId(tenantId);
         }
         }
-    }
 
 
-    private final SupervisorStrategy strategy = new OneForOneStrategy(3, Duration.create("1 minute"), t -> {
-        log.warn("[{}] Unknown failure", tenantId, t);
-        if (t instanceof ActorInitializationException) {
-            return SupervisorStrategy.stop();
-        } else {
-            return SupervisorStrategy.resume();
+        @Override
+        public TbActor createActor() {
+            return new TenantActor(context, tenantId);
         }
         }
-    });
+    }
 
 
 }
 }

@@ -15,7 +15,6 @@
  */
  */
 package org.thingsboard.server.service.queue;
 package org.thingsboard.server.service.queue;
 
 
-import akka.actor.ActorRef;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -157,7 +156,7 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
                                         tbCoreDeviceRpcService.forwardRpcRequestToDeviceActor((ToDeviceRpcRequestActorMsg) tbActorMsg);
                                         tbCoreDeviceRpcService.forwardRpcRequestToDeviceActor((ToDeviceRpcRequestActorMsg) tbActorMsg);
                                     } else {
                                     } else {
                                         log.trace("[{}] Forwarding message to App Actor {}", id, actorMsg.get());
                                         log.trace("[{}] Forwarding message to App Actor {}", id, actorMsg.get());
-                                        actorContext.tell(actorMsg.get(), ActorRef.noSender());
+                                        actorContext.tell(actorMsg.get());
                                     }
                                     }
                                 }
                                 }
                                 callback.onSuccess();
                                 callback.onSuccess();
@@ -168,7 +167,7 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
                         }
                         }
                     });
                     });
                     if (!processingTimeoutLatch.await(packProcessingTimeout, TimeUnit.MILLISECONDS)) {
                     if (!processingTimeoutLatch.await(packProcessingTimeout, TimeUnit.MILLISECONDS)) {
-                        ctx.getAckMap().forEach((id, msg) -> log.warn("[{}] Timeout to process message: {}", id, msg.getValue()));
+                        ctx.getAckMap().forEach((id, msg) -> log.debug("[{}] Timeout to process message: {}", id, msg.getValue()));
                         ctx.getFailedMap().forEach((id, msg) -> log.warn("[{}] Failed to process message: {}", id, msg.getValue()));
                         ctx.getFailedMap().forEach((id, msg) -> log.warn("[{}] Failed to process message: {}", id, msg.getValue()));
                     }
                     }
                     mainConsumer.commit();
                     mainConsumer.commit();
@@ -215,7 +214,7 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
             Optional<TbActorMsg> actorMsg = encodingService.decode(toCoreNotification.getComponentLifecycleMsg().toByteArray());
             Optional<TbActorMsg> actorMsg = encodingService.decode(toCoreNotification.getComponentLifecycleMsg().toByteArray());
             if (actorMsg.isPresent()) {
             if (actorMsg.isPresent()) {
                 log.trace("[{}] Forwarding message to App Actor {}", id, actorMsg.get());
                 log.trace("[{}] Forwarding message to App Actor {}", id, actorMsg.get());
-                actorContext.tell(actorMsg.get(), ActorRef.noSender());
+                actorContext.tellWithHighPriority(actorMsg.get());
             }
             }
             callback.onSuccess();
             callback.onSuccess();
         }
         }
@@ -293,7 +292,7 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
         if (statsEnabled) {
         if (statsEnabled) {
             stats.log(toDeviceActorMsg);
             stats.log(toDeviceActorMsg);
         }
         }
-        actorContext.tell(new TransportToDeviceActorMsgWrapper(toDeviceActorMsg, callback), ActorRef.noSender());
+        actorContext.tell(new TransportToDeviceActorMsgWrapper(toDeviceActorMsg, callback));
     }
     }
 
 
     private void throwNotHandled(Object msg, TbCallback callback) {
     private void throwNotHandled(Object msg, TbCallback callback) {

@@ -15,7 +15,6 @@
  */
  */
 package org.thingsboard.server.service.queue;
 package org.thingsboard.server.service.queue;
 
 
-import akka.actor.ActorRef;
 import com.google.protobuf.ProtocolStringList;
 import com.google.protobuf.ProtocolStringList;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
@@ -51,7 +50,6 @@ import org.thingsboard.server.service.queue.processing.TbRuleEngineProcessingStr
 import org.thingsboard.server.service.queue.processing.TbRuleEngineSubmitStrategy;
 import org.thingsboard.server.service.queue.processing.TbRuleEngineSubmitStrategy;
 import org.thingsboard.server.service.queue.processing.TbRuleEngineSubmitStrategyFactory;
 import org.thingsboard.server.service.queue.processing.TbRuleEngineSubmitStrategyFactory;
 import org.thingsboard.server.service.rpc.FromDeviceRpcResponse;
 import org.thingsboard.server.service.rpc.FromDeviceRpcResponse;
-import org.thingsboard.server.service.rpc.TbCoreDeviceRpcService;
 import org.thingsboard.server.service.rpc.TbRuleEngineDeviceRpcService;
 import org.thingsboard.server.service.rpc.TbRuleEngineDeviceRpcService;
 import org.thingsboard.server.service.stats.RuleEngineStatisticsService;
 import org.thingsboard.server.service.stats.RuleEngineStatisticsService;
 
 
@@ -168,7 +166,7 @@ public class DefaultTbRuleEngineConsumerService extends AbstractConsumerService<
                             TbMsgCallback callback = new TbMsgPackCallback(id, tenantId, ctx);
                             TbMsgCallback callback = new TbMsgPackCallback(id, tenantId, ctx);
                             try {
                             try {
                                 if (toRuleEngineMsg.getTbMsg() != null && !toRuleEngineMsg.getTbMsg().isEmpty()) {
                                 if (toRuleEngineMsg.getTbMsg() != null && !toRuleEngineMsg.getTbMsg().isEmpty()) {
-                                    forwardToRuleEngineActor(tenantId, toRuleEngineMsg, callback);
+                                    forwardToRuleEngineActor(configuration.getName(), tenantId, toRuleEngineMsg, callback);
                                 } else {
                                 } else {
                                     callback.onSuccess();
                                     callback.onSuccess();
                                 }
                                 }
@@ -182,7 +180,7 @@ public class DefaultTbRuleEngineConsumerService extends AbstractConsumerService<
                             timeout = true;
                             timeout = true;
                         }
                         }
 
 
-                        TbRuleEngineProcessingResult result = new TbRuleEngineProcessingResult(timeout, ctx);
+                        TbRuleEngineProcessingResult result = new TbRuleEngineProcessingResult(configuration.getName(), timeout, ctx);
                         TbRuleEngineProcessingDecision decision = ackStrategy.analyze(result);
                         TbRuleEngineProcessingDecision decision = ackStrategy.analyze(result);
                         if (statsEnabled) {
                         if (statsEnabled) {
                             stats.log(result, decision.isCommit());
                             stats.log(result, decision.isCommit());
@@ -232,7 +230,7 @@ public class DefaultTbRuleEngineConsumerService extends AbstractConsumerService<
             Optional<TbActorMsg> actorMsg = encodingService.decode(nfMsg.getComponentLifecycleMsg().toByteArray());
             Optional<TbActorMsg> actorMsg = encodingService.decode(nfMsg.getComponentLifecycleMsg().toByteArray());
             if (actorMsg.isPresent()) {
             if (actorMsg.isPresent()) {
                 log.trace("[{}] Forwarding message to App Actor {}", id, actorMsg.get());
                 log.trace("[{}] Forwarding message to App Actor {}", id, actorMsg.get());
-                actorContext.tell(actorMsg.get(), ActorRef.noSender());
+                actorContext.tellWithHighPriority(actorMsg.get());
             }
             }
             callback.onSuccess();
             callback.onSuccess();
         } else if (nfMsg.hasFromDeviceRpcResponse()) {
         } else if (nfMsg.hasFromDeviceRpcResponse()) {
@@ -248,8 +246,8 @@ public class DefaultTbRuleEngineConsumerService extends AbstractConsumerService<
         }
         }
     }
     }
 
 
-    private void forwardToRuleEngineActor(TenantId tenantId, ToRuleEngineMsg toRuleEngineMsg, TbMsgCallback callback) {
-        TbMsg tbMsg = TbMsg.fromBytes(toRuleEngineMsg.getTbMsg().toByteArray(), callback);
+    private void forwardToRuleEngineActor(String queueName, TenantId tenantId, ToRuleEngineMsg toRuleEngineMsg, TbMsgCallback callback) {
+        TbMsg tbMsg = TbMsg.fromBytes(queueName, toRuleEngineMsg.getTbMsg().toByteArray(), callback);
         QueueToRuleEngineMsg msg;
         QueueToRuleEngineMsg msg;
         ProtocolStringList relationTypesList = toRuleEngineMsg.getRelationTypesList();
         ProtocolStringList relationTypesList = toRuleEngineMsg.getRelationTypesList();
         Set<String> relationTypes = null;
         Set<String> relationTypes = null;
@@ -261,7 +259,7 @@ public class DefaultTbRuleEngineConsumerService extends AbstractConsumerService<
             }
             }
         }
         }
         msg = new QueueToRuleEngineMsg(tenantId, tbMsg, relationTypes, toRuleEngineMsg.getFailureMessage());
         msg = new QueueToRuleEngineMsg(tenantId, tbMsg, relationTypes, toRuleEngineMsg.getFailureMessage());
-        actorContext.tell(msg, ActorRef.noSender());
+        actorContext.tell(msg);
     }
     }
 
 
     @Scheduled(fixedDelayString = "${queue.rule-engine.stats.print-interval-ms}")
     @Scheduled(fixedDelayString = "${queue.rule-engine.stats.print-interval-ms}")

@@ -28,13 +28,16 @@ import java.util.concurrent.ConcurrentMap;
 public class TbRuleEngineProcessingResult {
 public class TbRuleEngineProcessingResult {
 
 
     @Getter
     @Getter
+    private final String queueName;
+    @Getter
     private final boolean success;
     private final boolean success;
     @Getter
     @Getter
     private final boolean timeout;
     private final boolean timeout;
     @Getter
     @Getter
     private final TbMsgPackProcessingContext ctx;
     private final TbMsgPackProcessingContext ctx;
 
 
-    public TbRuleEngineProcessingResult(boolean timeout, TbMsgPackProcessingContext ctx) {
+    public TbRuleEngineProcessingResult(String queueName, boolean timeout, TbMsgPackProcessingContext ctx) {
+        this.queueName = queueName;
         this.timeout = timeout;
         this.timeout = timeout;
         this.ctx = ctx;
         this.ctx = ctx;
         this.success = !timeout && ctx.getPendingMap().isEmpty() && ctx.getFailedMap().isEmpty();
         this.success = !timeout && ctx.getPendingMap().isEmpty() && ctx.getFailedMap().isEmpty();

@@ -100,7 +100,7 @@ public class TbRuleEngineProcessingStrategyFactory {
                     }
                     }
                     log.debug("[{}] Going to reprocess {} messages", queueName, toReprocess.size());
                     log.debug("[{}] Going to reprocess {} messages", queueName, toReprocess.size());
                     if (log.isTraceEnabled()) {
                     if (log.isTraceEnabled()) {
-                        toReprocess.forEach((id, msg) -> log.trace("Going to reprocess [{}]: {}", id, TbMsg.fromBytes(msg.getValue().getTbMsg().toByteArray(), TbMsgCallback.EMPTY)));
+                        toReprocess.forEach((id, msg) -> log.trace("Going to reprocess [{}]: {}", id, TbMsg.fromBytes(result.getQueueName(), msg.getValue().getTbMsg().toByteArray(), TbMsgCallback.EMPTY)));
                     }
                     }
                     if (pauseBetweenRetries > 0) {
                     if (pauseBetweenRetries > 0) {
                         try {
                         try {
@@ -129,10 +129,10 @@ public class TbRuleEngineProcessingStrategyFactory {
                 log.debug("[{}] Reprocessing skipped for {} failed and {} timeout messages", queueName, result.getFailedMap().size(), result.getPendingMap().size());
                 log.debug("[{}] Reprocessing skipped for {} failed and {} timeout messages", queueName, result.getFailedMap().size(), result.getPendingMap().size());
             }
             }
             if (log.isTraceEnabled()) {
             if (log.isTraceEnabled()) {
-                result.getFailedMap().forEach((id, msg) -> log.trace("Failed messages [{}]: {}", id, TbMsg.fromBytes(msg.getValue().getTbMsg().toByteArray(), TbMsgCallback.EMPTY)));
+                result.getFailedMap().forEach((id, msg) -> log.trace("Failed messages [{}]: {}", id, TbMsg.fromBytes(result.getQueueName(), msg.getValue().getTbMsg().toByteArray(), TbMsgCallback.EMPTY)));
             }
             }
             if (log.isTraceEnabled()) {
             if (log.isTraceEnabled()) {
-                result.getPendingMap().forEach((id, msg) -> log.trace("Timeout messages [{}]: {}", id, TbMsg.fromBytes(msg.getValue().getTbMsg().toByteArray(), TbMsgCallback.EMPTY)));
+                result.getPendingMap().forEach((id, msg) -> log.trace("Timeout messages [{}]: {}", id, TbMsg.fromBytes(result.getQueueName(), msg.getValue().getTbMsg().toByteArray(), TbMsgCallback.EMPTY)));
             }
             }
             return new TbRuleEngineProcessingDecision(true, null);
             return new TbRuleEngineProcessingDecision(true, null);
         }
         }

@@ -15,7 +15,6 @@
  */
  */
 package org.thingsboard.server.service.rpc;
 package org.thingsboard.server.service.rpc;
 
 
-import akka.actor.ActorRef;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -122,7 +121,7 @@ public class DefaultTbCoreDeviceRpcService implements TbCoreDeviceRpcService {
         log.trace("[{}][{}] Processing local rpc call to device actor [{}]", request.getTenantId(), request.getId(), request.getDeviceId());
         log.trace("[{}][{}] Processing local rpc call to device actor [{}]", request.getTenantId(), request.getId(), request.getDeviceId());
         UUID requestId = request.getId();
         UUID requestId = request.getId();
         localToDeviceRpcRequests.put(requestId, rpcMsg);
         localToDeviceRpcRequests.put(requestId, rpcMsg);
-        actorContext.tell(rpcMsg, ActorRef.noSender());
+        actorContext.tellWithHighPriority(rpcMsg);
         scheduleToDeviceTimeout(request, requestId);
         scheduleToDeviceTimeout(request, requestId);
     }
     }
 
 
@@ -176,7 +175,7 @@ public class DefaultTbCoreDeviceRpcService implements TbCoreDeviceRpcService {
     }
     }
 
 
     private void scheduleToRuleEngineTimeout(ToDeviceRpcRequest request, UUID requestId) {
     private void scheduleToRuleEngineTimeout(ToDeviceRpcRequest request, UUID requestId) {
-        long timeout = Math.max(0, request.getExpirationTime() - System.currentTimeMillis());
+        long timeout = Math.max(0, request.getExpirationTime() - System.currentTimeMillis()) + TimeUnit.SECONDS.toMillis(1);
         log.trace("[{}] processing to rule engine request.", requestId);
         log.trace("[{}] processing to rule engine request.", requestId);
         scheduler.schedule(() -> {
         scheduler.schedule(() -> {
             log.trace("[{}] timeout for processing to rule engine request.", requestId);
             log.trace("[{}] timeout for processing to rule engine request.", requestId);
@@ -188,7 +187,7 @@ public class DefaultTbCoreDeviceRpcService implements TbCoreDeviceRpcService {
     }
     }
 
 
     private void scheduleToDeviceTimeout(ToDeviceRpcRequest request, UUID requestId) {
     private void scheduleToDeviceTimeout(ToDeviceRpcRequest request, UUID requestId) {
-        long timeout = Math.max(0, request.getExpirationTime() - System.currentTimeMillis());
+        long timeout = Math.max(0, request.getExpirationTime() - System.currentTimeMillis()) + TimeUnit.SECONDS.toMillis(1);
         log.trace("[{}] processing to device request.", requestId);
         log.trace("[{}] processing to device request.", requestId);
         scheduler.schedule(() -> {
         scheduler.schedule(() -> {
             log.trace("[{}] timeout for to device request.", requestId);
             log.trace("[{}] timeout for to device request.", requestId);

@@ -164,7 +164,7 @@ public class DefaultTbRuleEngineRpcService implements TbRuleEngineDeviceRpcServi
     }
     }
 
 
     private void scheduleTimeout(ToDeviceRpcRequest request, UUID requestId) {
     private void scheduleTimeout(ToDeviceRpcRequest request, UUID requestId) {
-        long timeout = Math.max(0, request.getExpirationTime() - System.currentTimeMillis());
+        long timeout = Math.max(0, request.getExpirationTime() - System.currentTimeMillis()) + TimeUnit.SECONDS.toMillis(1);
         log.trace("[{}] processing the request: [{}]", this.hashCode(), requestId);
         log.trace("[{}] processing the request: [{}]", this.hashCode(), requestId);
         scheduler.schedule(() -> {
         scheduler.schedule(() -> {
             log.trace("[{}] timeout the request: [{}]", this.hashCode(), requestId);
             log.trace("[{}] timeout the request: [{}]", this.hashCode(), requestId);

@@ -126,7 +126,7 @@ public abstract class AbstractNashornJsInvokeService extends AbstractJsInvokeSer
                 scriptIdToNameMap.put(scriptId, functionName);
                 scriptIdToNameMap.put(scriptId, functionName);
                 return scriptId;
                 return scriptId;
             } catch (Exception e) {
             } catch (Exception e) {
-                log.warn("Failed to compile JS script: {}", e.getMessage(), e);
+                log.debug("Failed to compile JS script: {}", e.getMessage(), e);
                 throw new ExecutionException(e);
                 throw new ExecutionException(e);
             }
             }
         });
         });

-#
-# Copyright © 2016-2020 The Thingsboard Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-
-akka {
-  # JVM shutdown, System.exit(-1), in case of a fatal error,
-  # such as OutOfMemoryError
-  jvm-exit-on-fatal-error = off
-  loglevel = "INFO"
-  loggers = ["akka.event.slf4j.Slf4jLogger"]
-}
-
-# This dispatcher is used for app
-app-dispatcher {
-  type = Dispatcher
-  executor = "fork-join-executor"
-  fork-join-executor {
-      # Min number of threads to cap factor-based parallelism number to
-      parallelism-min = 1
-      # Max number of threads to cap factor-based parallelism number to
-      parallelism-max = 1
-      
-      # The parallelism factor is used to determine thread pool size using the
-      # following formula: ceil(available processors * factor). Resulting size
-      # is then bounded by the parallelism-min and parallelism-max values.
-      parallelism-factor = 1.0
-  }
-  # How long time the dispatcher will wait for new actors until it shuts down
-  shutdown-timeout = 1s
-  
-  # Throughput defines the number of messages that are processed in a batch
-  # before the thread is returned to the pool. Set to 1 for as fair as possible.
-  throughput = 5
-}
-
-# This dispatcher is used for rpc actors
-rpc-dispatcher {
-  type = Dispatcher
-  executor = "fork-join-executor"
-  fork-join-executor {
-      # Min number of threads to cap factor-based parallelism number to
-      parallelism-min = 2
-      # Max number of threads to cap factor-based parallelism number to
-      parallelism-max = 8
-
-      # The parallelism factor is used to determine thread pool size using the
-      # following formula: ceil(available processors * factor). Resulting size
-      # is then bounded by the parallelism-min and parallelism-max values.
-      parallelism-factor = 0.5
-  }
-  # How long time the dispatcher will wait for new actors until it shuts down
-  shutdown-timeout = 1s
-
-  # Throughput defines the number of messages that are processed in a batch
-  # before the thread is returned to the pool. Set to 1 for as fair as possible.
-  throughput = 5
-}
-
-# This dispatcher is used for auth
-core-dispatcher {
-  type = Dispatcher
-  executor = "fork-join-executor"
-  fork-join-executor {
-      # Min number of threads to cap factor-based parallelism number to
-      parallelism-min = 2
-      # Max number of threads to cap factor-based parallelism number to
-      parallelism-max = 12
-
-      # The parallelism factor is used to determine thread pool size using the
-      # following formula: ceil(available processors * factor). Resulting size
-      # is then bounded by the parallelism-min and parallelism-max values.
-      parallelism-factor = 0.25
-  }
-  # How long time the dispatcher will wait for new actors until it shuts down
-  shutdown-timeout = 1s
-
-  # Throughput defines the number of messages that are processed in a batch
-  # before the thread is returned to the pool. Set to 1 for as fair as possible.
-  throughput = 5
-}
-
-# This dispatcher is used for system rule chains and rule node actors
-system-rule-dispatcher {
-  type = Dispatcher
-  executor = "fork-join-executor"
-  fork-join-executor {
-    # Min number of threads to cap factor-based parallelism number to
-    parallelism-min = 2
-    # Max number of threads to cap factor-based parallelism number to
-    parallelism-max = 12
-
-    # The parallelism factor is used to determine thread pool size using the
-    # following formula: ceil(available processors * factor). Resulting size
-    # is then bounded by the parallelism-min and parallelism-max values.
-    parallelism-factor = 0.25
-  }
-  # How long time the dispatcher will wait for new actors until it shuts down
-  shutdown-timeout = 1s
-
-  # Throughput defines the number of messages that are processed in a batch
-  # before the thread is returned to the pool. Set to 1 for as fair as possible.
-  throughput = 5
-}
-
-# This dispatcher is used for tenant rule chains and rule node actors
-rule-dispatcher {
-  type = Dispatcher
-  executor = "fork-join-executor"
-  fork-join-executor {
-      # Min number of threads to cap factor-based parallelism number to
-      parallelism-min = 2
-      # Max number of threads to cap factor-based parallelism number to
-      parallelism-max = 12
-
-      # The parallelism factor is used to determine thread pool size using the
-      # following formula: ceil(available processors * factor). Resulting size
-      # is then bounded by the parallelism-min and parallelism-max values.
-      parallelism-factor = 0.25
-  }
-  # How long time the dispatcher will wait for new actors until it shuts down
-  shutdown-timeout = 1s
-
-  # Throughput defines the number of messages that are processed in a batch
-  # before the thread is returned to the pool. Set to 1 for as fair as possible.
-  throughput = 5
-}

@@ -27,7 +27,6 @@
 
 
     <logger name="org.thingsboard.server" level="INFO" />
     <logger name="org.thingsboard.server" level="INFO" />
     <logger name="org.thingsboard.server.service.edge" level="TRACE" />
     <logger name="org.thingsboard.server.service.edge" level="TRACE" />
-    <logger name="akka" level="INFO" />
 
 
 <!--    <logger name="org.thingsboard.server.service.queue" level="TRACE" />-->
 <!--    <logger name="org.thingsboard.server.service.queue" level="TRACE" />-->
 <!--    <logger name="org.thingsboard.server.service.transport" level="TRACE" />-->
 <!--    <logger name="org.thingsboard.server.service.transport" level="TRACE" />-->

@@ -281,6 +281,14 @@ sql:
 
 
 # Actor system parameters
 # Actor system parameters
 actors:
 actors:
+  system:
+    throughput: "${ACTORS_SYSTEM_THROUGHPUT:5}"
+    scheduler_pool_size: "${ACTORS_SYSTEM_SCHEDULER_POOL_SIZE:1}"
+    max_actor_init_attempts: "${ACTORS_SYSTEM_MAX_ACTOR_INIT_ATTEMPTS:10}"
+    app_dispatcher_pool_size: "${ACTORS_SYSTEM_APP_DISPATCHER_POOL_SIZE:1}"
+    tenant_dispatcher_pool_size: "${ACTORS_SYSTEM_TENANT_DISPATCHER_POOL_SIZE:2}"
+    device_dispatcher_pool_size: "${ACTORS_SYSTEM_DEVICE_DISPATCHER_POOL_SIZE:4}"
+    rule_dispatcher_pool_size: "${ACTORS_SYSTEM_RULE_DISPATCHER_POOL_SIZE:4}"
   tenant:
   tenant:
     create_components_on_init: "${ACTORS_TENANT_CREATE_COMPONENTS_ON_INIT:true}"
     create_components_on_init: "${ACTORS_TENANT_CREATE_COMPONENTS_ON_INIT:true}"
   session:
   session:
@@ -318,11 +326,6 @@ actors:
     enabled: "${ACTORS_STATISTICS_ENABLED:true}"
     enabled: "${ACTORS_STATISTICS_ENABLED:true}"
     js_print_interval_ms: "${ACTORS_JS_STATISTICS_PRINT_INTERVAL_MS:10000}"
     js_print_interval_ms: "${ACTORS_JS_STATISTICS_PRINT_INTERVAL_MS:10000}"
     persist_frequency: "${ACTORS_STATISTICS_PERSIST_FREQUENCY:3600000}"
     persist_frequency: "${ACTORS_STATISTICS_PERSIST_FREQUENCY:3600000}"
-  queue:
-    # Enable/disable persistence of un-processed messages to the queue
-    enabled: "${ACTORS_QUEUE_ENABLED:true}"
-    # Maximum allowed timeout for persistence into the queue
-    timeout: "${ACTORS_QUEUE_PERSISTENCE_TIMEOUT:30000}"
 
 
 cache:
 cache:
   # caffeine or redis
   # caffeine or redis

@@ -26,7 +26,9 @@ import java.util.Arrays;
 
 
 @RunWith(ClasspathSuite.class)
 @RunWith(ClasspathSuite.class)
 @ClasspathSuite.ClassnameFilters({
 @ClasspathSuite.ClassnameFilters({
-        "org.thingsboard.server.mqtt.rpc.sql.*Test", "org.thingsboard.server.mqtt.telemetry.sql.*Test"})
+        "org.thingsboard.server.mqtt.rpc.sql.*Test",
+        "org.thingsboard.server.mqtt.telemetry.sql.*Test"
+})
 public class MqttSqlTestSuite {
 public class MqttSqlTestSuite {
 
 
     @ClassRule
     @ClassRule

@@ -136,7 +136,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractC
         String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"24\",\"value\": 1},\"timeout\": 6000}";
         String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"24\",\"value\": 1},\"timeout\": 6000}";
         String deviceId = savedDevice.getId().getId().toString();
         String deviceId = savedDevice.getId().getId().toString();
 
 
-        doPostAsync("/api/plugins/rpc/oneway/" + deviceId, setGpioRequest, String.class, status().isRequestTimeout(),
+        doPostAsync("/api/plugins/rpc/oneway/" + deviceId, setGpioRequest, String.class, status().is(409),
                 asyncContextTimeoutToUseRpcPlugin);
                 asyncContextTimeoutToUseRpcPlugin);
     }
     }
 
 
@@ -193,7 +193,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractC
         String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"27\",\"value\": 1},\"timeout\": 6000}";
         String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"27\",\"value\": 1},\"timeout\": 6000}";
         String deviceId = savedDevice.getId().getId().toString();
         String deviceId = savedDevice.getId().getId().toString();
 
 
-        doPostAsync("/api/plugins/rpc/twoway/" + deviceId, setGpioRequest, String.class, status().isRequestTimeout(),
+        doPostAsync("/api/plugins/rpc/twoway/" + deviceId, setGpioRequest, String.class, status().is(409),
                 asyncContextTimeoutToUseRpcPlugin);
                 asyncContextTimeoutToUseRpcPlugin);
     }
     }
 
 

@@ -15,8 +15,6 @@
  */
  */
 package org.thingsboard.server.rules.flow;
 package org.thingsboard.server.rules.flow;
 
 
-import akka.actor.ActorRef;
-import com.datastax.driver.core.utils.UUIDs;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.After;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Assert;
@@ -26,7 +24,6 @@ import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.rule.engine.metadata.TbGetAttributesNodeConfiguration;
 import org.thingsboard.rule.engine.metadata.TbGetAttributesNodeConfiguration;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
-import org.thingsboard.server.actors.service.ActorService;
 import org.thingsboard.server.common.data.*;
 import org.thingsboard.server.common.data.*;
 import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
 import org.thingsboard.server.common.data.kv.StringDataEntry;
 import org.thingsboard.server.common.data.kv.StringDataEntry;
@@ -36,7 +33,6 @@ import org.thingsboard.server.common.data.rule.RuleChainMetaData;
 import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsg;
-import org.thingsboard.server.common.msg.TbMsgDataType;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.queue.QueueToRuleEngineMsg;
 import org.thingsboard.server.common.msg.queue.QueueToRuleEngineMsg;
 import org.thingsboard.server.common.msg.queue.TbMsgCallback;
 import org.thingsboard.server.common.msg.queue.TbMsgCallback;
@@ -151,7 +147,7 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule
         TbMsg tbMsg = TbMsg.newMsg("CUSTOM", device.getId(), new TbMsgMetaData(), "{}", tbMsgCallback);
         TbMsg tbMsg = TbMsg.newMsg("CUSTOM", device.getId(), new TbMsgMetaData(), "{}", tbMsgCallback);
         QueueToRuleEngineMsg qMsg = new QueueToRuleEngineMsg(savedTenant.getId(), tbMsg, null, null);
         QueueToRuleEngineMsg qMsg = new QueueToRuleEngineMsg(savedTenant.getId(), tbMsg, null, null);
         // Pushing Message to the system
         // Pushing Message to the system
-        actorSystem.tell(qMsg, ActorRef.noSender());
+        actorSystem.tell(qMsg);
         Mockito.verify(tbMsgCallback, Mockito.timeout(10000)).onSuccess();
         Mockito.verify(tbMsgCallback, Mockito.timeout(10000)).onSuccess();
 
 
         TimePageData<Event> eventsPage = getDebugEvents(savedTenant.getId(), ruleChain.getFirstRuleNodeId(), 1000);
         TimePageData<Event> eventsPage = getDebugEvents(savedTenant.getId(), ruleChain.getFirstRuleNodeId(), 1000);
@@ -263,7 +259,7 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule
         TbMsg tbMsg = TbMsg.newMsg("CUSTOM", device.getId(), new TbMsgMetaData(), "{}", tbMsgCallback);
         TbMsg tbMsg = TbMsg.newMsg("CUSTOM", device.getId(), new TbMsgMetaData(), "{}", tbMsgCallback);
         QueueToRuleEngineMsg qMsg = new QueueToRuleEngineMsg(savedTenant.getId(), tbMsg, null, null);
         QueueToRuleEngineMsg qMsg = new QueueToRuleEngineMsg(savedTenant.getId(), tbMsg, null, null);
         // Pushing Message to the system
         // Pushing Message to the system
-        actorSystem.tell(qMsg, ActorRef.noSender());
+        actorSystem.tell(qMsg);
 
 
         Mockito.verify(tbMsgCallback, Mockito.timeout(10000)).onSuccess();
         Mockito.verify(tbMsgCallback, Mockito.timeout(10000)).onSuccess();
 
 

@@ -15,8 +15,6 @@
  */
  */
 package org.thingsboard.server.rules.lifecycle;
 package org.thingsboard.server.rules.lifecycle;
 
 
-import akka.actor.ActorRef;
-import com.datastax.driver.core.utils.UUIDs;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.After;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Assert;
@@ -26,7 +24,6 @@ import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.rule.engine.metadata.TbGetAttributesNodeConfiguration;
 import org.thingsboard.rule.engine.metadata.TbGetAttributesNodeConfiguration;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.ActorSystemContext;
-import org.thingsboard.server.actors.service.ActorService;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Event;
 import org.thingsboard.server.common.data.Event;
@@ -40,7 +37,6 @@ import org.thingsboard.server.common.data.rule.RuleChainMetaData;
 import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsg;
-import org.thingsboard.server.common.msg.TbMsgDataType;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.queue.QueueToRuleEngineMsg;
 import org.thingsboard.server.common.msg.queue.QueueToRuleEngineMsg;
 import org.thingsboard.server.common.msg.queue.TbMsgCallback;
 import org.thingsboard.server.common.msg.queue.TbMsgCallback;
@@ -142,7 +138,7 @@ public abstract class AbstractRuleEngineLifecycleIntegrationTest extends Abstrac
         TbMsg tbMsg = TbMsg.newMsg("CUSTOM", device.getId(), new TbMsgMetaData(), "{}", tbMsgCallback);
         TbMsg tbMsg = TbMsg.newMsg("CUSTOM", device.getId(), new TbMsgMetaData(), "{}", tbMsgCallback);
         QueueToRuleEngineMsg qMsg = new QueueToRuleEngineMsg(savedTenant.getId(), tbMsg, null, null);
         QueueToRuleEngineMsg qMsg = new QueueToRuleEngineMsg(savedTenant.getId(), tbMsg, null, null);
         // Pushing Message to the system
         // Pushing Message to the system
-        actorSystem.tell(qMsg, ActorRef.noSender());
+        actorSystem.tell(qMsg);
         Mockito.verify(tbMsgCallback, Mockito.timeout(3000)).onSuccess();
         Mockito.verify(tbMsgCallback, Mockito.timeout(3000)).onSuccess();
 
 
 
 

@@ -13,8 +13,6 @@
     <logger name="org.apache.cassandra" level="WARN"/>
     <logger name="org.apache.cassandra" level="WARN"/>
     <logger name="org.cassandraunit" level="INFO"/>
     <logger name="org.cassandraunit" level="INFO"/>
 
 
-    <logger name="akka" level="INFO" />
-
     <root level="WARN">
     <root level="WARN">
         <appender-ref ref="console"/>
         <appender-ref ref="console"/>
     </root>
     </root>

+<!--
+
+    Copyright © 2016-2020 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.thingsboard</groupId>
+        <version>2.5.3-SNAPSHOT</version>
+        <artifactId>common</artifactId>
+    </parent>
+    <groupId>org.thingsboard.common</groupId>
+    <artifactId>actor</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Thingsboard Actor system</name>
+    <url>https://thingsboard.io</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <main.dir>${basedir}/../..</main.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.thingsboard.common</groupId>
+            <artifactId>util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thingsboard.common</groupId>
+            <artifactId>message</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import lombok.Getter;
+
+public abstract class AbstractTbActor implements TbActor {
+
+    @Getter
+    protected TbActorCtx ctx;
+
+    @Override
+    public void init(TbActorCtx ctx) throws TbActorException {
+        this.ctx = ctx;
+    }
+
+    @Override
+    public TbActorRef getActorRef() {
+        return ctx;
+    }
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.common.util.ThingsBoardThreadFactory;
+import org.thingsboard.server.common.msg.TbActorMsg;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Data
+public class DefaultTbActorSystem implements TbActorSystem {
+
+    private final ConcurrentMap<String, Dispatcher> dispatchers = new ConcurrentHashMap<>();
+    private final ConcurrentMap<TbActorId, TbActorMailbox> actors = new ConcurrentHashMap<>();
+    private final ConcurrentMap<TbActorId, ReentrantLock> actorCreationLocks = new ConcurrentHashMap<>();
+    private final ConcurrentMap<TbActorId, Set<TbActorId>> parentChildMap = new ConcurrentHashMap<>();
+
+    @Getter
+    private final TbActorSystemSettings settings;
+    @Getter
+    private final ScheduledExecutorService scheduler;
+
+    public DefaultTbActorSystem(TbActorSystemSettings settings) {
+        this.settings = settings;
+        this.scheduler = Executors.newScheduledThreadPool(settings.getSchedulerPoolSize(), ThingsBoardThreadFactory.forName("actor-system-scheduler"));
+    }
+
+    @Override
+    public void createDispatcher(String dispatcherId, ExecutorService executor) {
+        Dispatcher current = dispatchers.putIfAbsent(dispatcherId, new Dispatcher(dispatcherId, executor));
+        if (current != null) {
+            throw new RuntimeException("Dispatcher with id [" + dispatcherId + "] is already registered!");
+        }
+    }
+
+    @Override
+    public void destroyDispatcher(String dispatcherId) {
+        Dispatcher dispatcher = dispatchers.remove(dispatcherId);
+        if (dispatcher != null) {
+            dispatcher.getExecutor().shutdownNow();
+        } else {
+            throw new RuntimeException("Dispatcher with id [" + dispatcherId + "] is not registered!");
+        }
+    }
+
+    @Override
+    public TbActorRef getActor(TbActorId actorId) {
+        return actors.get(actorId);
+    }
+
+    @Override
+    public TbActorRef createRootActor(String dispatcherId, TbActorCreator creator) {
+        return createActor(dispatcherId, creator, null);
+    }
+
+    @Override
+    public TbActorRef createChildActor(String dispatcherId, TbActorCreator creator, TbActorId parent) {
+        return createActor(dispatcherId, creator, parent);
+    }
+
+    private TbActorRef createActor(String dispatcherId, TbActorCreator creator, TbActorId parent) {
+        Dispatcher dispatcher = dispatchers.get(dispatcherId);
+        if (dispatcher == null) {
+            log.warn("Dispatcher with id [{}] is not registered!", dispatcherId);
+            throw new RuntimeException("Dispatcher with id [" + dispatcherId + "] is not registered!");
+        }
+
+        TbActorId actorId = creator.createActorId();
+        TbActorMailbox actorMailbox = actors.get(actorId);
+        if (actorMailbox != null) {
+            log.debug("Actor with id [{}] is already registered!", actorId);
+        } else {
+            Lock actorCreationLock = actorCreationLocks.computeIfAbsent(actorId, id -> new ReentrantLock());
+            actorCreationLock.lock();
+            try {
+                actorMailbox = actors.get(actorId);
+                if (actorMailbox == null) {
+                    log.debug("Creating actor with id [{}]!", actorId);
+                    TbActor actor = creator.createActor();
+                    TbActorRef parentRef = null;
+                    if (parent != null) {
+                        parentRef = getActor(parent);
+                        if (parentRef == null) {
+                            throw new TbActorNotRegisteredException(parent, "Parent Actor with id [" + parent + "] is not registered!");
+                        }
+                    }
+                    TbActorMailbox mailbox = new TbActorMailbox(this, settings, actorId, parentRef, actor, dispatcher);
+                    actors.put(actorId, mailbox);
+                    mailbox.initActor();
+                    actorMailbox = mailbox;
+                    if (parent != null) {
+                        parentChildMap.computeIfAbsent(parent, id -> ConcurrentHashMap.newKeySet()).add(actorId);
+                    }
+                } else {
+                    log.debug("Actor with id [{}] is already registered!", actorId);
+                }
+            } finally {
+                actorCreationLock.unlock();
+                actorCreationLocks.remove(actorId);
+            }
+        }
+        return actorMailbox;
+    }
+
+    @Override
+    public void tellWithHighPriority(TbActorId target, TbActorMsg actorMsg) {
+        tell(target, actorMsg, true);
+    }
+
+    @Override
+    public void tell(TbActorId target, TbActorMsg actorMsg) {
+        tell(target, actorMsg, false);
+    }
+
+    private void tell(TbActorId target, TbActorMsg actorMsg, boolean highPriority) {
+        TbActorMailbox mailbox = actors.get(target);
+        if (mailbox == null) {
+            throw new TbActorNotRegisteredException(target, "Actor with id [" + target + "] is not registered!");
+        }
+        if (highPriority) {
+            mailbox.tellWithHighPriority(actorMsg);
+        } else {
+            mailbox.tell(actorMsg);
+        }
+    }
+
+
+    @Override
+    public void broadcastToChildren(TbActorId parent, TbActorMsg msg) {
+        broadcastToChildren(parent, id -> true, msg);
+    }
+
+    @Override
+    public void broadcastToChildren(TbActorId parent, Predicate<TbActorId> childFilter, TbActorMsg msg) {
+        Set<TbActorId> children = parentChildMap.get(parent);
+        if (children != null) {
+            children.stream().filter(childFilter).forEach(id -> tell(id, msg));
+        }
+    }
+
+    @Override
+    public List<TbActorId> filterChildren(TbActorId parent, Predicate<TbActorId> childFilter) {
+        Set<TbActorId> children = parentChildMap.get(parent);
+        if (children != null) {
+            return children.stream().filter(childFilter).collect(Collectors.toList());
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public void stop(TbActorRef actorRef) {
+        stop(actorRef.getActorId());
+    }
+
+    @Override
+    public void stop(TbActorId actorId) {
+        Set<TbActorId> children = parentChildMap.remove(actorId);
+        if (children != null) {
+            for (TbActorId child : children) {
+                stop(child);
+            }
+        }
+        TbActorMailbox mailbox = actors.remove(actorId);
+        if (mailbox != null) {
+            mailbox.destroy();
+        }
+    }
+
+    @Override
+    public void stop() {
+        dispatchers.values().forEach(dispatcher -> {
+            dispatcher.getExecutor().shutdown();
+            try {
+                dispatcher.getExecutor().awaitTermination(3, TimeUnit.SECONDS);
+            } catch (InterruptedException e) {
+                log.warn("[{}] Failed to stop dispatcher", dispatcher.getDispatcherId(), e);
+            }
+        });
+        if (scheduler != null) {
+            scheduler.shutdownNow();
+        }
+        actors.clear();
+    }
+
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import lombok.Data;
+
+import java.util.concurrent.ExecutorService;
+
+@Data
+class Dispatcher {
+
+    private final String dispatcherId;
+    private final ExecutorService executor;
+
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import lombok.Getter;
+import lombok.ToString;
+
+@ToString
+public class InitFailureStrategy {
+
+    @Getter
+    private boolean stop;
+    @Getter
+    private long retryDelay;
+
+    private InitFailureStrategy(boolean stop, long retryDelay) {
+        this.stop = stop;
+        this.retryDelay = retryDelay;
+    }
+
+    public static InitFailureStrategy retryImmediately() {
+        return new InitFailureStrategy(false, 0);
+    }
+
+    public static InitFailureStrategy retryWithDelay(long ms) {
+        return new InitFailureStrategy(false, ms);
+    }
+
+    public static InitFailureStrategy stop() {
+        return new InitFailureStrategy(true, 0);
+    }
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import lombok.Getter;
+import lombok.ToString;
+
+@ToString
+public class ProcessFailureStrategy {
+
+    @Getter
+    private boolean stop;
+
+    private ProcessFailureStrategy(boolean stop) {
+        this.stop = stop;
+    }
+
+    public static ProcessFailureStrategy stop() {
+        return new ProcessFailureStrategy(true);
+    }
+
+    public static ProcessFailureStrategy resume() {
+        return new ProcessFailureStrategy(false);
+    }
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import org.thingsboard.server.common.msg.TbActorMsg;
+
+public interface TbActor {
+
+    boolean process(TbActorMsg msg);
+
+    TbActorRef getActorRef();
+
+    default void init(TbActorCtx ctx) throws TbActorException {
+    }
+
+    default void destroy() throws TbActorException {
+    }
+
+    default InitFailureStrategy onInitFailure(int attempt, Throwable t) {
+        return InitFailureStrategy.retryWithDelay(5000 * attempt);
+    }
+
+    default ProcessFailureStrategy onProcessFailure(Throwable t) {
+        if (t instanceof Error) {
+            return ProcessFailureStrategy.stop();
+        } else {
+            return ProcessFailureStrategy.resume();
+        }
+    }
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+public interface TbActorCreator {
+
+    TbActorId createActorId();
+
+    TbActor createActor();
+
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import org.thingsboard.server.common.msg.TbActorMsg;
+
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+public interface TbActorCtx extends TbActorRef {
+
+    TbActorId getSelf();
+
+    TbActorRef getParentRef();
+
+    void tell(TbActorId target, TbActorMsg msg);
+
+    void stop(TbActorId target);
+
+    TbActorRef getOrCreateChildActor(TbActorId actorId, Supplier<String> dispatcher, Supplier<TbActorCreator> creator);
+
+    void broadcastToChildren(TbActorMsg msg);
+
+    void broadcastToChildren(TbActorMsg msg, Predicate<TbActorId> childFilter);
+
+    List<TbActorId> filterChildren(Predicate<TbActorId> childFilter);
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+public class TbActorException extends Exception {
+
+    public TbActorException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+public interface TbActorId {
+
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.msg.TbActorMsg;
+
+import java.util.List;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+@Slf4j
+@Data
+public final class TbActorMailbox implements TbActorCtx {
+    private static final boolean HIGH_PRIORITY = true;
+    private static final boolean NORMAL_PRIORITY = false;
+
+    private static final boolean FREE = false;
+    private static final boolean BUSY = true;
+
+    private static final boolean NOT_READY = false;
+    private static final boolean READY = true;
+
+    private final TbActorSystem system;
+    private final TbActorSystemSettings settings;
+    private final TbActorId selfId;
+    private final TbActorRef parentRef;
+    private final TbActor actor;
+    private final Dispatcher dispatcher;
+    private final ConcurrentLinkedQueue<TbActorMsg> highPriorityMsgs = new ConcurrentLinkedQueue<>();
+    private final ConcurrentLinkedQueue<TbActorMsg> normalPriorityMsgs = new ConcurrentLinkedQueue<>();
+    private final AtomicBoolean busy = new AtomicBoolean(FREE);
+    private final AtomicBoolean ready = new AtomicBoolean(NOT_READY);
+    private final AtomicBoolean destroyInProgress = new AtomicBoolean();
+
+    public void initActor() {
+        dispatcher.getExecutor().execute(() -> tryInit(1));
+    }
+
+    private void tryInit(int attempt) {
+        try {
+            log.debug("[{}] Trying to init actor, attempt: {}", selfId, attempt);
+            if (!destroyInProgress.get()) {
+                actor.init(this);
+                if (!destroyInProgress.get()) {
+                    ready.set(READY);
+                    tryProcessQueue(false);
+                }
+            }
+        } catch (Throwable t) {
+            log.debug("[{}] Failed to init actor, attempt: {}", selfId, attempt, t);
+            int attemptIdx = attempt + 1;
+            InitFailureStrategy strategy = actor.onInitFailure(attempt, t);
+            if (strategy.isStop() || (settings.getMaxActorInitAttempts() > 0 && attemptIdx > settings.getMaxActorInitAttempts())) {
+                log.info("[{}] Failed to init actor, attempt {}, going to stop attempts.", selfId, attempt, t);
+                system.stop(selfId);
+            } else if (strategy.getRetryDelay() > 0) {
+                log.info("[{}] Failed to init actor, attempt {}, going to retry in attempts in {}ms", selfId, attempt, strategy.getRetryDelay());
+                log.debug("[{}] Error", selfId, t);
+                system.getScheduler().schedule(() -> dispatcher.getExecutor().execute(() -> tryInit(attemptIdx)), strategy.getRetryDelay(), TimeUnit.MILLISECONDS);
+            } else {
+                log.info("[{}] Failed to init actor, attempt {}, going to retry immediately", selfId, attempt);
+                log.debug("[{}] Error", selfId, t);
+                dispatcher.getExecutor().execute(() -> tryInit(attemptIdx));
+            }
+        }
+    }
+
+    private void enqueue(TbActorMsg msg, boolean highPriority) {
+        if (highPriority) {
+            highPriorityMsgs.add(msg);
+        } else {
+            normalPriorityMsgs.add(msg);
+        }
+        tryProcessQueue(true);
+    }
+
+    private void tryProcessQueue(boolean newMsg) {
+        if (ready.get() == READY) {
+            if (newMsg || !highPriorityMsgs.isEmpty() || !normalPriorityMsgs.isEmpty()) {
+                if (busy.compareAndSet(FREE, BUSY)) {
+                    dispatcher.getExecutor().execute(this::processMailbox);
+                } else {
+                    log.trace("[{}] MessageBox is busy, new msg: {}", selfId, newMsg);
+                }
+            } else {
+                log.trace("[{}] MessageBox is empty, new msg: {}", selfId, newMsg);
+            }
+        } else {
+            log.trace("[{}] MessageBox is not ready, new msg: {}", selfId, newMsg);
+        }
+    }
+
+    private void processMailbox() {
+        boolean noMoreElements = false;
+        for (int i = 0; i < settings.getActorThroughput(); i++) {
+            TbActorMsg msg = highPriorityMsgs.poll();
+            if (msg == null) {
+                msg = normalPriorityMsgs.poll();
+            }
+            if (msg != null) {
+                try {
+                    log.debug("[{}] Going to process message: {}", selfId, msg);
+                    actor.process(msg);
+                } catch (Throwable t) {
+                    log.debug("[{}] Failed to process message: {}", selfId, msg, t);
+                    ProcessFailureStrategy strategy = actor.onProcessFailure(t);
+                    if (strategy.isStop()) {
+                        system.stop(selfId);
+                    }
+                }
+            } else {
+                noMoreElements = true;
+                break;
+            }
+        }
+        if (noMoreElements) {
+            busy.set(FREE);
+            dispatcher.getExecutor().execute(() -> tryProcessQueue(false));
+        } else {
+            dispatcher.getExecutor().execute(this::processMailbox);
+        }
+    }
+
+    @Override
+    public TbActorId getSelf() {
+        return selfId;
+    }
+
+    @Override
+    public void tell(TbActorId target, TbActorMsg actorMsg) {
+        system.tell(target, actorMsg);
+    }
+
+    @Override
+    public void broadcastToChildren(TbActorMsg msg) {
+        system.broadcastToChildren(selfId, msg);
+    }
+
+    @Override
+    public void broadcastToChildren(TbActorMsg msg, Predicate<TbActorId> childFilter) {
+        system.broadcastToChildren(selfId, childFilter, msg);
+    }
+
+    @Override
+    public List<TbActorId> filterChildren(Predicate<TbActorId> childFilter) {
+        return system.filterChildren(selfId, childFilter);
+    }
+
+    @Override
+    public void stop(TbActorId target) {
+        system.stop(target);
+    }
+
+    @Override
+    public TbActorRef getOrCreateChildActor(TbActorId actorId, Supplier<String> dispatcher, Supplier<TbActorCreator> creator) {
+        TbActorRef actorRef = system.getActor(actorId);
+        if (actorRef == null) {
+            return system.createChildActor(dispatcher.get(), creator.get(), selfId);
+        } else {
+            return actorRef;
+        }
+    }
+
+    public void destroy() {
+        destroyInProgress.set(true);
+        dispatcher.getExecutor().execute(() -> {
+            try {
+                ready.set(NOT_READY);
+                actor.destroy();
+            } catch (Throwable t) {
+                log.warn("[{}] Failed to destroy actor: {}", selfId, t);
+            }
+        });
+    }
+
+    @Override
+    public TbActorId getActorId() {
+        return selfId;
+    }
+
+    @Override
+    public void tell(TbActorMsg actorMsg) {
+        enqueue(actorMsg, NORMAL_PRIORITY);
+    }
+
+    @Override
+    public void tellWithHighPriority(TbActorMsg actorMsg) {
+        enqueue(actorMsg, HIGH_PRIORITY);
+    }
+
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import lombok.Getter;
+
+public class TbActorNotRegisteredException extends RuntimeException {
+
+    @Getter
+    private TbActorId target;
+
+    public TbActorNotRegisteredException(TbActorId target, String message) {
+        super(message);
+        this.target = target;
+    }
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import org.thingsboard.server.common.msg.TbActorMsg;
+
+public interface TbActorRef {
+
+    TbActorId getActorId();
+
+    void tell(TbActorMsg actorMsg);
+
+    void tellWithHighPriority(TbActorMsg actorMsg);
+
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import org.thingsboard.server.common.msg.TbActorMsg;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.function.Predicate;
+
+public interface TbActorSystem {
+
+    ScheduledExecutorService getScheduler();
+
+    void createDispatcher(String dispatcherId, ExecutorService executor);
+
+    void destroyDispatcher(String dispatcherId);
+
+    TbActorRef getActor(TbActorId actorId);
+
+    TbActorRef createRootActor(String dispatcherId, TbActorCreator creator);
+
+    TbActorRef createChildActor(String dispatcherId, TbActorCreator creator, TbActorId parent);
+
+    void tell(TbActorId target, TbActorMsg actorMsg);
+
+    void tellWithHighPriority(TbActorId target, TbActorMsg actorMsg);
+
+    void stop(TbActorRef actorRef);
+
+    void stop(TbActorId actorId);
+
+    void stop();
+
+    void broadcastToChildren(TbActorId parent, TbActorMsg msg);
+
+    void broadcastToChildren(TbActorId parent, Predicate<TbActorId> childFilter, TbActorMsg msg);
+
+    List<TbActorId> filterChildren(TbActorId parent, Predicate<TbActorId> childFilter);
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import lombok.Data;
+
+@Data
+public class TbActorSystemSettings {
+
+    private final int actorThroughput;
+    private final int schedulerPoolSize;
+    private final int maxActorInitAttempts;
+
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import lombok.Getter;
+import org.thingsboard.server.common.data.id.EntityId;
+
+import java.util.Objects;
+
+public class TbEntityActorId implements TbActorId {
+
+    @Getter
+    private final EntityId entityId;
+
+    public TbEntityActorId(EntityId entityId) {
+        this.entityId = entityId;
+    }
+
+    @Override
+    public String toString() {
+        return entityId.getEntityType() + "|" + entityId.getId();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        TbEntityActorId that = (TbEntityActorId) o;
+        return entityId.equals(that.entityId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(entityId);
+    }
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import java.util.Objects;
+
+public class TbStringActorId implements TbActorId {
+
+    private final String id;
+
+    public TbStringActorId(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String toString() {
+        return id;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        TbStringActorId that = (TbStringActorId) o;
+        return id.equals(that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import lombok.extern.slf4j.Slf4j;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.thingsboard.server.common.data.id.DeviceId;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+@Slf4j
+@RunWith(MockitoJUnitRunner.class)
+public class ActorSystemTest {
+
+    public static final String ROOT_DISPATCHER = "root-dispatcher";
+    private static final int _100K = 100 * 1024;
+
+    private volatile TbActorSystem actorSystem;
+    private volatile ExecutorService submitPool;
+    private int parallelism;
+
+    @Before
+    public void initActorSystem() {
+        int cores = Runtime.getRuntime().availableProcessors();
+        parallelism = Math.max(2, cores / 2);
+        TbActorSystemSettings settings = new TbActorSystemSettings(5, parallelism, 42);
+        actorSystem = new DefaultTbActorSystem(settings);
+        submitPool = Executors.newWorkStealingPool(parallelism);
+    }
+
+    @After
+    public void shutdownActorSystem() {
+        actorSystem.stop();
+        submitPool.shutdownNow();
+    }
+
+    @Test
+    public void test1actorsAnd100KMessages() throws InterruptedException {
+        actorSystem.createDispatcher(ROOT_DISPATCHER, Executors.newWorkStealingPool(parallelism));
+        testActorsAndMessages(1, _100K, 1);
+    }
+
+    @Test
+    public void test10actorsAnd100KMessages() throws InterruptedException {
+        actorSystem.createDispatcher(ROOT_DISPATCHER, Executors.newWorkStealingPool(parallelism));
+        testActorsAndMessages(10, _100K, 1);
+    }
+
+    @Test
+    public void test100KActorsAnd1Messages5timesSingleThread() throws InterruptedException {
+        actorSystem.createDispatcher(ROOT_DISPATCHER, Executors.newSingleThreadExecutor());
+        testActorsAndMessages(_100K, 1, 5);
+    }
+
+    @Test
+    public void test100KActorsAnd1Messages5times() throws InterruptedException {
+        actorSystem.createDispatcher(ROOT_DISPATCHER, Executors.newWorkStealingPool(parallelism));
+        testActorsAndMessages(_100K, 1, 5);
+    }
+
+    @Test
+    public void test100KActorsAnd10Messages() throws InterruptedException {
+        actorSystem.createDispatcher(ROOT_DISPATCHER, Executors.newWorkStealingPool(parallelism));
+        testActorsAndMessages(_100K, 10, 1);
+    }
+
+    @Test
+    public void test1KActorsAnd1KMessages() throws InterruptedException {
+        actorSystem.createDispatcher(ROOT_DISPATCHER, Executors.newWorkStealingPool(parallelism));
+        testActorsAndMessages(1000, 1000, 10);
+    }
+
+    @Test
+    public void testNoMessagesAfterDestroy() throws InterruptedException {
+        actorSystem.createDispatcher(ROOT_DISPATCHER, Executors.newWorkStealingPool(parallelism));
+        ActorTestCtx testCtx1 = getActorTestCtx(1);
+        ActorTestCtx testCtx2 = getActorTestCtx(1);
+
+        TbActorRef actorId1 = actorSystem.createRootActor(ROOT_DISPATCHER, new SlowInitActor.SlowInitActorCreator(
+                new TbEntityActorId(new DeviceId(UUID.randomUUID())), testCtx1));
+        TbActorRef actorId2 = actorSystem.createRootActor(ROOT_DISPATCHER, new SlowInitActor.SlowInitActorCreator(
+                new TbEntityActorId(new DeviceId(UUID.randomUUID())), testCtx2));
+
+        actorId1.tell(new IntTbActorMsg(42));
+        actorId2.tell(new IntTbActorMsg(42));
+        actorSystem.stop(actorId1);
+
+        Assert.assertTrue(testCtx2.getLatch().await(1, TimeUnit.SECONDS));
+        Assert.assertFalse(testCtx1.getLatch().await(1, TimeUnit.SECONDS));
+    }
+
+    @Test
+    public void testOneActorCreated() throws InterruptedException {
+        actorSystem.createDispatcher(ROOT_DISPATCHER, Executors.newWorkStealingPool(parallelism));
+        ActorTestCtx testCtx1 = getActorTestCtx(1);
+        ActorTestCtx testCtx2 = getActorTestCtx(1);
+        TbActorId actorId = new TbEntityActorId(new DeviceId(UUID.randomUUID()));
+        submitPool.submit(() -> actorSystem.createRootActor(ROOT_DISPATCHER, new SlowCreateActor.SlowCreateActorCreator(actorId, testCtx1)));
+        submitPool.submit(() -> actorSystem.createRootActor(ROOT_DISPATCHER, new SlowCreateActor.SlowCreateActorCreator(actorId, testCtx2)));
+
+        Thread.sleep(1000);
+        actorSystem.tell(actorId, new IntTbActorMsg(42));
+
+        Assert.assertTrue(testCtx1.getLatch().await(1, TimeUnit.SECONDS));
+        Assert.assertFalse(testCtx2.getLatch().await(1, TimeUnit.SECONDS));
+    }
+
+    @Test
+    public void testActorCreatorCalledOnce() throws InterruptedException {
+        actorSystem.createDispatcher(ROOT_DISPATCHER, Executors.newWorkStealingPool(parallelism));
+        ActorTestCtx testCtx = getActorTestCtx(1);
+        TbActorId actorId = new TbEntityActorId(new DeviceId(UUID.randomUUID()));
+        for (int i = 0; i < 1000; i++) {
+            submitPool.submit(() -> actorSystem.createRootActor(ROOT_DISPATCHER, new SlowCreateActor.SlowCreateActorCreator(actorId, testCtx)));
+        }
+        Thread.sleep(1000);
+        actorSystem.tell(actorId, new IntTbActorMsg(42));
+
+        Assert.assertTrue(testCtx.getLatch().await(1, TimeUnit.SECONDS));
+        //One for creation and one for message
+        Assert.assertEquals(2, testCtx.getInvocationCount().get());
+    }
+
+    @Test
+    public void testFailedInit() throws InterruptedException {
+        actorSystem.createDispatcher(ROOT_DISPATCHER, Executors.newWorkStealingPool(parallelism));
+        ActorTestCtx testCtx1 = getActorTestCtx(1);
+        ActorTestCtx testCtx2 = getActorTestCtx(1);
+
+        TbActorRef actorId1 = actorSystem.createRootActor(ROOT_DISPATCHER, new FailedToInitActor.FailedToInitActorCreator(
+                new TbEntityActorId(new DeviceId(UUID.randomUUID())), testCtx1, 1, 3000));
+        TbActorRef actorId2 = actorSystem.createRootActor(ROOT_DISPATCHER, new FailedToInitActor.FailedToInitActorCreator(
+                new TbEntityActorId(new DeviceId(UUID.randomUUID())), testCtx2, 2, 1));
+
+        actorId1.tell(new IntTbActorMsg(42));
+        actorId2.tell(new IntTbActorMsg(42));
+
+        Assert.assertFalse(testCtx1.getLatch().await(2, TimeUnit.SECONDS));
+        Assert.assertTrue(testCtx2.getLatch().await(1, TimeUnit.SECONDS));
+        Assert.assertTrue(testCtx1.getLatch().await(3, TimeUnit.SECONDS));
+    }
+
+
+    public void testActorsAndMessages(int actorsCount, int msgNumber, int times) throws InterruptedException {
+        Random random = new Random();
+        int[] randomIntegers = new int[msgNumber];
+        long sumTmp = 0;
+        for (int i = 0; i < msgNumber; i++) {
+            int tmp = random.nextInt();
+            randomIntegers[i] = tmp;
+            sumTmp += tmp;
+        }
+        long expected = sumTmp;
+
+        List<ActorTestCtx> testCtxes = new ArrayList<>();
+
+        List<TbActorRef> actorRefs = new ArrayList<>();
+        for (int actorIdx = 0; actorIdx < actorsCount; actorIdx++) {
+            ActorTestCtx testCtx = getActorTestCtx(msgNumber);
+            actorRefs.add(actorSystem.createRootActor(ROOT_DISPATCHER, new TestRootActor.TestRootActorCreator(
+                    new TbEntityActorId(new DeviceId(UUID.randomUUID())), testCtx)));
+            testCtxes.add(testCtx);
+        }
+
+        for (int t = 0; t < times; t++) {
+            long start = System.nanoTime();
+            for (int i = 0; i < msgNumber; i++) {
+                int tmp = randomIntegers[i];
+                submitPool.execute(() -> actorRefs.forEach(actorId -> actorId.tell(new IntTbActorMsg(tmp))));
+            }
+            log.info("Submitted all messages");
+            testCtxes.forEach(ctx -> {
+                try {
+                    boolean success = ctx.getLatch().await(1, TimeUnit.MINUTES);
+                    if (!success) {
+                        log.warn("Failed: {}, {}", ctx.getActual().get(), ctx.getInvocationCount().get());
+                    }
+                    Assert.assertTrue(success);
+                    Assert.assertEquals(expected, ctx.getActual().get());
+                    Assert.assertEquals(msgNumber, ctx.getInvocationCount().get());
+                    ctx.clear();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            });
+            long duration = System.nanoTime() - start;
+            log.info("Time spend: {}ns ({} ms)", duration, TimeUnit.NANOSECONDS.toMillis(duration));
+        }
+    }
+
+    private ActorTestCtx getActorTestCtx(int i) {
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        AtomicLong actual = new AtomicLong();
+        AtomicInteger invocations = new AtomicInteger();
+        return new ActorTestCtx(countDownLatch, invocations, i, actual);
+    }
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+@Data
+@AllArgsConstructor
+public class ActorTestCtx {
+
+    private volatile CountDownLatch latch;
+    private final AtomicInteger invocationCount;
+    private final int expectedInvocationCount;
+    private final AtomicLong actual;
+
+    public void clear() {
+        latch = new CountDownLatch(1);
+        invocationCount.set(0);
+        actual.set(0L);
+    }
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class FailedToInitActor extends TestRootActor {
+
+    int retryAttempts;
+    int retryDelay;
+    int attempts = 0;
+
+    public FailedToInitActor(TbActorId actorId, ActorTestCtx testCtx, int retryAttempts, int retryDelay) {
+        super(actorId, testCtx);
+        this.retryAttempts = retryAttempts;
+        this.retryDelay = retryDelay;
+    }
+
+    @Override
+    public void init(TbActorCtx ctx) throws TbActorException {
+        if (attempts < retryAttempts) {
+            attempts++;
+            throw new TbActorException("Test attempt", new RuntimeException());
+        } else {
+            super.init(ctx);
+        }
+    }
+
+    @Override
+    public InitFailureStrategy onInitFailure(int attempt, Throwable t) {
+        return InitFailureStrategy.retryWithDelay(retryDelay);
+    }
+
+    public static class FailedToInitActorCreator implements TbActorCreator {
+
+        private final TbActorId actorId;
+        private final ActorTestCtx testCtx;
+        private final int retryAttempts;
+        private final int retryDelay;
+
+        public FailedToInitActorCreator(TbActorId actorId, ActorTestCtx testCtx, int retryAttempts, int retryDelay) {
+            this.actorId = actorId;
+            this.testCtx = testCtx;
+            this.retryAttempts = retryAttempts;
+            this.retryDelay = retryDelay;
+        }
+
+        @Override
+        public TbActorId createActorId() {
+            return actorId;
+        }
+
+        @Override
+        public TbActor createActor() {
+            return new FailedToInitActor(actorId, testCtx, retryAttempts, retryDelay);
+        }
+    }
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import lombok.Getter;
+import org.thingsboard.server.common.msg.MsgType;
+import org.thingsboard.server.common.msg.TbActorMsg;
+
+public class IntTbActorMsg implements TbActorMsg {
+
+    @Getter
+    private final int value;
+
+    public IntTbActorMsg(int value) {
+        this.value = value;
+    }
+
+    @Override
+    public MsgType getMsgType() {
+        return MsgType.QUEUE_TO_RULE_ENGINE_MSG;
+    }
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class SlowCreateActor extends TestRootActor {
+
+    public SlowCreateActor(TbActorId actorId, ActorTestCtx testCtx) {
+        super(actorId, testCtx);
+        try {
+            Thread.sleep(500);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        testCtx.getInvocationCount().incrementAndGet();
+    }
+
+    public static class SlowCreateActorCreator implements TbActorCreator {
+
+        private final TbActorId actorId;
+        private final ActorTestCtx testCtx;
+
+        public SlowCreateActorCreator(TbActorId actorId, ActorTestCtx testCtx) {
+            this.actorId = actorId;
+            this.testCtx = testCtx;
+        }
+
+        @Override
+        public TbActorId createActorId() {
+            return actorId;
+        }
+
+        @Override
+        public TbActor createActor() {
+            return new SlowCreateActor(actorId, testCtx);
+        }
+    }
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class SlowInitActor extends TestRootActor {
+
+    public SlowInitActor(TbActorId actorId, ActorTestCtx testCtx) {
+        super(actorId, testCtx);
+    }
+
+    @Override
+    public void init(TbActorCtx ctx) throws TbActorException {
+        try {
+            Thread.sleep(500);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        super.init(ctx);
+    }
+
+    public static class SlowInitActorCreator implements TbActorCreator {
+
+        private final TbActorId actorId;
+        private final ActorTestCtx testCtx;
+
+        public SlowInitActorCreator(TbActorId actorId, ActorTestCtx testCtx) {
+            this.actorId = actorId;
+            this.testCtx = testCtx;
+        }
+
+        @Override
+        public TbActorId createActorId() {
+            return actorId;
+        }
+
+        @Override
+        public TbActor createActor() {
+            return new SlowInitActor(actorId, testCtx);
+        }
+    }
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors;
+
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.msg.TbActorMsg;
+
+@Slf4j
+public class TestRootActor extends AbstractTbActor {
+
+    @Getter
+    private final TbActorId actorId;
+    @Getter
+    private final ActorTestCtx testCtx;
+
+    private boolean initialized;
+    private long sum;
+    private int count;
+
+    public TestRootActor(TbActorId actorId, ActorTestCtx testCtx) {
+        this.actorId = actorId;
+        this.testCtx = testCtx;
+    }
+
+    @Override
+    public void init(TbActorCtx ctx) throws TbActorException {
+        super.init(ctx);
+        initialized = true;
+    }
+
+    @Override
+    public boolean process(TbActorMsg msg) {
+        if (initialized) {
+            int value = ((IntTbActorMsg) msg).getValue();
+            sum += value;
+            count += 1;
+            if (count == testCtx.getExpectedInvocationCount()) {
+                testCtx.getActual().set(sum);
+                testCtx.getInvocationCount().addAndGet(count);
+                sum = 0;
+                count = 0;
+                testCtx.getLatch().countDown();
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+
+    public static class TestRootActorCreator implements TbActorCreator {
+
+        private final TbActorId actorId;
+        private final ActorTestCtx testCtx;
+
+        public TestRootActorCreator(TbActorId actorId, ActorTestCtx testCtx) {
+            this.actorId = actorId;
+            this.testCtx = testCtx;
+        }
+
+        @Override
+        public TbActorId createActorId() {
+            return actorId;
+        }
+
+        @Override
+        public TbActor createActor() {
+            return new TestRootActor(actorId, testCtx);
+        }
+    }
+}

+<?xml version="1.0" encoding="UTF-8" ?>
+
+<configuration>
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{ISO8601} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="console"/>
+    </root>
+
+</configuration>

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>
         <groupId>org.thingsboard</groupId>
         <groupId>org.thingsboard</groupId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.5.3-SNAPSHOT</version>
         <artifactId>common</artifactId>
         <artifactId>common</artifactId>
     </parent>
     </parent>
     <groupId>org.thingsboard.common</groupId>
     <groupId>org.thingsboard.common</groupId>

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>
         <groupId>org.thingsboard</groupId>
         <groupId>org.thingsboard</groupId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.5.3-SNAPSHOT</version>
         <artifactId>common</artifactId>
         <artifactId>common</artifactId>
     </parent>
     </parent>
     <groupId>org.thingsboard.common</groupId>
     <groupId>org.thingsboard.common</groupId>

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>
         <groupId>org.thingsboard</groupId>
         <groupId>org.thingsboard</groupId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.5.3-SNAPSHOT</version>
         <artifactId>common</artifactId>
         <artifactId>common</artifactId>
     </parent>
     </parent>
     <groupId>org.thingsboard.common</groupId>
     <groupId>org.thingsboard.common</groupId>

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>
         <groupId>org.thingsboard</groupId>
         <groupId>org.thingsboard</groupId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.5.3-SNAPSHOT</version>
         <artifactId>common</artifactId>
         <artifactId>common</artifactId>
     </parent>
     </parent>
     <groupId>org.thingsboard.common</groupId>
     <groupId>org.thingsboard.common</groupId>

@@ -21,7 +21,6 @@ import org.thingsboard.server.common.msg.queue.QueueToRuleEngineMsg;
 /**
 /**
  * Created by ashvayka on 15.03.18.
  * Created by ashvayka on 15.03.18.
  */
  */
-//TODO: add all "See" references
 public enum MsgType {
 public enum MsgType {
 
 
     /**
     /**
@@ -97,6 +96,7 @@ public enum MsgType {
 
 
     STATS_PERSIST_TICK_MSG,
     STATS_PERSIST_TICK_MSG,
 
 
+    STATS_PERSIST_MSG,
 
 
     /**
     /**
      * Message that is sent by TransportRuleEngineService to Device Actor. Represents messages from the device itself.
      * Message that is sent by TransportRuleEngineService to Device Actor. Represents messages from the device itself.

@@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.msg.gen.MsgProtos;
 import org.thingsboard.server.common.msg.gen.MsgProtos;
+import org.thingsboard.server.common.msg.queue.ServiceQueue;
 import org.thingsboard.server.common.msg.queue.TbMsgCallback;
 import org.thingsboard.server.common.msg.queue.TbMsgCallback;
 
 
 import java.io.IOException;
 import java.io.IOException;
@@ -39,6 +40,7 @@ import java.util.UUID;
 @Slf4j
 @Slf4j
 public final class TbMsg implements Serializable {
 public final class TbMsg implements Serializable {
 
 
+    private final String queueName;
     private final UUID id;
     private final UUID id;
     private final long ts;
     private final long ts;
     private final String type;
     private final String type;
@@ -51,39 +53,44 @@ public final class TbMsg implements Serializable {
     //This field is not serialized because we use queues and there is no need to do it
     //This field is not serialized because we use queues and there is no need to do it
     transient private final TbMsgCallback callback;
     transient private final TbMsgCallback callback;
 
 
+    public static TbMsg newMsg(String queueName, String type, EntityId originator, TbMsgMetaData metaData, String data, RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
+        return new TbMsg(queueName, UUID.randomUUID(), System.currentTimeMillis(), type, originator, metaData.copy(), TbMsgDataType.JSON, data, ruleChainId, ruleNodeId, TbMsgCallback.EMPTY);
+    }
+
     public static TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, String data) {
     public static TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, String data) {
-        return new TbMsg(UUID.randomUUID(), System.currentTimeMillis(), type, originator, metaData.copy(), TbMsgDataType.JSON, data, null, null, TbMsgCallback.EMPTY);
+        return new TbMsg(ServiceQueue.MAIN, UUID.randomUUID(), System.currentTimeMillis(), type, originator, metaData.copy(), TbMsgDataType.JSON, data, null, null, TbMsgCallback.EMPTY);
     }
     }
 
 
-    public static TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, String data, RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
-        return new TbMsg(UUID.randomUUID(), System.currentTimeMillis(), type, originator, metaData.copy(), TbMsgDataType.JSON, data, ruleChainId, ruleNodeId, TbMsgCallback.EMPTY);
+    public static TbMsg newMsg(String queueName, String type, EntityId originator, TbMsgMetaData metaData, String data) {
+        return new TbMsg(queueName, UUID.randomUUID(), System.currentTimeMillis(), type, originator, metaData.copy(), TbMsgDataType.JSON, data, null, null, TbMsgCallback.EMPTY);
     }
     }
 
 
     public static TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, TbMsgDataType dataType, String data) {
     public static TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, TbMsgDataType dataType, String data) {
-        return new TbMsg(UUID.randomUUID(), System.currentTimeMillis(), type, originator, metaData.copy(), dataType, data, null, null, TbMsgCallback.EMPTY);
+        return new TbMsg(ServiceQueue.MAIN, UUID.randomUUID(), System.currentTimeMillis(), type, originator, metaData.copy(), dataType, data, null, null, TbMsgCallback.EMPTY);
     }
     }
 
 
     public static TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, TbMsgDataType dataType, String data, RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
     public static TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, TbMsgDataType dataType, String data, RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
-        return new TbMsg(UUID.randomUUID(), System.currentTimeMillis(), type, originator, metaData.copy(), dataType, data, ruleChainId, ruleNodeId, TbMsgCallback.EMPTY);
+        return new TbMsg(ServiceQueue.MAIN, UUID.randomUUID(), System.currentTimeMillis(), type, originator, metaData.copy(), dataType, data, ruleChainId, ruleNodeId, TbMsgCallback.EMPTY);
     }
     }
 
 
     public static TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, String data, TbMsgCallback callback) {
     public static TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, String data, TbMsgCallback callback) {
-        return new TbMsg(UUID.randomUUID(), System.currentTimeMillis(), type, originator, metaData.copy(), TbMsgDataType.JSON, data, null, null, callback);
+        return new TbMsg(ServiceQueue.MAIN, UUID.randomUUID(), System.currentTimeMillis(), type, originator, metaData.copy(), TbMsgDataType.JSON, data, null, null, callback);
     }
     }
 
 
     public static TbMsg transformMsg(TbMsg origMsg, String type, EntityId originator, TbMsgMetaData metaData, String data) {
     public static TbMsg transformMsg(TbMsg origMsg, String type, EntityId originator, TbMsgMetaData metaData, String data) {
-        return new TbMsg(origMsg.getId(), origMsg.getTs(), type, originator, metaData.copy(), origMsg.getDataType(),
+        return new TbMsg(origMsg.getQueueName(), origMsg.getId(), origMsg.getTs(), type, originator, metaData.copy(), origMsg.getDataType(),
                 data, origMsg.getRuleChainId(), origMsg.getRuleNodeId(), origMsg.getCallback());
                 data, origMsg.getRuleChainId(), origMsg.getRuleNodeId(), origMsg.getCallback());
     }
     }
 
 
     public static TbMsg newMsg(TbMsg tbMsg, RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
     public static TbMsg newMsg(TbMsg tbMsg, RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
-        return new TbMsg(UUID.randomUUID(), tbMsg.getTs(), tbMsg.getType(), tbMsg.getOriginator(), tbMsg.getMetaData().copy(),
+        return new TbMsg(tbMsg.getQueueName(), UUID.randomUUID(), tbMsg.getTs(), tbMsg.getType(), tbMsg.getOriginator(), tbMsg.getMetaData().copy(),
                 tbMsg.getDataType(), tbMsg.getData(), ruleChainId, ruleNodeId, TbMsgCallback.EMPTY);
                 tbMsg.getDataType(), tbMsg.getData(), ruleChainId, ruleNodeId, TbMsgCallback.EMPTY);
     }
     }
 
 
-    private TbMsg(UUID id, long ts, String type, EntityId originator, TbMsgMetaData metaData, TbMsgDataType dataType, String data,
+    private TbMsg(String queueName, UUID id, long ts, String type, EntityId originator, TbMsgMetaData metaData, TbMsgDataType dataType, String data,
                   RuleChainId ruleChainId, RuleNodeId ruleNodeId, TbMsgCallback callback) {
                   RuleChainId ruleChainId, RuleNodeId ruleNodeId, TbMsgCallback callback) {
         this.id = id;
         this.id = id;
+        this.queueName = queueName;
         if (ts > 0) {
         if (ts > 0) {
             this.ts = ts;
             this.ts = ts;
         } else {
         } else {
@@ -136,7 +143,7 @@ public final class TbMsg implements Serializable {
         return builder.build().toByteArray();
         return builder.build().toByteArray();
     }
     }
 
 
-    public static TbMsg fromBytes(byte[] data, TbMsgCallback callback) {
+    public static TbMsg fromBytes(String queueName, byte[] data, TbMsgCallback callback) {
         try {
         try {
             MsgProtos.TbMsgProto proto = MsgProtos.TbMsgProto.parseFrom(data);
             MsgProtos.TbMsgProto proto = MsgProtos.TbMsgProto.parseFrom(data);
             TbMsgMetaData metaData = new TbMsgMetaData(proto.getMetaData().getDataMap());
             TbMsgMetaData metaData = new TbMsgMetaData(proto.getMetaData().getDataMap());
@@ -150,18 +157,18 @@ public final class TbMsg implements Serializable {
                 ruleNodeId = new RuleNodeId(new UUID(proto.getRuleNodeIdMSB(), proto.getRuleNodeIdLSB()));
                 ruleNodeId = new RuleNodeId(new UUID(proto.getRuleNodeIdMSB(), proto.getRuleNodeIdLSB()));
             }
             }
             TbMsgDataType dataType = TbMsgDataType.values()[proto.getDataType()];
             TbMsgDataType dataType = TbMsgDataType.values()[proto.getDataType()];
-            return new TbMsg(UUID.fromString(proto.getId()), proto.getTs(), proto.getType(), entityId, metaData, dataType, proto.getData(), ruleChainId, ruleNodeId, callback);
+            return new TbMsg(queueName, UUID.fromString(proto.getId()), proto.getTs(), proto.getType(), entityId, metaData, dataType, proto.getData(), ruleChainId, ruleNodeId, callback);
         } catch (InvalidProtocolBufferException e) {
         } catch (InvalidProtocolBufferException e) {
             throw new IllegalStateException("Could not parse protobuf for TbMsg", e);
             throw new IllegalStateException("Could not parse protobuf for TbMsg", e);
         }
         }
     }
     }
 
 
     public TbMsg copyWithRuleChainId(RuleChainId ruleChainId) {
     public TbMsg copyWithRuleChainId(RuleChainId ruleChainId) {
-        return new TbMsg(this.id, this.ts, this.type, this.originator, this.metaData, this.dataType, this.data, ruleChainId, null, callback);
+        return new TbMsg(this.queueName, this.id, this.ts, this.type, this.originator, this.metaData, this.dataType, this.data, ruleChainId, null, callback);
     }
     }
 
 
     public TbMsg copyWithRuleNodeId(RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
     public TbMsg copyWithRuleNodeId(RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
-        return new TbMsg(this.id, this.ts, this.type, this.originator, this.metaData, this.dataType, this.data, ruleChainId, ruleNodeId, callback);
+        return new TbMsg(this.queueName, this.id, this.ts, this.type, this.originator, this.metaData, this.dataType, this.data, ruleChainId, ruleNodeId, callback);
     }
     }
 
 
     public TbMsgCallback getCallback() {
     public TbMsgCallback getCallback() {
@@ -172,4 +179,8 @@ public final class TbMsg implements Serializable {
             return TbMsgCallback.EMPTY;
             return TbMsgCallback.EMPTY;
         }
         }
     }
     }
+
+    public String getQueueName() {
+        return queueName != null ? queueName : ServiceQueue.MAIN;
+    }
 }
 }

@@ -16,8 +16,9 @@
 package org.thingsboard.server.common.msg.aware;
 package org.thingsboard.server.common.msg.aware;
 
 
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.msg.TbActorMsg;
 
 
-public interface DeviceAwareMsg {
+public interface DeviceAwareMsg extends TbActorMsg {
 
 
     DeviceId getDeviceId();
     DeviceId getDeviceId();
 }
 }

@@ -16,8 +16,9 @@
 package org.thingsboard.server.common.msg.aware;
 package org.thingsboard.server.common.msg.aware;
 
 
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleChainId;
+import org.thingsboard.server.common.msg.TbActorMsg;
 
 
-public interface RuleChainAwareMsg {
+public interface RuleChainAwareMsg extends TbActorMsg {
 
 
 	RuleChainId getRuleChainId();
 	RuleChainId getRuleChainId();
 	
 	

@@ -16,8 +16,9 @@
 package org.thingsboard.server.common.msg.aware;
 package org.thingsboard.server.common.msg.aware;
 
 
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.msg.TbActorMsg;
 
 
-public interface TenantAwareMsg {
+public interface TenantAwareMsg extends TbActorMsg {
 
 
 	TenantId getTenantId();
 	TenantId getTenantId();
 	
 	

@@ -34,7 +34,7 @@ public class ServiceQueue {
 
 
     public ServiceQueue(ServiceType type, String queue) {
     public ServiceQueue(ServiceType type, String queue) {
         this.type = type;
         this.type = type;
-        this.queue = queue;
+        this.queue = queue != null ? queue : MAIN;
     }
     }
 
 
     public ServiceType getType() {
     public ServiceType getType() {

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>
         <groupId>org.thingsboard</groupId>
         <groupId>org.thingsboard</groupId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.5.3-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
         <artifactId>thingsboard</artifactId>
     </parent>
     </parent>
     <artifactId>common</artifactId>
     <artifactId>common</artifactId>
@@ -37,6 +37,7 @@
         <module>data</module>
         <module>data</module>
         <module>util</module>
         <module>util</module>
         <module>message</module>
         <module>message</module>
+        <module>actor</module>
         <module>queue</module>
         <module>queue</module>
         <module>transport</module>
         <module>transport</module>
         <module>dao-api</module>
         <module>dao-api</module>

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>
         <groupId>org.thingsboard</groupId>
         <groupId>org.thingsboard</groupId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.5.3-SNAPSHOT</version>
         <artifactId>common</artifactId>
         <artifactId>common</artifactId>
     </parent>
     </parent>
     <groupId>org.thingsboard.common</groupId>
     <groupId>org.thingsboard.common</groupId>

@@ -91,8 +91,6 @@ public class DefaultTbQueueRequestTemplate<Request extends TbQueueMsg, Response
                     List<Response> responses = responseTemplate.poll(pollInterval);
                     List<Response> responses = responseTemplate.poll(pollInterval);
                     if (responses.size() > 0) {
                     if (responses.size() > 0) {
                         log.trace("Polling responses completed, consumer records count [{}]", responses.size());
                         log.trace("Polling responses completed, consumer records count [{}]", responses.size());
-                    } else {
-                        continue;
                     }
                     }
                     responses.forEach(response -> {
                     responses.forEach(response -> {
                         byte[] requestIdHeader = response.getHeaders().get(REQUEST_ID_HEADER);
                         byte[] requestIdHeader = response.getHeaders().get(REQUEST_ID_HEADER);

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>
         <groupId>org.thingsboard.common</groupId>
         <groupId>org.thingsboard.common</groupId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.5.3-SNAPSHOT</version>
         <artifactId>transport</artifactId>
         <artifactId>transport</artifactId>
     </parent>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
     <groupId>org.thingsboard.common.transport</groupId>

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>
         <groupId>org.thingsboard.common</groupId>
         <groupId>org.thingsboard.common</groupId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.5.3-SNAPSHOT</version>
         <artifactId>transport</artifactId>
         <artifactId>transport</artifactId>
     </parent>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
     <groupId>org.thingsboard.common.transport</groupId>

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>
         <groupId>org.thingsboard.common</groupId>
         <groupId>org.thingsboard.common</groupId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.5.3-SNAPSHOT</version>
         <artifactId>transport</artifactId>
         <artifactId>transport</artifactId>
     </parent>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
     <groupId>org.thingsboard.common.transport</groupId>

@@ -521,11 +521,22 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
                     .setDeviceName(msg.getDeviceInfo().getDeviceName())
                     .setDeviceName(msg.getDeviceInfo().getDeviceName())
                     .setDeviceType(msg.getDeviceInfo().getDeviceType())
                     .setDeviceType(msg.getDeviceInfo().getDeviceType())
                     .build();
                     .build();
-            transportService.process(sessionInfo, DefaultTransportService.getSessionEventMsg(SessionEvent.OPEN), null);
-            transportService.registerAsyncSession(sessionInfo, this);
-            checkGatewaySession();
-            ctx.writeAndFlush(createMqttConnAckMsg(CONNECTION_ACCEPTED));
-            log.info("[{}] Client connected!", sessionId);
+            transportService.process(sessionInfo, DefaultTransportService.getSessionEventMsg(SessionEvent.OPEN), new TransportServiceCallback<Void>() {
+                @Override
+                public void onSuccess(Void msg) {
+                    transportService.registerAsyncSession(sessionInfo, MqttTransportHandler.this);
+                    checkGatewaySession();
+                    ctx.writeAndFlush(createMqttConnAckMsg(CONNECTION_ACCEPTED));
+                    log.info("[{}] Client connected!", sessionId);
+                }
+
+                @Override
+                public void onError(Throwable e) {
+                    log.warn("[{}] Failed to submit session event", sessionId, e);
+                    ctx.writeAndFlush(createMqttConnAckMsg(MqttConnectReturnCode.CONNECTION_REFUSED_SERVER_UNAVAILABLE));
+                    ctx.close();
+                }
+            });
         }
         }
     }
     }
 
 

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>
         <groupId>org.thingsboard</groupId>
         <groupId>org.thingsboard</groupId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.5.3-SNAPSHOT</version>
         <artifactId>common</artifactId>
         <artifactId>common</artifactId>
     </parent>
     </parent>
     <groupId>org.thingsboard.common</groupId>
     <groupId>org.thingsboard.common</groupId>

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>
         <groupId>org.thingsboard.common</groupId>
         <groupId>org.thingsboard.common</groupId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.5.3-SNAPSHOT</version>
         <artifactId>transport</artifactId>
         <artifactId>transport</artifactId>
     </parent>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
     <groupId>org.thingsboard.common.transport</groupId>

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>
         <groupId>org.thingsboard</groupId>
         <groupId>org.thingsboard</groupId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.5.3-SNAPSHOT</version>
         <artifactId>common</artifactId>
         <artifactId>common</artifactId>
     </parent>
     </parent>
     <groupId>org.thingsboard.common</groupId>
     <groupId>org.thingsboard.common</groupId>

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>
         <groupId>org.thingsboard</groupId>
         <groupId>org.thingsboard</groupId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.5.3-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
         <artifactId>thingsboard</artifactId>
     </parent>
     </parent>
     <artifactId>dao</artifactId>
     <artifactId>dao</artifactId>
@@ -91,26 +91,26 @@
             <artifactId>mockito-all</artifactId>
             <artifactId>mockito-all</artifactId>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>        
-		<dependency>
-			<groupId>commons-validator</groupId>
-			<artifactId>commons-validator</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
         <dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
             <artifactId>spring-context</artifactId>
         </dependency>
         </dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+        </dependency>
         <dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <artifactId>spring-web</artifactId>
@@ -120,24 +120,24 @@
             <groupId>org.springframework.security</groupId>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-oauth2-client</artifactId>
             <artifactId>spring-security-oauth2-client</artifactId>
         </dependency>
         </dependency>
-		<dependency>
-			<groupId>com.datastax.cassandra</groupId>
-			<artifactId>cassandra-driver-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.datastax.cassandra</groupId>
-			<artifactId>cassandra-driver-mapping</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.datastax.cassandra</groupId>
-			<artifactId>cassandra-driver-extras</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.datastax.cassandra</groupId>
+            <artifactId>cassandra-driver-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.datastax.cassandra</groupId>
+            <artifactId>cassandra-driver-mapping</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.datastax.cassandra</groupId>
+            <artifactId>cassandra-driver-extras</artifactId>
+        </dependency>
         <dependency>
         <dependency>
             <groupId>io.takari.junit</groupId>
             <groupId>io.takari.junit</groupId>
             <artifactId>takari-cpsuite</artifactId>
             <artifactId>takari-cpsuite</artifactId>
             <scope>test</scope>
             <scope>test</scope>
-        </dependency>        
-		<dependency>
+        </dependency>
+        <dependency>
             <groupId>com.google.guava</groupId>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <artifactId>guava</artifactId>
         </dependency>
         </dependency>
@@ -215,18 +215,18 @@
                     </includes>
                     </includes>
                 </configuration>
                 </configuration>
             </plugin>
             </plugin>
-		    <plugin>
-		       <groupId>org.apache.maven.plugins</groupId>
-		       <artifactId>maven-jar-plugin</artifactId>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <version>${jar-plugin.version}</version>
                 <version>${jar-plugin.version}</version>
-		       <executions>
-		         <execution>
-		           <goals>
-		             <goal>test-jar</goal>
-		           </goals>
-		         </execution>
-		       </executions>
-		    </plugin>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
 </project>
 </project>

@@ -17,7 +17,6 @@ package org.thingsboard.server.dao.service;
 
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.validator.routines.EmailValidator;
 import org.thingsboard.server.common.data.BaseData;
 import org.thingsboard.server.common.data.BaseData;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.exception.DataValidationException;
@@ -26,11 +25,13 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 @Slf4j
 @Slf4j
 public abstract class DataValidator<D extends BaseData<?>> {
 public abstract class DataValidator<D extends BaseData<?>> {
-
-    private static EmailValidator emailValidator = EmailValidator.getInstance();
+    private static final Pattern EMAIL_PATTERN =
+            Pattern.compile("^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}$", Pattern.CASE_INSENSITIVE);
 
 
     public void validate(D data, Function<D, TenantId> tenantIdFunction) {
     public void validate(D data, Function<D, TenantId> tenantIdFunction) {
         try {
         try {
@@ -64,11 +65,20 @@ public abstract class DataValidator<D extends BaseData<?>> {
     }
     }
 
 
     protected static void validateEmail(String email) {
     protected static void validateEmail(String email) {
-        if (!emailValidator.isValid(email)) {
+        if (!doValidateEmail(email)) {
             throw new DataValidationException("Invalid email address format '" + email + "'!");
             throw new DataValidationException("Invalid email address format '" + email + "'!");
         }
         }
     }
     }
 
 
+    private static boolean doValidateEmail(String email) {
+        if (email == null) {
+            return false;
+        }
+
+        Matcher emailMatcher = EMAIL_PATTERN.matcher(email);
+        return emailMatcher.matches();
+    }
+
     protected static void validateJsonStructure(JsonNode expectedNode, JsonNode actualNode) {
     protected static void validateJsonStructure(JsonNode expectedNode, JsonNode actualNode) {
         Set<String> expectedFields = new HashSet<>();
         Set<String> expectedFields = new HashSet<>();
         Iterator<String> fieldsIterator = expectedNode.fieldNames();
         Iterator<String> fieldsIterator = expectedNode.fieldNames();

@@ -4,15 +4,15 @@ This folder containing scripts and Kubernetes resources configurations to run Th
 
 
 ## Prerequisites
 ## Prerequisites
 
 
-ThingsBoard Microservices are running on Kubernetes cluster.
+ThingsBoard Microservices run on the Kubernetes cluster.
 You need to have a Kubernetes cluster, and the kubectl command-line tool must be configured to communicate with your cluster.
 You need to have a Kubernetes cluster, and the kubectl command-line tool must be configured to communicate with your cluster.
-If you do not already have a cluster, you can create one by using [Minikube](https://kubernetes.io/docs/setup/minikube), 
+If you do not have a cluster already, you can create one by using [Minikube](https://kubernetes.io/docs/setup/minikube), 
 or you can choose any other available [Kubernetes cluster deployment solutions](https://kubernetes.io/docs/setup/pick-right-solution/).
 or you can choose any other available [Kubernetes cluster deployment solutions](https://kubernetes.io/docs/setup/pick-right-solution/).
 
 
 ### Enable ingress addon
 ### Enable ingress addon
 
 
-By default ingress addon is disable in the Minikube, and available only in cluster providers.
-To enable ingress, please execute next command:
+By default ingress addon is disabled in the Minikube, and available only in cluster providers.
+To enable ingress, please execute the following command:
 
 
 `
 `
 $ minikube addons enable ingress
 $ minikube addons enable ingress
@@ -21,21 +21,21 @@ $ minikube addons enable ingress
 ## Installation
 ## Installation
 
 
 Before performing initial installation you can configure the type of database to be used with ThingsBoard and the type of deployment.
 Before performing initial installation you can configure the type of database to be used with ThingsBoard and the type of deployment.
-In order to set database type change the value of `DATABASE` variable in `.env` file to one of the following:
+To set database type change the value of `DATABASE` variable in `.env` file to one of the following:
 
 
 - `postgres` - use PostgreSQL database;
 - `postgres` - use PostgreSQL database;
 - `cassandra` - use Cassandra database;
 - `cassandra` - use Cassandra database;
 
 
 **NOTE**: According to the database type corresponding kubernetes resources will be deployed (see `postgres.yml`, `cassandra.yml` for details).
 **NOTE**: According to the database type corresponding kubernetes resources will be deployed (see `postgres.yml`, `cassandra.yml` for details).
 
 
-In order to set deployment type change the value of `DEPLOYMENT_TYPE` variable in `.env` file to one of the following:
+To set deployment type change the value of `DEPLOYMENT_TYPE` variable in `.env` file to one of the following:
 
 
-- `basic` - start up with single instance of Zookeeper, Kafka and Redis;
-- `high-availability` - start up with Zookeeper, Kafka and Redis in cluster modes;
+- `basic` - startup with a single instance of Zookeeper, Kafka and Redis;
+- `high-availability` - startup with Zookeeper, Kafka, and Redis in cluster modes;
 
 
-**NOTE**: According to the deployment type corresponding kubernetes resources will be deployed (see content of the directories `./basic` and `./high-availability` for details).
+**NOTE**: According to the deployment type corresponding kubernetes resources will be deployed (see the content of the directories `./basic` and `./high-availability` for details).
 
 
-Execute the following command to run installation:
+Execute the following command to run the installation:
 
 
 `
 `
 $ ./k8s-install-tb.sh --loadDemo
 $ ./k8s-install-tb.sh --loadDemo
@@ -47,7 +47,7 @@ Where:
 
 
 ## Running
 ## Running
 
 
-Execute the following command to deploy thirdparty resources:
+Execute the following command to deploy third-party resources:
 
 
 `
 `
 $ ./k8s-deploy-thirdparty.sh
 $ ./k8s-deploy-thirdparty.sh
@@ -61,8 +61,8 @@ Execute the following command to deploy resources:
 $ ./k8s-deploy-resources.sh
 $ ./k8s-deploy-resources.sh
 `
 `
 
 
-After a while when all resources will be successfully started you can open `http://{your-cluster-ip}` in you browser (for ex. `http://192.168.99.101`).
-You should see ThingsBoard login page.
+After a while when all resources will be successfully started you can open `http://{your-cluster-ip}` in your browser (for ex. `http://192.168.99.101`).
+You should see the ThingsBoard login page.
 
 
 Use the following default credentials:
 Use the following default credentials:
 
 
@@ -73,16 +73,16 @@ If you installed DataBase with demo data (using `--loadDemo` flag) you can also
 - **Tenant Administrator**: tenant@thingsboard.org / tenant
 - **Tenant Administrator**: tenant@thingsboard.org / tenant
 - **Customer User**: customer@thingsboard.org / customer
 - **Customer User**: customer@thingsboard.org / customer
 
 
-In case of any issues you can examine service logs for errors.
+In case of any issues, you can examine service logs for errors.
 For example to see ThingsBoard node logs execute the following commands:
 For example to see ThingsBoard node logs execute the following commands:
 
 
-1) Get list of the running tb-node pods:
+1) Get the list of the running tb-node pods:
 
 
 `
 `
 $ kubectl get pods -l app=tb-node
 $ kubectl get pods -l app=tb-node
 `
 `
 
 
-2) Fetch logs of tb-node pod:
+2) Fetch logs of the tb-node pod:
 
 
 `
 `
 $ kubectl logs -f [tb-node-pod-name]
 $ kubectl logs -f [tb-node-pod-name]
@@ -103,7 +103,7 @@ Execute the following command to delete all ThingsBoard microservices:
 $ ./k8s-delete-resources.sh
 $ ./k8s-delete-resources.sh
 `
 `
 
 
-Execute the following command to delete all thirdparty microservices:
+Execute the following command to delete all third-party microservices:
 
 
 `
 `
 $ ./k8s-delete-thirdparty.sh
 $ ./k8s-delete-thirdparty.sh