thingsboard-aplcache

Merge pull request #34 from volodymyr-babak/master Moved

1/11/2017 5:45:05 PM

Changes

tools/pom.xml 33(+1 -32)

tools/src/main/java/org/thingsboard/client/tools/MqttStressTestClient.java 111(+0 -111)

tools/src/main/java/org/thingsboard/client/tools/MqttStressTestTool.java 129(+0 -129)

tools/src/main/java/org/thingsboard/client/tools/ResultAccumulator.java 100(+0 -100)

tools/src/main/java/org/thingsboard/client/tools/TestParams.java 73(+0 -73)

tools/src/main/resources/logback.xml 34(+0 -34)

tools/src/main/resources/test.properties 5(+0 -5)

Details

diff --git a/application/src/main/resources/actor-system.conf b/application/src/main/resources/actor-system.conf
index 573bdd7..248e301 100644
--- a/application/src/main/resources/actor-system.conf
+++ b/application/src/main/resources/actor-system.conf
@@ -29,9 +29,9 @@ app-dispatcher {
   executor = "fork-join-executor"
   fork-join-executor {
       # Min number of threads to cap factor-based parallelism number to
-      parallelism-min = 2
+      parallelism-min = 1
       # Max number of threads to cap factor-based parallelism number to
-      parallelism-max = 12
+      parallelism-max = 1
       
       # The parallelism factor is used to determine thread pool size using the
       # following formula: ceil(available processors * factor). Resulting size
@@ -54,7 +54,7 @@ rpc-dispatcher {
       # 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
+      parallelism-max = 8
 
       # The parallelism factor is used to determine thread pool size using the
       # following formula: ceil(available processors * factor). Resulting size
@@ -82,7 +82,7 @@ core-dispatcher {
       # 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
+      parallelism-factor = 0.25
   }
   # How long time the dispatcher will wait for new actors until it shuts down
   shutdown-timeout = 1s
@@ -105,7 +105,7 @@ rule-dispatcher {
       # 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
+      parallelism-factor = 0.25
   }
   # How long time the dispatcher will wait for new actors until it shuts down
   shutdown-timeout = 1s
@@ -128,7 +128,7 @@ plugin-dispatcher {
       # 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
+      parallelism-factor = 0.25
   }
   # How long time the dispatcher will wait for new actors until it shuts down
   shutdown-timeout = 1s
@@ -152,7 +152,7 @@ session-dispatcher {
       # 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
+      parallelism-factor = 0.25
   }
   # How long time the dispatcher will wait for new actors until it shuts down
   shutdown-timeout = 1s
diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index a1ab2b1..976f688 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -167,7 +167,7 @@ actors:
 # Cache parameters
 cache:
   # Enable/disable cache functionality.
-  enabled: "${CACHE_ENABLED:true}"
+  enabled: "${CACHE_ENABLED:false}"
   device_credentials:
     # Default time to store device credentials in cache, in seconds
     time_to_live: "${CACHE_DEVICE_CREDENTIAL_TTL:3600}"
diff --git a/docker/thingsboard/run_thingsboard.sh b/docker/thingsboard/run_thingsboard.sh
index 5c34721..877fed7 100755
--- a/docker/thingsboard/run_thingsboard.sh
+++ b/docker/thingsboard/run_thingsboard.sh
@@ -32,7 +32,7 @@ do
 done
 
 # Copying env variables into conf files
-printenv | while read x; do echo export $x; done >> /usr/share/thingsboard/conf/thingsboard.conf
+printenv | awk -F "=" '{print "export " $1 "='\''" $2 "'\''"}' >> /usr/share/thingsboard/conf/thingsboard.conf
 
 cat /usr/share/thingsboard/conf/thingsboard.conf
 

tools/pom.xml 33(+1 -32)

diff --git a/tools/pom.xml b/tools/pom.xml
index 8645463..cbea684 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -48,39 +48,8 @@
             <groupId>org.eclipse.paho</groupId>
             <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
-
     <build>
         <plugins>
             <plugin>
@@ -105,7 +74,7 @@
                             </filters>
                             <transformers>
                                 <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
                                         <Main-Class>org.thingsboard.client.tools.MqttStressTestTool</Main-Class>
                                     </manifestEntries>
diff --git a/tools/src/main/java/org/thingsboard/client/tools/RestClient.java b/tools/src/main/java/org/thingsboard/client/tools/RestClient.java
index 62f76ca..e3e1793 100644
--- a/tools/src/main/java/org/thingsboard/client/tools/RestClient.java
+++ b/tools/src/main/java/org/thingsboard/client/tools/RestClient.java
@@ -13,25 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.client.tools; /**
- * Copyright © 2016 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.client.tools;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.ClientHttpRequestExecution;
diff --git a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java
index b0bd41e..9b969fc 100644
--- a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java
+++ b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java
@@ -76,7 +76,6 @@ public class MqttTransportService {
 
     @PostConstruct
     public void init() throws Exception {
-        ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.ADVANCED);
         log.info("Starting MQTT transport...");
         log.info("Lookup MQTT transport adaptor {}", adaptorName);
         this.adaptor = (MqttTransportAdaptor) appContext.getBean(adaptorName);