From a437eba5857436a38e76bddfc73d508b5755b2a8 Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Thu, 30 Apr 2020 17:29:06 +0300
Subject: [PATCH 1/2] Fixed default Rule Chain

---
 .../src/main/data/json/demo/rule_chains/root_rule_chain.json    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/src/main/data/json/demo/rule_chains/root_rule_chain.json b/application/src/main/data/json/demo/rule_chains/root_rule_chain.json
index 865d8cb8e6..32cecf6e4e 100644
--- a/application/src/main/data/json/demo/rule_chains/root_rule_chain.json
+++ b/application/src/main/data/json/demo/rule_chains/root_rule_chain.json
@@ -3,7 +3,7 @@
     "additionalInfo": null,
     "name": "Root Rule Chain",
     "firstRuleNodeId": null,
-    "root": false,
+    "root": true,
     "debugMode": false,
     "configuration": null
   },

From 702a8b6139e2a2ea16c42f4301b9936fabc82e5b Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Thu, 30 Apr 2020 18:10:05 +0300
Subject: [PATCH 2/2] Force unsubscribe from Kafka topics

---
 .../thingsboard/server/queue/kafka/TbKafkaConsumerTemplate.java | 1 +
 docker/tb-node.env                                              | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaConsumerTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaConsumerTemplate.java
index 49d1d74102..541337579d 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaConsumerTemplate.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaConsumerTemplate.java
@@ -106,6 +106,7 @@ public class TbKafkaConsumerTemplate<T extends TbQueueMsg> implements TbQueueCon
                 if (!subscribed) {
                     List<String> topicNames = partitions.stream().map(TopicPartitionInfo::getFullTopicName).collect(Collectors.toList());
                     topicNames.forEach(admin::createTopicIfNotExists);
+                    consumer.unsubscribe();
                     consumer.subscribe(topicNames);
                     subscribed = true;
                 }
diff --git a/docker/tb-node.env b/docker/tb-node.env
index 542296babe..12cdc7d035 100644
--- a/docker/tb-node.env
+++ b/docker/tb-node.env
@@ -10,3 +10,5 @@ CACHE_TYPE=redis
 REDIS_HOST=redis
 
 HTTP_LOG_CONTROLLER_ERROR_STACK_TRACE=false
+
+TB_QUEUE_PARTITIONS_VIRTUAL_NODES_SIZE=64