Actor System refactoring

application/pom.xml

@@ -57,6 +57,10 @@
             <!-- Explicitly bring in the linux classifier, test may fail on 32-bit linux -->
             <classifier>linux-x86_64</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.thingsboard.common</groupId>
+            <artifactId>actor</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.thingsboard.common</groupId>
             <artifactId>util</artifactId>
@@ -173,14 +177,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
         </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>
             <artifactId>slf4j-api</artifactId>

application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java

@@ -15,9 +15,6 @@
  */
 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.ObjectMapper;
 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.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -91,12 +86,13 @@ import java.io.StringWriter;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @Slf4j
 @Component
 public class ActorSystemContext {
-    private static final String AKKA_CONF_FILE_NAME = "actor-system.conf";
 
     protected final ObjectMapper mapper = new ObjectMapper();
 
@@ -260,14 +256,6 @@ public class ActorSystemContext {
     @Getter
     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}")
     @Getter
     private long ruleChainErrorPersistFrequency;
@@ -327,17 +315,14 @@ public class ActorSystemContext {
 
     @Getter
     @Setter
-    private ActorSystem actorSystem;
+    private TbActorSystem actorSystem;
 
     @Setter
-    private ActorRef appActor;
+    private TbActorRef appActor;
 
     @Getter
     @Setter
-    private ActorRef statsActor;
+    private TbActorRef statsActor;
-
-    @Getter
-    private final Config config;
 
     @Autowired(required = false)
     @Getter
@@ -351,14 +336,8 @@ public class ActorSystemContext {
     @Getter
     private RedisTemplate<String, Object> redisTemplate;
 
-    public ActorSystemContext() {
+    public ScheduledExecutorService getScheduler() {
-        config = ConfigFactory.parseResources(AKKA_CONF_FILE_NAME).withFallback(ConfigFactory.load());
+        return actorSystem.getScheduler();
-    }
-
-
-
-    public Scheduler getScheduler() {
-        return actorSystem.scheduler();
     }
 
     public void persistError(TenantId tenantId, EntityId entityId, String method, Exception e) {
@@ -531,7 +510,18 @@ public class ActorSystemContext {
         return Exception.class.isInstance(error) ? (Exception) error : new Exception(error);
     }
 
-    public void tell(TbActorMsg tbActorMsg, ActorRef sender) {
+    public void tell(TbActorMsg tbActorMsg) {
-        appActor.tell(tbActorMsg, sender);
+        appActor.tell(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);
     }
 }

application/src/main/java/org/thingsboard/server/actors/TbEntityTypeActorIdPredicate.java

@@ -0,0 +1,37 @@
+/**
+ * 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);
+    }
+}

application/src/main/java/org/thingsboard/server/actors/app/AppActor.java

@@ -15,21 +15,19 @@
  */
 package org.thingsboard.server.actors.app;
 
-import akka.actor.ActorRef;
+import lombok.extern.slf4j.Slf4j;
-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 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.ContextBasedCreator;
 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.Tenant;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageDataIterable;
 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.tenant.TenantService;
 import org.thingsboard.server.service.transport.msg.TransportToDeviceActorMsgWrapper;
-import scala.concurrent.duration.Duration;
 
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
 
+@Slf4j
 public class AppActor extends ContextAwareActor {
 
     private static final TenantId SYSTEM_TENANT = new TenantId(ModelConstants.NULL_UUID);
     private final TenantService tenantService;
-    private final BiMap<TenantId, ActorRef> tenantActors;
     private final Set<TenantId> deletedTenants;
     private boolean ruleChainsInitialized;
 
     private AppActor(ActorSystemContext systemContext) {
         super(systemContext);
         this.tenantService = systemContext.getTenantService();
-        this.tenantActors = HashBiMap.create();
         this.deletedTenants = new HashSet<>();
     }
 
     @Override
-    public SupervisorStrategy supervisorStrategy() {
+    protected boolean doProcess(TbActorMsg msg) {
-        return strategy;
-    }
-
-    @Override
-    public void preStart() {
-    }
-
-    @Override
-    protected boolean process(TbActorMsg msg) {
         if (!ruleChainsInitialized) {
             initTenantActors();
             ruleChainsInitialized = true;
@@ -86,7 +73,7 @@ public class AppActor extends ContextAwareActor {
             case APP_INIT_MSG:
                 break;
             case PARTITION_CHANGE_MSG:
-                broadcast(msg);
+                ctx.broadcastToChildren(msg);
                 break;
             case COMPONENT_LIFE_CYCLE_MSG:
                 onComponentLifecycleMsg((ComponentLifecycleMsg) msg);
@@ -145,19 +132,15 @@ public class AppActor extends ContextAwareActor {
             msg.getTbMsg().getCallback().onFailure(new RuleEngineException("Message has system tenant id!"));
         } else {
             if (!deletedTenants.contains(msg.getTenantId())) {
-                getOrCreateTenantActor(msg.getTenantId()).tell(msg, self());
+                getOrCreateTenantActor(msg.getTenantId()).tell(msg);
             } else {
                 msg.getTbMsg().getCallback().onSuccess();
             }
         }
     }
 
-    protected void broadcast(Object msg) {
-        tenantActors.values().forEach(actorRef -> actorRef.tell(msg, ActorRef.noSender()));
-    }
-
     private void onComponentLifecycleMsg(ComponentLifecycleMsg msg) {
-        ActorRef target = null;
+        TbActorRef target = null;
         if (SYSTEM_TENANT.equals(msg.getTenantId())) {
             log.warn("Message has system tenant id: {}", msg);
         } else {
@@ -166,17 +149,13 @@ public class AppActor extends ContextAwareActor {
                 log.info("[{}] Handling tenant deleted notification: {}", msg.getTenantId(), msg);
                 TenantId tenantId = new TenantId(msg.getEntityId().getId());
                 deletedTenants.add(tenantId);
-                ActorRef tenantActor = tenantActors.get(tenantId);
+                ctx.stop(new TbEntityActorId(tenantId));
-                if (tenantActor != null) {
-                    log.debug("[{}] Deleting tenant actor: {}", msg.getTenantId(), tenantActor);
-                    context().stop(tenantActor);
-                }
             } else {
                 target = getOrCreateTenantActor(msg.getTenantId());
             }
         }
         if (target != null) {
-            target.tell(msg, ActorRef.noSender());
+            target.tell(msg);
         } else {
             log.debug("[{}] Invalid component lifecycle msg: {}", msg.getTenantId(), msg);
         }
@@ -184,7 +163,7 @@ public class AppActor extends ContextAwareActor {
 
     private void onToDeviceActorMsg(TenantAwareMsg msg) {
         if (!deletedTenants.contains(msg.getTenantId())) {
-            getOrCreateTenantActor(msg.getTenantId()).tell(msg, ActorRef.noSender());
+            getOrCreateTenantActor(msg.getTenantId()).tell(msg);
         } else {
             if (msg instanceof TransportToDeviceActorMsgWrapper) {
                 ((TransportToDeviceActorMsgWrapper) msg).getCallback().onSuccess();
@@ -192,49 +171,27 @@ public class AppActor extends ContextAwareActor {
         }
     }
 
-    private ActorRef getOrCreateTenantActor(TenantId tenantId) {
+    private TbActorRef getOrCreateTenantActor(TenantId tenantId) {
-        return tenantActors.computeIfAbsent(tenantId, k -> {
+        return ctx.getOrCreateChildActor(new TbEntityActorId(tenantId),
-            log.info("[{}] Creating tenant actor.", tenantId);
+                () -> DefaultActorService.TENANT_DISPATCHER_NAME,
-            ActorRef tenantActor = context().actorOf(Props.create(new TenantActor.ActorCreator(systemContext, tenantId))
+                () -> new TenantActor.ActorCreator(systemContext, tenantId));
-                    .withDispatcher(DefaultActorService.CORE_DISPATCHER_NAME), tenantId.toString());
-            context().watch(tenantActor);
-            log.info("[{}] Created tenant actor: {}.", tenantId, tenantActor);
-            return tenantActor;
-        });
-    }
-
-    @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> {
+    public static class ActorCreator extends ContextBasedCreator {
-        private static final long serialVersionUID = 1L;
 
         public ActorCreator(ActorSystemContext context) {
             super(context);
         }
 
         @Override
-        public AppActor create() {
+        public TbActorId createActorId() {
+            return new TbEntityActorId(new TenantId(EntityId.NULL_UUID));
+        }
+
+        @Override
+        public TbActor createActor() {
             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();
-        }
-    });
 }

application/src/main/java/org/thingsboard/server/actors/device/DeviceActor.java

@@ -15,9 +15,11 @@
  */
 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.DeviceNameOrTypeUpdateMsg;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.TbActorCtx;
 import org.thingsboard.server.actors.service.ContextAwareActor;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -26,6 +28,7 @@ import org.thingsboard.server.common.msg.timeout.DeviceActorServerSideRpcTimeout
 import org.thingsboard.server.service.rpc.ToDeviceRpcRequestActorMsg;
 import org.thingsboard.server.service.transport.msg.TransportToDeviceActorMsgWrapper;
 
+@Slf4j
 public class DeviceActor extends ContextAwareActor {
 
     private final DeviceActorMessageProcessor processor;
@@ -36,10 +39,11 @@ public class DeviceActor extends ContextAwareActor {
     }
 
     @Override
-    public void preStart() {
+    public void init(TbActorCtx ctx) {
+        super.init(ctx);
         log.debug("[{}][{}] Starting device actor.", processor.tenantId, processor.deviceId);
         try {
-            processor.initSessionTimeout(context());
+            processor.initSessionTimeout(ctx);
             log.debug("[{}][{}] Device actor started.", processor.tenantId, processor.deviceId);
         } catch (Exception e) {
             log.warn("[{}][{}] Unknown failure", processor.tenantId, processor.deviceId, e);
@@ -47,18 +51,13 @@ public class DeviceActor extends ContextAwareActor {
     }
 
     @Override
-    public void postStop() {
+    protected boolean doProcess(TbActorMsg msg) {
-
-    }
-
-    @Override
-    protected boolean process(TbActorMsg msg) {
         switch (msg.getMsgType()) {
             case TRANSPORT_TO_DEVICE_ACTOR_MSG:
-                processor.process(context(), (TransportToDeviceActorMsgWrapper) msg);
+                processor.process(ctx, (TransportToDeviceActorMsgWrapper) msg);
                 break;
             case DEVICE_ATTRIBUTES_UPDATE_TO_DEVICE_ACTOR_MSG:
-                processor.processAttributesUpdate(context(), (DeviceAttributesEventNotificationMsg) msg);
+                processor.processAttributesUpdate(ctx, (DeviceAttributesEventNotificationMsg) msg);
                 break;
             case DEVICE_CREDENTIALS_UPDATE_TO_DEVICE_ACTOR_MSG:
                 processor.processCredentialsUpdate();
@@ -67,10 +66,10 @@ public class DeviceActor extends ContextAwareActor {
                 processor.processNameOrTypeUpdate((DeviceNameOrTypeUpdateMsg) msg);
                 break;
             case DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG:
-                processor.processRpcRequest(context(), (ToDeviceRpcRequestActorMsg) msg);
+                processor.processRpcRequest(ctx, (ToDeviceRpcRequestActorMsg) msg);
                 break;
             case DEVICE_ACTOR_SERVER_SIDE_RPC_TIMEOUT_MSG:
-                processor.processServerSideRpcTimeout(context(), (DeviceActorServerSideRpcTimeoutMsg) msg);
+                processor.processServerSideRpcTimeout(ctx, (DeviceActorServerSideRpcTimeoutMsg) msg);
                 break;
             case SESSION_TIMEOUT_MSG:
                 processor.checkSessionsTimeout();

application/src/main/java/org/thingsboard/server/actors/device/DeviceActorCreator.java

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

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

@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.actors.device;
 
-import akka.actor.ActorContext;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 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.DeviceNameOrTypeUpdateMsg;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.actors.TbActorCtx;
 import org.thingsboard.server.actors.shared.AbstractContextAwareMsgProcessor;
 import org.thingsboard.server.common.data.Device;
 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();
         ToDeviceRpcRequestBody body = request.getBody();
         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));
         DeviceActorServerSideRpcTimeoutMsg timeoutMsg = new DeviceActorServerSideRpcTimeoutMsg(rpcRequest.getRequestId(), timeout);
         scheduleMsgWithDelay(context, timeoutMsg, timeoutMsg.getTimeout());
     }
 
-    void processServerSideRpcTimeout(ActorContext context, DeviceActorServerSideRpcTimeoutMsg msg) {
+    void processServerSideRpcTimeout(TbActorCtx context, DeviceActorServerSideRpcTimeoutMsg msg) {
         ToDeviceRpcRequestMetadata requestMd = toDeviceRpcPendingMap.remove(msg.getId());
         if (requestMd != null) {
             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);
         if (!toDeviceRpcPendingMap.isEmpty()) {
             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);
     }
 
-    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 -> {
             ToDeviceRpcRequest request = entry.getValue().getMsg().getMsg();
             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();
         TbCallback callback = wrapper.getCallback();
         if (msg.hasSessionEvent()) {
@@ -239,7 +239,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         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()));
         systemContext.getClaimDevicesService().registerClaimingInfo(tenantId, deviceId, msg.getSecretKey(), msg.getDurationMs());
     }
@@ -252,7 +252,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         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();
         Futures.addCallback(getAttributesKvEntries(request), new FutureCallback<List<List<AttributeKvEntry>>>() {
             @Override
@@ -310,7 +310,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         return sessions.containsKey(sessionId) ? SessionType.ASYNC : SessionType.SYNC;
     }
 
-    void processAttributesUpdate(ActorContext context, DeviceAttributesEventNotificationMsg msg) {
+    void processAttributesUpdate(TbActorCtx context, DeviceAttributesEventNotificationMsg msg) {
         if (attributeSubscriptions.size() > 0) {
             boolean hasNotificationData = false;
             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);
         log.debug("[{}] Processing rpc command response [{}]", deviceId, sessionId);
         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);
         if (subscribeCmd.getUnsubscribe()) {
             log.debug("[{}] Canceling attributes subscription for session [{}]", deviceId, sessionId);
@@ -383,7 +383,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         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);
         if (subscribeCmd.getUnsubscribe()) {
             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);
         SessionInfoMetaData sessionMD = sessions.computeIfAbsent(sessionId,
                 id -> new SessionInfoMetaData(new SessionInfo(SessionType.ASYNC, sessionInfoProto.getNodeId()), 0L));
@@ -612,8 +612,8 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
                         .addAllSessions(sessionsList).build().toByteArray());
     }
 
-    void initSessionTimeout(ActorContext context) {
+    void initSessionTimeout(TbActorCtx ctx) {
-        schedulePeriodicMsgWithDelay(context, SessionTimeoutCheckMsg.instance(), systemContext.getSessionInactivityTimeout(), systemContext.getSessionInactivityTimeout());
+        schedulePeriodicMsgWithDelay(ctx, SessionTimeoutCheckMsg.instance(), systemContext.getSessionInactivityTimeout(), systemContext.getSessionInactivityTimeout());
     }
 
     void checkSessionsTimeout() {

application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java

@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.actors.ruleChain;
 
-import akka.actor.ActorRef;
 import com.datastax.driver.core.ResultSetFuture;
 import com.fasterxml.jackson.core.JsonProcessingException;
 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.TbRelationTypes;
 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.DataConstants;
 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.TenantId;
 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.TbMsgMetaData;
 import org.thingsboard.server.common.msg.queue.ServiceType;
@@ -62,7 +63,6 @@ import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.TbQueueCallback;
 import org.thingsboard.server.queue.TbQueueMsgMetadata;
 import org.thingsboard.server.service.script.RuleNodeJsScriptEngine;
-import scala.concurrent.duration.Duration;
 
 import java.util.Collections;
 import java.util.Set;
@@ -104,7 +104,7 @@ class DefaultTbContext implements TbContext {
         if (nodeCtx.getSelf().isDebugMode()) {
             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
@@ -130,7 +130,7 @@ class DefaultTbContext implements TbContext {
                 .setTenantIdMSB(getTenantId().getId().getMostSignificantBits())
                 .setTenantIdLSB(getTenantId().getId().getLeastSignificantBits())
                 .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
@@ -187,7 +187,7 @@ class DefaultTbContext implements TbContext {
         if (failureMessage != null) {
             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
@@ -203,8 +203,8 @@ class DefaultTbContext implements TbContext {
         return mainCtx.resolve(ServiceType.TB_RULE_ENGINE, getTenantId(), entityId).isMyPartition();
     }
 
-    private void scheduleMsgWithDelay(Object msg, long delayInMs, ActorRef target) {
+    private void scheduleMsgWithDelay(TbActorMsg msg, long delayInMs, TbActorRef target) {
-        mainCtx.getScheduler().scheduleOnce(Duration.create(delayInMs, TimeUnit.MILLISECONDS), target, msg, mainCtx.getActorSystem().dispatcher(), nodeCtx.getSelfActor());
+        mainCtx.scheduleMsgWithDelay(target, msg, delayInMs);
     }
 
     @Override
@@ -213,7 +213,7 @@ class DefaultTbContext implements TbContext {
             mainCtx.persistDebugOutput(nodeCtx.getTenantId(), nodeCtx.getSelf().getId(), msg, TbRelationTypes.FAILURE, th);
         }
         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) {

application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java

@@ -15,9 +15,11 @@
  */
 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.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.ContextBasedCreator;
 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.queue.PartitionChangeMsg;
 import org.thingsboard.server.common.msg.queue.QueueToRuleEngineMsg;
-import scala.concurrent.duration.Duration;
 
 public class RuleChainActor extends ComponentActor<RuleChainId, RuleChainActorMessageProcessor> {
 
+    private final RuleChain ruleChain;
+
     private RuleChainActor(ActorSystemContext systemContext, TenantId tenantId, RuleChain ruleChain) {
         super(systemContext, tenantId, ruleChain.getId());
-        setProcessor(new RuleChainActorMessageProcessor(tenantId, ruleChain, systemContext,
+        this.ruleChain = ruleChain;
-                context().parent(), context().self()));
     }
 
     @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()) {
             case COMPONENT_LIFE_CYCLE_MSG:
                 onComponentLifecycleMsg((ComponentLifecycleMsg) msg);
@@ -64,7 +72,7 @@ public class RuleChainActor extends ComponentActor<RuleChainId, RuleChainActorMe
         return true;
     }
 
-    public static class ActorCreator extends ContextBasedCreator<RuleChainActor> {
+    public static class ActorCreator extends ContextBasedCreator {
         private static final long serialVersionUID = 1L;
 
         private final TenantId tenantId;
@@ -77,7 +85,12 @@ public class RuleChainActor extends ComponentActor<RuleChainId, RuleChainActorMe
         }
 
         @Override
-        public RuleChainActor create() {
+        public TbActorId createActorId() {
+            return new TbEntityActorId(ruleChain.getId());
+        }
+
+        @Override
+        public TbActor createActor() {
             return new RuleChainActor(context, tenantId, ruleChain);
         }
     }
@@ -87,13 +100,4 @@ public class RuleChainActor extends ComponentActor<RuleChainId, RuleChainActorMe
         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();
-    });
 }

application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java

@@ -15,12 +15,12 @@
  */
 package org.thingsboard.server.actors.ruleChain;
 
-import akka.actor.ActorContext;
-import akka.actor.ActorRef;
-import akka.actor.Props;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.rule.engine.api.TbRelationTypes;
 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.shared.ComponentMsgProcessor;
 import org.thingsboard.server.common.data.EntityType;
@@ -62,8 +62,8 @@ import java.util.stream.Collectors;
 @Slf4j
 public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleChainId> {
 
-    private final ActorRef parent;
+    private final TbActorRef parent;
-    private final ActorRef self;
+    private final TbActorRef self;
     private final Map<RuleNodeId, RuleNodeCtx> nodeActors;
     private final Map<RuleNodeId, List<RuleNodeRelation>> nodeRoutes;
     private final RuleChainService service;
@@ -75,7 +75,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
     private boolean started;
 
     RuleChainActorMessageProcessor(TenantId tenantId, RuleChain ruleChain, ActorSystemContext systemContext
-            , ActorRef parent, ActorRef self) {
+            , TbActorRef parent, TbActorRef self) {
         super(systemContext, tenantId, ruleChain.getId());
         this.ruleChainName = ruleChain.getName();
         this.parent = parent;
@@ -92,7 +92,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
     }
 
     @Override
-    public void start(ActorContext context) {
+    public void start(TbActorCtx context) {
         if (!started) {
             RuleChain ruleChain = service.findRuleChainById(tenantId, entityId);
             if (ruleChain != null) {
@@ -101,7 +101,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
                 // Creating and starting the actors;
                 for (RuleNode ruleNode : ruleNodeList) {
                     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));
                 }
                 initRoutes(ruleChain, ruleNodeList);
@@ -113,7 +113,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
     }
 
     @Override
-    public void onUpdate(ActorContext context) {
+    public void onUpdate(TbActorCtx context) {
         RuleChain ruleChain = service.findRuleChainById(tenantId, entityId);
         if (ruleChain != null) {
             ruleChainName = ruleChain.getName();
@@ -123,12 +123,12 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
                 RuleNodeCtx existing = nodeActors.get(ruleNode.getId());
                 if (existing == null) {
                     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));
                 } else {
                     log.trace("[{}][{}] Updating rule node [{}]: {}", entityId, ruleNode.getId(), ruleNode.getName(), ruleNode);
                     existing.setSelf(ruleNode);
-                    existing.getSelfActor().tell(new ComponentLifecycleMsg(tenantId, existing.getSelf().getId(), ComponentLifecycleEvent.UPDATED), self);
+                    existing.getSelfActor().tell(new ComponentLifecycleMsg(tenantId, existing.getSelf().getId(), ComponentLifecycleEvent.UPDATED));
                 }
             }
 
@@ -137,7 +137,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
             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);
+                removed.getSelfActor().tell(new ComponentLifecycleMsg(tenantId, removed.getSelf().getId(), ComponentLifecycleEvent.DELETED));
             });
 
             initRoutes(ruleChain, ruleNodeList);
@@ -145,26 +145,23 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
     }
 
     @Override
-    public void stop(ActorContext context) {
+    public void stop(TbActorCtx ctx) {
         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();
         nodeRoutes.clear();
-        context.stop(self);
         started = false;
     }
 
     @Override
     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.tell(msg));
     }
 
-    private ActorRef createRuleNodeActor(ActorContext context, RuleNode ruleNode) {
+    private TbActorRef createRuleNodeActor(TbActorCtx ctx, RuleNode ruleNode) {
-        String dispatcherName = tenantId.getId().equals(EntityId.NULL_UUID) ?
+        return ctx.getOrCreateChildActor(new TbEntityActorId(ruleNode.getId()),
-                DefaultActorService.SYSTEM_RULE_DISPATCHER_NAME : DefaultActorService.TENANT_RULE_DISPATCHER_NAME;
+                () -> DefaultActorService.RULE_DISPATCHER_NAME,
-        return context.actorOf(
+                () -> new RuleNodeActor.ActorCreator(systemContext, tenantId, entityId, ruleNode.getName(), ruleNode.getId()));
-                Props.create(new RuleNodeActor.ActorCreator(systemContext, tenantId, entityId, ruleNode.getName(), ruleNode.getId()))
-                        .withDispatcher(dispatcherName), ruleNode.getId().toString());
     }
 
     private void initRoutes(RuleChain ruleChain, List<RuleNode> ruleNodeList) {
@@ -303,7 +300,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
                     pushMsgToNode(nodeActors.get(new RuleNodeId(target.getId())), msg, fromRelationType);
                     break;
                 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;
             }
         } else {
@@ -334,7 +331,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
 
     private void pushMsgToNode(RuleNodeCtx nodeCtx, TbMsg msg, String fromRelationType) {
         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 {
             log.error("[{}][{}] RuleNodeCtx is empty", entityId, ruleChainName);
             msg.getCallback().onFailure(new RuleEngineException("Rule Node CTX is empty"));

application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainManagerActor.java

@@ -15,21 +15,22 @@
  */
 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.extern.slf4j.Slf4j;
 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.DefaultActorService;
+import org.thingsboard.server.actors.tenant.TenantActor;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageDataIterable;
 import org.thingsboard.server.common.data.rule.RuleChain;
+import org.thingsboard.server.common.msg.TbActorMsg;
 import org.thingsboard.server.dao.rule.RuleChainService;
 
 import java.util.function.Function;
@@ -37,20 +38,19 @@ import java.util.function.Function;
 /**
  * Created by ashvayka on 15.03.18.
  */
+@Slf4j
 public abstract class RuleChainManagerActor extends ContextAwareActor {
 
     protected final TenantId tenantId;
     private final RuleChainService ruleChainService;
-    private final BiMap<RuleChainId, ActorRef> actors;
     @Getter
     protected RuleChain rootChain;
     @Getter
-    protected ActorRef rootChainActor;
+    protected TbActorRef rootChainActor;
 
     public RuleChainManagerActor(ActorSystemContext systemContext, TenantId tenantId) {
         super(systemContext);
         this.tenantId = tenantId;
-        this.actors = HashBiMap.create();
         this.ruleChainService = systemContext.getRuleChainService();
     }
 
@@ -58,46 +58,41 @@ public abstract class RuleChainManagerActor extends ContextAwareActor {
         for (RuleChain ruleChain : new PageDataIterable<>(link -> ruleChainService.findTenantRuleChains(tenantId, link), ContextAwareActor.ENTITY_PACK_LIMIT)) {
             RuleChainId ruleChainId = 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.
+            TbActorRef actorRef = getOrCreateActor(ruleChainId, id -> ruleChain);
-            ActorRef actorRef = getOrCreateActor(this.context(), ruleChainId, id -> ruleChain);
             visit(ruleChain, actorRef);
             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()) {
             rootChain = entity;
             rootChainActor = actorRef;
         }
     }
 
-    public ActorRef getOrCreateActor(akka.actor.ActorContext context, RuleChainId ruleChainId) {
+    protected TbActorRef getOrCreateActor(RuleChainId ruleChainId) {
-        return getOrCreateActor(context, ruleChainId, eId -> ruleChainService.findRuleChainById(TenantId.SYS_TENANT_ID, eId));
+        return getOrCreateActor(ruleChainId, eId -> ruleChainService.findRuleChainById(TenantId.SYS_TENANT_ID, eId));
     }
 
-    public ActorRef getOrCreateActor(akka.actor.ActorContext context, RuleChainId ruleChainId, Function<RuleChainId, RuleChain> provider) {
+    protected TbActorRef getOrCreateActor(RuleChainId ruleChainId, Function<RuleChainId, RuleChain> provider) {
-        return actors.computeIfAbsent(ruleChainId, eId -> {
+        return ctx.getOrCreateChildActor(new TbEntityActorId(ruleChainId),
-            RuleChain ruleChain = provider.apply(eId);
+                () -> DefaultActorService.RULE_DISPATCHER_NAME,
-            return context.actorOf(Props.create(new RuleChainActor.ActorCreator(systemContext, tenantId, ruleChain))
+                () -> {
-                    .withDispatcher(DefaultActorService.TENANT_RULE_DISPATCHER_NAME), eId.toString());
+                    RuleChain ruleChain = provider.apply(ruleChainId);
-        });
+                    return new RuleChainActor.ActorCreator(systemContext, tenantId, ruleChain);
+                });
     }
 
-    protected ActorRef getEntityActorRef(EntityId entityId) {
+    protected TbActorRef getEntityActorRef(EntityId entityId) {
-        ActorRef target = null;
+        TbActorRef target = null;
         if (entityId.getEntityType() == EntityType.RULE_CHAIN) {
-            target = getOrCreateActor(this.context(), (RuleChainId) entityId);
+            target = getOrCreateActor((RuleChainId) entityId);
         }
         return target;
     }
 
-    protected void broadcast(Object msg) {
+    protected void broadcast(TbActorMsg msg) {
-        actors.values().forEach(actorRef -> actorRef.tell(msg, ActorRef.noSender()));
+        ctx.broadcastToChildren(msg, new TbEntityTypeActorIdPredicate(EntityType.RULE_CHAIN));
     }
-
-    public ActorRef get(RuleChainId id) {
-        return actors.get(id);
-    }
-
 }

application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActor.java

@@ -15,31 +15,43 @@
  */
 package org.thingsboard.server.actors.ruleChain;
 
+import lombok.extern.slf4j.Slf4j;
 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.ContextBasedCreator;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 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.plugin.ComponentLifecycleMsg;
 import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
 
+@Slf4j
 public class RuleNodeActor extends ComponentActor<RuleNodeId, RuleNodeActorMessageProcessor> {
 
     private final String ruleChainName;
     private final RuleChainId ruleChainId;
+    private final RuleNodeId ruleNodeId;
 
     private RuleNodeActor(ActorSystemContext systemContext, TenantId tenantId, RuleChainId ruleChainId, String ruleChainName, RuleNodeId ruleNodeId) {
         super(systemContext, tenantId, ruleNodeId);
         this.ruleChainName = ruleChainName;
         this.ruleChainId = ruleChainId;
-        setProcessor(new RuleNodeActorMessageProcessor(tenantId, this.ruleChainName, ruleNodeId, systemContext,
+        this.ruleNodeId = ruleNodeId;
-                context().parent(), context().self()));
     }
 
     @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()) {
             case COMPONENT_LIFE_CYCLE_MSG:
                 onComponentLifecycleMsg((ComponentLifecycleMsg) msg);
@@ -93,8 +105,7 @@ public class RuleNodeActor extends ComponentActor<RuleNodeId, RuleNodeActorMessa
         logAndPersist("onRuleMsg", ActorSystemContext.toException(msg.getError()));
     }
 
-    public static class ActorCreator extends ContextBasedCreator<RuleNodeActor> {
+    public static class ActorCreator extends ContextBasedCreator {
-        private static final long serialVersionUID = 1L;
 
         private final TenantId tenantId;
         private final RuleChainId ruleChainId;
@@ -111,7 +122,12 @@ public class RuleNodeActor extends ComponentActor<RuleNodeId, RuleNodeActorMessa
         }
 
         @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);
         }
     }

application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActorMessageProcessor.java

@@ -15,11 +15,11 @@
  */
 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.TbNodeConfiguration;
 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.common.data.id.RuleNodeId;
 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> {
 
     private final String ruleChainName;
-    private final ActorRef self;
+    private final TbActorRef self;
     private RuleNode ruleNode;
     private TbNode tbNode;
     private DefaultTbContext defaultCtx;
 
     RuleNodeActorMessageProcessor(TenantId tenantId, String ruleChainName, RuleNodeId ruleNodeId, ActorSystemContext systemContext
-            , ActorRef parent, ActorRef self) {
+            , TbActorRef parent, TbActorRef self) {
         super(systemContext, tenantId, ruleNodeId);
         this.ruleChainName = ruleChainName;
         this.self = self;
@@ -49,7 +49,7 @@ public class RuleNodeActorMessageProcessor extends ComponentMsgProcessor<RuleNod
     }
 
     @Override
-    public void start(ActorContext context) throws Exception {
+    public void start(TbActorCtx context) throws Exception {
         tbNode = initComponent(ruleNode);
         if (tbNode != null) {
             state = ComponentLifecycleState.ACTIVE;
@@ -57,7 +57,7 @@ public class RuleNodeActorMessageProcessor extends ComponentMsgProcessor<RuleNod
     }
 
     @Override
-    public void onUpdate(ActorContext context) throws Exception {
+    public void onUpdate(TbActorCtx context) throws Exception {
         RuleNode newRuleNode = systemContext.getRuleChainService().findRuleNodeById(tenantId, entityId);
         boolean restartRequired = state != ComponentLifecycleState.ACTIVE ||
                 !(ruleNode.getType().equals(newRuleNode.getType()) && ruleNode.getConfiguration().equals(newRuleNode.getConfiguration()));
@@ -72,11 +72,11 @@ public class RuleNodeActorMessageProcessor extends ComponentMsgProcessor<RuleNod
     }
 
     @Override
-    public void stop(ActorContext context) {
+    public void stop(TbActorCtx context) {
         if (tbNode != null) {
             tbNode.destroy();
+            state = ComponentLifecycleState.SUSPENDED;
         }
-        context.stop(self);
     }
 
     @Override

application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeCtx.java

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

application/src/main/java/org/thingsboard/server/actors/service/ComponentActor.java

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

application/src/main/java/org/thingsboard/server/actors/service/ContextAwareActor.java

@@ -15,17 +15,18 @@
  */
 package org.thingsboard.server.actors.service;
 
-import akka.actor.Terminated;
+import lombok.extern.slf4j.Slf4j;
-import akka.actor.UntypedAbstractActor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.thingsboard.server.actors.AbstractTbActor;
 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;
 
-
+@Slf4j
-public abstract class ContextAwareActor extends UntypedAbstractActor {
+public abstract class ContextAwareActor extends AbstractTbActor {
-
-    protected final Logger log = LoggerFactory.getLogger(getClass());
 
     public static final int ENTITY_PACK_LIMIT = 1024;
 
@@ -37,27 +38,29 @@ public abstract class ContextAwareActor extends UntypedAbstractActor {
     }
 
     @Override
-    public void onReceive(Object msg) {
+    public boolean process(TbActorMsg msg) {
         if (log.isDebugEnabled()) {
             log.debug("Processing msg: {}", msg);
         }
-        if (msg instanceof TbActorMsg) {
+        if (!doProcess(msg)) {
-            try {
+            log.warn("Unprocessed message: {}!", msg);
-                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);
         }
+        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();
+        }
+    }
 }

application/src/main/java/org/thingsboard/server/actors/service/ContextBasedCreator.java

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

application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java

@@ -15,85 +15,116 @@
  */
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.event.EventListener;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 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.AppInitMsg;
 import org.thingsboard.server.actors.stats.StatsActor;
 import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
 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.PreDestroy;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 
 @Service
 @Slf4j
 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 CORE_DISPATCHER_NAME = "core-dispatcher";
+    public static final String TENANT_DISPATCHER_NAME = "tenant-dispatcher";
-    public static final String SYSTEM_RULE_DISPATCHER_NAME = "system-rule-dispatcher";
+    public static final String DEVICE_DISPATCHER_NAME = "device-dispatcher";
-    public static final String TENANT_RULE_DISPATCHER_NAME = "rule-dispatcher";
+    public static final String RULE_DISPATCHER_NAME = "rule-dispatcher";
 
     @Autowired
     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
     public void initActorSystem() {
-        log.info("Initializing Actor system.");
+        log.info("Initializing actor system.");
         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(appDispatcherSize));
+        system.createDispatcher(TENANT_DISPATCHER_NAME, initDispatcherExecutor(tenantDispatcherSize));
+        system.createDispatcher(DEVICE_DISPATCHER_NAME, initDispatcherExecutor(deviceDispatcherSize));
+        system.createDispatcher(RULE_DISPATCHER_NAME, initDispatcherExecutor(ruleDispatcherSize));
+
         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);
 
-        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);
 
         log.info("Actor system initialized.");
     }
 
+    private ExecutorService initDispatcherExecutor(int poolSize) {
+        if (poolSize == 0) {
+            int cores = Runtime.getRuntime().availableProcessors();
+            poolSize = Math.max(1, cores / 2);
+        }
+        return Executors.newWorkStealingPool(poolSize);
+    }
+
     @EventListener(ApplicationReadyEvent.class)
     public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
         log.info("Received application ready event. Sending application init message to actor system");
-        appActor.tell(new AppInitMsg(), ActorRef.noSender());
+        appActor.tell(new AppInitMsg());
     }
 
     @EventListener(PartitionChangeEvent.class)
     public void onApplicationEvent(PartitionChangeEvent partitionChangeEvent) {
         log.info("Received partition change event.");
-        this.appActor.tell(new PartitionChangeMsg(partitionChangeEvent.getServiceQueueKey(), partitionChangeEvent.getPartitions()), ActorRef.noSender());
+        this.appActor.tell(new PartitionChangeMsg(partitionChangeEvent.getServiceQueueKey(), partitionChangeEvent.getPartitions()));
     }
 
     @PreDestroy
     public void stopActorSystem() {
-        Future<Terminated> status = system.terminate();
+        if (system != null) {
-        try {
+            log.info("Stopping actor system.");
-            Terminated terminated = Await.result(status, Duration.Inf());
+            system.stop();
-            log.info("Actor system terminated: {}", terminated);
+            log.info("Actor system stopped.");
-        } catch (Exception e) {
-            log.error("Failed to terminate actor system.", e);
         }
     }
 

application/src/main/java/org/thingsboard/server/actors/shared/AbstractContextAwareMsgProcessor.java

@@ -15,18 +15,13 @@
  */
 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 lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.actors.ActorSystemContext;
-import scala.concurrent.ExecutionContextExecutor;
+import org.thingsboard.server.actors.TbActorCtx;
-import scala.concurrent.duration.Duration;
+import org.thingsboard.server.common.msg.TbActorMsg;
 
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 @Slf4j
@@ -40,31 +35,16 @@ public abstract class AbstractContextAwareMsgProcessor {
         this.systemContext = systemContext;
     }
 
-    private Scheduler getScheduler() {
+    private ScheduledExecutorService getScheduler() {
         return systemContext.getScheduler();
     }
 
-    private ExecutionContextExecutor getSystemDispatcher() {
+    protected void schedulePeriodicMsgWithDelay(TbActorCtx ctx, TbActorMsg msg, long delayInMs, long periodInMs) {
-        return systemContext.getActorSystem().dispatcher();
+        systemContext.schedulePeriodicMsgWithDelay(ctx, msg, delayInMs, periodInMs);
     }
 
-    protected void schedulePeriodicMsgWithDelay(ActorContext ctx, Object msg, long delayInMs, long periodInMs) {
+    protected void scheduleMsgWithDelay(TbActorCtx ctx, TbActorMsg msg, long delayInMs) {
-        schedulePeriodicMsgWithDelay(msg, delayInMs, periodInMs, ctx.self());
+        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);
-    }
-
-
 }

application/src/main/java/org/thingsboard/server/actors/shared/ComponentMsgProcessor.java

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

application/src/main/java/org/thingsboard/server/actors/stats/StatsActor.java

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

application/src/main/java/org/thingsboard/server/actors/stats/StatsPersistMsg.java

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

application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java

@@ -15,16 +15,15 @@
  */
 package org.thingsboard.server.actors.tenant;
 
-import akka.actor.ActorInitializationException;
+import lombok.extern.slf4j.Slf4j;
-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 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.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.ruleChain.RuleChainManagerActor;
 import org.thingsboard.server.actors.service.ContextBasedCreator;
@@ -32,6 +31,7 @@ import org.thingsboard.server.actors.service.DefaultActorService;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.Tenant;
 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.TenantId;
 import org.thingsboard.server.common.data.rule.RuleChain;
@@ -45,32 +45,25 @@ import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
 import org.thingsboard.server.common.msg.queue.QueueToRuleEngineMsg;
 import org.thingsboard.server.common.msg.queue.RuleEngineException;
 import org.thingsboard.server.common.msg.queue.ServiceType;
-import scala.concurrent.duration.Duration;
 
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
+@Slf4j
 public class TenantActor extends RuleChainManagerActor {
 
-    private final BiMap<DeviceId, ActorRef> deviceActors;
     private boolean isRuleEngineForCurrentTenant;
     private boolean isCore;
 
     private TenantActor(ActorSystemContext systemContext, TenantId tenantId) {
         super(systemContext, tenantId);
-        this.deviceActors = HashBiMap.create();
-    }
-
-    @Override
-    public SupervisorStrategy supervisorStrategy() {
-        return strategy;
     }
 
     boolean cantFindTenant = false;
 
     @Override
-    public void preStart() {
+    public void init(TbActorCtx ctx) {
+        super.init(ctx);
         log.info("[{}] Starting tenant actor.", tenantId);
         try {
             Tenant tenant = systemContext.getTenantService().findTenantById(tenantId);
@@ -104,12 +97,12 @@ public class TenantActor extends RuleChainManagerActor {
     }
 
     @Override
-    public void postStop() {
+    public void destroy() {
         log.info("[{}] Stopping tenant actor.", tenantId);
     }
 
     @Override
-    protected boolean process(TbActorMsg msg) {
+    protected boolean doProcess(TbActorMsg msg) {
         if (cantFindTenant) {
             log.info("[{}] Processing missing Tenant msg: {}", tenantId, msg);
             if (msg.getMsgType().equals(MsgType.QUEUE_TO_RULE_ENGINE_MSG)) {
@@ -126,13 +119,13 @@ public class TenantActor extends RuleChainManagerActor {
                     //To Rule Chain Actors
                     broadcast(msg);
                 } else if (ServiceType.TB_CORE.equals(serviceType)) {
-                    //To Device Actors
+                    List<TbActorId> deviceActorIds = ctx.filterChildren(new TbEntityTypeActorIdPredicate(EntityType.DEVICE) {
-                    List<DeviceId> repartitionedDevices =
+                        @Override
-                            deviceActors.keySet().stream().filter(deviceId -> !isMyPartition(deviceId)).collect(Collectors.toList());
+                        protected boolean testEntityId(EntityId entityId) {
-                    for (DeviceId deviceId : repartitionedDevices) {
+                            return super.testEntityId(entityId) && !isMyPartition(entityId);
-                        ActorRef deviceActor = deviceActors.remove(deviceId);
+                        }
-                        context().stop(deviceActor);
+                    });
-                    }
+                    deviceActorIds.forEach(id -> ctx.stop(id));
                 }
                 break;
             case COMPONENT_LIFE_CYCLE_MSG:
@@ -158,8 +151,8 @@ public class TenantActor extends RuleChainManagerActor {
         return true;
     }
 
-    private boolean isMyPartition(DeviceId deviceId) {
+    private boolean isMyPartition(EntityId entityId) {
-        return systemContext.resolve(ServiceType.TB_CORE, tenantId, deviceId).isMyPartition();
+        return systemContext.resolve(ServiceType.TB_CORE, tenantId, entityId).isMyPartition();
     }
 
     private void onQueueToRuleEngineMsg(QueueToRuleEngineMsg msg) {
@@ -170,16 +163,15 @@ public class TenantActor extends RuleChainManagerActor {
         TbMsg tbMsg = msg.getTbMsg();
         if (tbMsg.getRuleChainId() == null) {
             if (getRootChainActor() != null) {
-                getRootChainActor().tell(msg, self());
+                getRootChainActor().tell(msg);
             } else {
                 tbMsg.getCallback().onFailure(new RuleEngineException("No Root Rule Chain available!"));
                 log.info("[{}] No Root Chain: {}", tenantId, msg);
             }
         } else {
-            ActorRef ruleChainActor = get(tbMsg.getRuleChainId());
+            try {
-            if (ruleChainActor != null) {
+                ctx.tell(new TbEntityActorId(tbMsg.getRuleChainId()), msg);
-                ruleChainActor.tell(msg, self());
+            } catch (TbActorNotRegisteredException ex) {
-            } else {
                 log.trace("Received message for non-existing rule chain: [{}]", tbMsg.getRuleChainId());
                 //TODO: 3.1 Log it to dead letters queue;
                 tbMsg.getCallback().onSuccess();
@@ -188,61 +180,39 @@ public class TenantActor extends RuleChainManagerActor {
     }
 
     private void onRuleChainMsg(RuleChainAwareMsg msg) {
-        getOrCreateActor(context(), msg.getRuleChainId()).tell(msg, self());
+        getOrCreateActor(msg.getRuleChainId()).tell(msg);
     }
 
     private void onToDeviceActorMsg(DeviceAwareMsg msg) {
         if (!isCore) {
             log.warn("RECEIVED INVALID MESSAGE: {}", msg);
         }
-        getOrCreateDeviceActor(msg.getDeviceId()).tell(msg, ActorRef.noSender());
+        getOrCreateDeviceActor(msg.getDeviceId()).tell(msg);
     }
 
     private void onComponentLifecycleMsg(ComponentLifecycleMsg msg) {
         if (isRuleEngineForCurrentTenant) {
-            ActorRef target = getEntityActorRef(msg.getEntityId());
+            TbActorRef target = getEntityActorRef(msg.getEntityId());
             if (target != null) {
                 if (msg.getEntityId().getEntityType() == EntityType.RULE_CHAIN) {
                     RuleChain ruleChain = systemContext.getRuleChainService().
                             findRuleChainById(tenantId, new RuleChainId(msg.getEntityId().getId()));
                     visit(ruleChain, target);
                 }
-                target.tell(msg, ActorRef.noSender());
+                target.tell(msg);
             } else {
                 log.debug("[{}] Invalid component lifecycle msg: {}", tenantId, msg);
             }
         }
     }
 
-    private ActorRef getOrCreateDeviceActor(DeviceId deviceId) {
+    private TbActorRef getOrCreateDeviceActor(DeviceId deviceId) {
-        return deviceActors.computeIfAbsent(deviceId, k -> {
+        return ctx.getOrCreateChildActor(new TbEntityActorId(deviceId),
-            log.debug("[{}][{}] Creating device actor.", tenantId, deviceId);
+                () -> DefaultActorService.DEVICE_DISPATCHER_NAME,
-            ActorRef deviceActor = context().actorOf(Props.create(new DeviceActorCreator(systemContext, tenantId, deviceId))
+                () -> 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
+    public static class ActorCreator extends ContextBasedCreator {
-    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!");
-        }
-    }
-
-    public static class ActorCreator extends ContextBasedCreator<TenantActor> {
-        private static final long serialVersionUID = 1L;
 
         private final TenantId tenantId;
 
@@ -252,18 +222,14 @@ public class TenantActor extends RuleChainManagerActor {
         }
 
         @Override
-        public TenantActor create() {
+        public TbActorId createActorId() {
-            return new TenantActor(context, tenantId);
+            return new TbEntityActorId(tenantId);
         }
-    }
 
-    private final SupervisorStrategy strategy = new OneForOneStrategy(3, Duration.create("1 minute"), t -> {
+        @Override
-        log.warn("[{}] Unknown failure", tenantId, t);
+        public TbActor createActor() {
-        if (t instanceof ActorInitializationException) {
+            return new TenantActor(context, tenantId);
-            return SupervisorStrategy.stop();
-        } else {
-            return SupervisorStrategy.resume();
         }
-    });
+    }
 
 }

application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java

@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.service.queue;
 
-import akka.actor.ActorRef;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -150,7 +149,7 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
                                         tbCoreDeviceRpcService.forwardRpcRequestToDeviceActor((ToDeviceRpcRequestActorMsg) tbActorMsg);
                                     } else {
                                         log.trace("[{}] Forwarding message to App Actor {}", id, actorMsg.get());
-                                        actorContext.tell(actorMsg.get(), ActorRef.noSender());
+                                        actorContext.tell(actorMsg.get());
                                     }
                                 }
                                 callback.onSuccess();
@@ -208,7 +207,7 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
             Optional<TbActorMsg> actorMsg = encodingService.decode(toCoreNotification.getComponentLifecycleMsg().toByteArray());
             if (actorMsg.isPresent()) {
                 log.trace("[{}] Forwarding message to App Actor {}", id, actorMsg.get());
-                actorContext.tell(actorMsg.get(), ActorRef.noSender());
+                actorContext.tell(actorMsg.get());
             }
             callback.onSuccess();
         }
@@ -279,7 +278,7 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
         if (statsEnabled) {
             stats.log(toDeviceActorMsg);
         }
-        actorContext.tell(new TransportToDeviceActorMsgWrapper(toDeviceActorMsg, callback), ActorRef.noSender());
+        actorContext.tell(new TransportToDeviceActorMsgWrapper(toDeviceActorMsg, callback));
     }
 
     private void throwNotHandled(Object msg, TbCallback callback) {

application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java

@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.service.queue;
 
-import akka.actor.ActorRef;
 import com.google.protobuf.ProtocolStringList;
 import lombok.extern.slf4j.Slf4j;
 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.TbRuleEngineSubmitStrategyFactory;
 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.stats.RuleEngineStatisticsService;
 
@@ -232,7 +230,7 @@ public class DefaultTbRuleEngineConsumerService extends AbstractConsumerService<
             Optional<TbActorMsg> actorMsg = encodingService.decode(nfMsg.getComponentLifecycleMsg().toByteArray());
             if (actorMsg.isPresent()) {
                 log.trace("[{}] Forwarding message to App Actor {}", id, actorMsg.get());
-                actorContext.tell(actorMsg.get(), ActorRef.noSender());
+                actorContext.tell(actorMsg.get());
             }
             callback.onSuccess();
         } else if (nfMsg.hasFromDeviceRpcResponse()) {
@@ -261,7 +259,7 @@ public class DefaultTbRuleEngineConsumerService extends AbstractConsumerService<
             }
         }
         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}")

application/src/main/java/org/thingsboard/server/service/rpc/DefaultTbCoreDeviceRpcService.java

@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.service.rpc;
 
-import akka.actor.ActorRef;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 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());
         UUID requestId = request.getId();
         localToDeviceRpcRequests.put(requestId, rpcMsg);
-        actorContext.tell(rpcMsg, ActorRef.noSender());
+        actorContext.tell(rpcMsg);
         scheduleToDeviceTimeout(request, requestId);
     }
 

application/src/main/resources/actor-system.conf

@@ -1,139 +0,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.
-#
-
-
-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
-}

application/src/main/resources/thingsboard.yml

@@ -281,6 +281,14 @@ sql:
 
 # Actor system parameters
 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:
     create_components_on_init: "${ACTORS_TENANT_CREATE_COMPONENTS_ON_INIT:true}"
   session:
@@ -318,11 +326,6 @@ actors:
     enabled: "${ACTORS_STATISTICS_ENABLED:true}"
     js_print_interval_ms: "${ACTORS_JS_STATISTICS_PRINT_INTERVAL_MS:10000}"
     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:
   # caffeine or redis

application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java

@@ -15,8 +15,6 @@
  */
 package org.thingsboard.server.rules.flow;
 
-import akka.actor.ActorRef;
-import com.datastax.driver.core.utils.UUIDs;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.After;
 import org.junit.Assert;
@@ -26,7 +24,6 @@ import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.rule.engine.metadata.TbGetAttributesNodeConfiguration;
 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.kv.BaseAttributeKvEntry;
 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.security.Authority;
 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.queue.QueueToRuleEngineMsg;
 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);
         QueueToRuleEngineMsg qMsg = new QueueToRuleEngineMsg(savedTenant.getId(), tbMsg, null, null);
         // Pushing Message to the system
-        actorSystem.tell(qMsg, ActorRef.noSender());
+        actorSystem.tell(qMsg);
         Mockito.verify(tbMsgCallback, Mockito.timeout(10000)).onSuccess();
 
         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);
         QueueToRuleEngineMsg qMsg = new QueueToRuleEngineMsg(savedTenant.getId(), tbMsg, null, null);
         // Pushing Message to the system
-        actorSystem.tell(qMsg, ActorRef.noSender());
+        actorSystem.tell(qMsg);
 
         Mockito.verify(tbMsgCallback, Mockito.timeout(10000)).onSuccess();
 

application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java

@@ -15,8 +15,6 @@
  */
 package org.thingsboard.server.rules.lifecycle;
 
-import akka.actor.ActorRef;
-import com.datastax.driver.core.utils.UUIDs;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.After;
 import org.junit.Assert;
@@ -26,7 +24,6 @@ import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.rule.engine.metadata.TbGetAttributesNodeConfiguration;
 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.Device;
 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.security.Authority;
 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.queue.QueueToRuleEngineMsg;
 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);
         QueueToRuleEngineMsg qMsg = new QueueToRuleEngineMsg(savedTenant.getId(), tbMsg, null, null);
         // Pushing Message to the system
-        actorSystem.tell(qMsg, ActorRef.noSender());
+        actorSystem.tell(qMsg);
         Mockito.verify(tbMsgCallback, Mockito.timeout(3000)).onSuccess();
 
 

common/actor/src/main/java/org/thingsboard/server/actors/AbstractTbActor.java

@@ -0,0 +1,34 @@
+/**
+ * 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) {
+        this.ctx = ctx;
+    }
+
+    @Override
+    public TbActorRef getActorRef() {
+        return ctx;
+    }
+}

common/actor/src/main/java/org/thingsboard/server/actors/DefaultTbActorSystem.java

@@ -21,13 +21,19 @@ 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
@@ -36,6 +42,8 @@ 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
@@ -65,16 +73,21 @@ public class DefaultTbActorSystem implements TbActorSystem {
     }
 
     @Override
-    public TbActorId createRootActor(String dispatcherId, TbActorCreator creator) {
+    public TbActorRef getActor(TbActorId actorId) {
+        return actors.get(actorId);
+    }
+
+    @Override
+    public TbActorRef createRootActor(String dispatcherId, TbActorCreator creator) {
         return createActor(dispatcherId, creator, null);
     }
 
     @Override
-    public TbActorId createChildActor(String dispatcherId, TbActorCreator creator, TbActorId parent) {
+    public TbActorRef createChildActor(String dispatcherId, TbActorCreator creator, TbActorId parent) {
         return createActor(dispatcherId, creator, parent);
     }
 
-    private TbActorId createActor(String dispatcherId, TbActorCreator creator, TbActorId 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);
@@ -93,9 +106,20 @@ public class DefaultTbActorSystem implements TbActorSystem {
                 if (actorMailbox == null) {
                     log.debug("Creating actor with id [{}]!", actorId);
                     TbActor actor = creator.createActor();
-                    TbActorMailbox mailbox = new TbActorMailbox(this, settings, actorId, parent, actor, dispatcher);
+                    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);
                 }
@@ -104,7 +128,12 @@ public class DefaultTbActorSystem implements TbActorSystem {
                 actorCreationLocks.remove(actorId);
             }
         }
-        return actorId;
+        return actorMailbox;
+    }
+
+    @Override
+    public void tell(TbActorRef target, TbActorMsg actorMsg) {
+        target.tell(actorMsg);
     }
 
     @Override
@@ -116,8 +145,42 @@ public class DefaultTbActorSystem implements TbActorSystem {
         mailbox.enqueue(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();
@@ -126,7 +189,17 @@ public class DefaultTbActorSystem implements TbActorSystem {
 
     @Override
     public void stop() {
-        dispatchers.values().forEach(dispatcher -> dispatcher.getExecutor().shutdownNow());
+        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();
     }
 

common/actor/src/main/java/org/thingsboard/server/actors/TbActor.java

@@ -19,11 +19,15 @@ import org.thingsboard.server.common.msg.TbActorMsg;
 
 public interface TbActor {
 
-    void init();
+    boolean process(TbActorMsg msg);
 
-    boolean process(TbActorCtx ctx, TbActorMsg msg);
+    TbActorRef getActorRef();
 
-    void destroy();
+    default void init(TbActorCtx ctx) {
+    }
+
+    default void destroy() {
+    }
 
     default InitFailureStrategy onInitFailure(int attempt, Throwable t) {
         return InitFailureStrategy.retryWithDelay(5000);

common/actor/src/main/java/org/thingsboard/server/actors/TbActorCtx.java

@@ -17,12 +17,25 @@ package org.thingsboard.server.actors;
 
 import org.thingsboard.server.common.msg.TbActorMsg;
 
-public interface TbActorCtx {
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+public interface TbActorCtx extends TbActorRef {
 
     TbActorId getSelf();
 
-    TbActorId getParent();
+    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 tell(TbActorId target, TbActorMsg actorMsg);
+    void broadcastToChildren(TbActorMsg msg, Predicate<TbActorId> childFilter);
 
+    List<TbActorId> filterChildren(Predicate<TbActorId> childFilter);
 }

common/actor/src/main/java/org/thingsboard/server/actors/TbActorId.java

@@ -15,33 +15,6 @@
  */
 package org.thingsboard.server.actors;
 
-import org.thingsboard.server.common.data.id.EntityId;
+public interface TbActorId {
 
-import java.util.Objects;
-
-public class TbActorId {
-
-    private final EntityId entityId;
-
-    public TbActorId(EntityId entityId) {
-        this.entityId = entityId;
-    }
-
-    @Override
-    public String toString() {
-        return entityId.toString();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        TbActorId actorId = (TbActorId) o;
-        return entityId.equals(actorId.entityId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(entityId);
-    }
 }

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

@@ -19,9 +19,12 @@ 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
@@ -35,7 +38,7 @@ public final class TbActorMailbox implements TbActorCtx {
     private final TbActorSystem system;
     private final TbActorSystemSettings settings;
     private final TbActorId selfId;
-    private final TbActorId parentId;
+    private final TbActorRef parentRef;
     private final TbActor actor;
     private final Dispatcher dispatcher;
     private final ConcurrentLinkedQueue<TbActorMsg> msgs = new ConcurrentLinkedQueue<>();
@@ -47,11 +50,12 @@ public final class TbActorMailbox implements TbActorCtx {
         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();
+                actor.init(this);
                 if (!destroyInProgress.get()) {
                     ready.set(READY);
                     tryProcessQueue(false);
@@ -94,7 +98,7 @@ public final class TbActorMailbox implements TbActorCtx {
             if (msg != null) {
                 try {
                     log.debug("[{}] Going to process message: {}", selfId, msg);
-                    actor.process(this, msg);
+                    actor.process(msg);
                 } catch (Throwable t) {
                     log.debug("[{}] Failed to process message: {}", selfId, msg, t);
                     ProcessFailureStrategy strategy = actor.onProcessFailure(t);
@@ -121,13 +125,38 @@ public final class TbActorMailbox implements TbActorCtx {
     }
 
     @Override
-    public TbActorId getParent() {
+    public void tell(TbActorId target, TbActorMsg actorMsg) {
-        return parentId;
+        system.tell(target, actorMsg);
     }
 
     @Override
-    public void tell(TbActorId target, TbActorMsg actorMsg) {
+    public void broadcastToChildren(TbActorMsg msg) {
-        system.tell(target, actorMsg);
+        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() {
@@ -141,4 +170,14 @@ public final class TbActorMailbox implements TbActorCtx {
             }
         });
     }
+
+    @Override
+    public TbActorId getActorId() {
+        return selfId;
+    }
+
+    @Override
+    public void tell(TbActorMsg actorMsg) {
+        enqueue(actorMsg);
+    }
 }

common/actor/src/main/java/org/thingsboard/server/actors/TbActorRef.java

@@ -0,0 +1,26 @@
+/**
+ * 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);
+
+}

common/actor/src/main/java/org/thingsboard/server/actors/TbActorSystem.java

@@ -17,8 +17,10 @@ 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 {
 
@@ -28,14 +30,25 @@ public interface TbActorSystem {
 
     void destroyDispatcher(String dispatcherId);
 
-    TbActorId createRootActor(String dispatcherId, TbActorCreator creator);
+    TbActorRef getActor(TbActorId actorId);
 
-    TbActorId createChildActor(String dispatcherId, TbActorCreator creator, TbActorId parent);
+    TbActorRef createRootActor(String dispatcherId, TbActorCreator creator);
+
+    TbActorRef createChildActor(String dispatcherId, TbActorCreator creator, TbActorId parent);
+
+    void tell(TbActorRef target, TbActorMsg actorMsg);
 
     void tell(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);
 }

common/actor/src/main/java/org/thingsboard/server/actors/TbEntityActorId.java

@@ -0,0 +1,49 @@
+/**
+ * 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.toString();
+    }
+
+    @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);
+    }
+}

common/actor/src/main/java/org/thingsboard/server/actors/TbStringActorId.java

@@ -0,0 +1,45 @@
+/**
+ * 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);
+    }
+}

common/actor/src/test/java/org/thingsboard/server/actors/ActorSystemTest.java

@@ -81,10 +81,10 @@ public class ActorSystemTest {
         ActorTestCtx testCtx1 = getActorTestCtx(1);
         ActorTestCtx testCtx2 = getActorTestCtx(1);
 
-        TbActorId actorId1 = actorSystem.createRootActor(ROOT_DISPATCHER, new SlowInitActor.SlowInitActorCreator(
+        TbActorRef actorId1 = actorSystem.createRootActor(ROOT_DISPATCHER, new SlowInitActor.SlowInitActorCreator(
-                new TbActorId(new DeviceId(UUID.randomUUID())), testCtx1));
+                new TbEntityActorId(new DeviceId(UUID.randomUUID())), testCtx1));
-        TbActorId actorId2 = actorSystem.createRootActor(ROOT_DISPATCHER, new SlowInitActor.SlowInitActorCreator(
+        TbActorRef actorId2 = actorSystem.createRootActor(ROOT_DISPATCHER, new SlowInitActor.SlowInitActorCreator(
-                new TbActorId(new DeviceId(UUID.randomUUID())), testCtx2));
+                new TbEntityActorId(new DeviceId(UUID.randomUUID())), testCtx2));
 
         actorSystem.tell(actorId1, new IntTbActorMsg(42));
         actorSystem.tell(actorId2, new IntTbActorMsg(42));
@@ -98,7 +98,7 @@ public class ActorSystemTest {
     public void testOneActorCreated() throws InterruptedException {
         ActorTestCtx testCtx1 = getActorTestCtx(1);
         ActorTestCtx testCtx2 = getActorTestCtx(1);
-        TbActorId actorId = new TbActorId(new DeviceId(UUID.randomUUID()));
+        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)));
 
@@ -112,7 +112,7 @@ public class ActorSystemTest {
     @Test
     public void testActorCreatorCalledOnce() throws InterruptedException {
         ActorTestCtx testCtx = getActorTestCtx(1);
-        TbActorId actorId = new TbActorId(new DeviceId(UUID.randomUUID()));
+        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)));
         }
@@ -138,12 +138,12 @@ public class ActorSystemTest {
 
         List<ActorTestCtx> testCtxes = new ArrayList<>();
 
-        List<TbActorId> actorIds = new ArrayList<>();
+        List<TbActorRef> actorRefs = new ArrayList<>();
         for (int actorIdx = 0; actorIdx < actorsCount; actorIdx++) {
             ActorTestCtx testCtx = getActorTestCtx(msgNumber);
 
-            actorIds.add(actorSystem.createRootActor(ROOT_DISPATCHER, new TestRootActor.TestRootActorCreator(
+            actorRefs.add(actorSystem.createRootActor(ROOT_DISPATCHER, new TestRootActor.TestRootActorCreator(
-                    new TbActorId(new DeviceId(UUID.randomUUID())), testCtx)));
+                    new TbEntityActorId(new DeviceId(UUID.randomUUID())), testCtx)));
             testCtxes.add(testCtx);
         }
 
@@ -151,7 +151,7 @@ public class ActorSystemTest {
 
         for (int i = 0; i < msgNumber; i++) {
             int tmp = randomIntegers[i];
-            submitPool.execute(() -> actorIds.forEach(actorId -> actorSystem.tell(actorId, new IntTbActorMsg(tmp))));
+            submitPool.execute(() -> actorRefs.forEach(actorId -> actorSystem.tell(actorId, new IntTbActorMsg(tmp))));
         }
         log.info("Submitted all messages");
 

common/actor/src/test/java/org/thingsboard/server/actors/SlowInitActor.java

@@ -25,13 +25,13 @@ public class SlowInitActor extends TestRootActor {
     }
 
     @Override
-    public void init() {
+    public void init(TbActorCtx ctx) {
         try {
             Thread.sleep(500);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        super.init();
+        super.init(ctx);
     }
 
     public static class SlowInitActorCreator implements TbActorCreator {

common/actor/src/test/java/org/thingsboard/server/actors/TestRootActor.java

@@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.msg.TbActorMsg;
 
 @Slf4j
-public class TestRootActor implements TbActor {
+public class TestRootActor extends AbstractTbActor {
 
     @Getter
     private final TbActorId actorId;
@@ -37,12 +37,13 @@ public class TestRootActor implements TbActor {
     }
 
     @Override
-    public void init() {
+    public void init(TbActorCtx ctx) {
+        super.init(ctx);
         initialized = true;
     }
 
     @Override
-    public boolean process(TbActorCtx ctx, TbActorMsg msg) {
+    public boolean process(TbActorMsg msg) {
         if (initialized) {
             int value = ((IntTbActorMsg) msg).getValue();
             sum += value;

common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java

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

common/message/src/main/java/org/thingsboard/server/common/msg/aware/DeviceAwareMsg.java

@@ -16,8 +16,9 @@
 package org.thingsboard.server.common.msg.aware;
 
 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();
 }

common/message/src/main/java/org/thingsboard/server/common/msg/aware/RuleChainAwareMsg.java

@@ -16,8 +16,9 @@
 package org.thingsboard.server.common.msg.aware;
 
 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();
 	

common/message/src/main/java/org/thingsboard/server/common/msg/aware/TenantAwareMsg.java

@@ -16,8 +16,9 @@
 package org.thingsboard.server.common.msg.aware;
 
 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();
 	

pom.xml

@@ -62,8 +62,6 @@
         <jackson-annotations.version>2.10.2</jackson-annotations.version>
         <jackson-core.version>2.10.2</jackson-core.version>
         <json-schema-validator.version>2.2.6</json-schema-validator.version>
-        <scala.version>2.13</scala.version>
-        <akka.version>2.6.3</akka.version>
         <californium.version>1.0.2</californium.version>
         <gson.version>2.6.2</gson.version>
         <velocity.version>1.7</velocity.version>
@@ -780,6 +778,11 @@
                 <artifactId>util</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.thingsboard.common</groupId>
+                <artifactId>actor</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.thingsboard.common</groupId>
                 <artifactId>dao-api</artifactId>
@@ -1113,16 +1116,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>com.typesafe.akka</groupId>
-                <artifactId>akka-actor_${scala.version}</artifactId>
-                <version>${akka.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.typesafe.akka</groupId>
-                <artifactId>akka-slf4j_${scala.version}</artifactId>
-                <version>${akka.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.eclipse.californium</groupId>
                 <artifactId>californium-core</artifactId>