ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [26/50] [abbrv] incubator-ignite git commit: #IGNITE-160 Fixed tests
Date Mon, 09 Feb 2015 15:32:04 GMT
#IGNITE-160 Fixed tests


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/62cb1e43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/62cb1e43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/62cb1e43

Branch: refs/heads/ignite-sql-tests
Commit: 62cb1e433caa00a478e8c5626eac706a5e62ab2d
Parents: 2307f74
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Mon Feb 9 13:52:52 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Mon Feb 9 13:52:52 2015 +0300

----------------------------------------------------------------------
 .../src/test/resources/spring-server-node.xml   | 32 +---------------
 .../test/resources/spring-server-ssl-node.xml   | 32 +---------------
 .../src/test/config/job-loadtest/client.xml     | 39 ++------------------
 .../src/test/config/job-loadtest/server.xml     | 13 +------
 modules/core/src/test/config/jobs-load-base.xml | 26 +------------
 .../core/src/test/config/load/dsi-load-base.xml | 26 +------------
 .../src/test/config/load/merge-sort-base.xml    | 39 ++------------------
 .../core/src/test/config/spring-multicache.xml  | 39 ++------------------
 .../loadtests/colocation/spring-colocation.xml  | 26 +------------
 9 files changed, 20 insertions(+), 252 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62cb1e43/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml
index 83d9114..a36f866 100644
--- a/modules/clients/src/test/resources/spring-server-node.xml
+++ b/modules/clients/src/test/resources/spring-server-node.xml
@@ -321,36 +321,8 @@
             Explicitly set custom public and system thread pools to increase
             possible started nodes count in one VM.
         -->
-        <property name="executorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg value="SERVER"/>
-                <constructor-arg type="int" value="15"/>
-                <constructor-arg type="int" value="15"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
-
-        <property name="executorServiceShutdown" value="true"/>
-
-        <property name="systemExecutorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg value="SYS-SERVER"/>
-                <constructor-arg type="int" value="15"/>
-                <constructor-arg type="int" value="15"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="publicThreadPoolSize" value="15"/>
 
-        <property name="systemExecutorServiceShutdown" value="true"/>
+        <property name="systemThreadPoolSize" value="15"/>
     </bean>
 </beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62cb1e43/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml
index f396798..0989154 100644
--- a/modules/clients/src/test/resources/spring-server-ssl-node.xml
+++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml
@@ -288,37 +288,9 @@
             Explicitly set custom public and system thread pools to increase
             possible started nodes count in one VM.
         -->
-        <property name="executorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg value="SERVER"/>
-                <constructor-arg type="int" value="15"/>
-                <constructor-arg type="int" value="15"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
-
-        <property name="executorServiceShutdown" value="true"/>
-
-        <property name="systemExecutorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg value="SYS-SERVER"/>
-                <constructor-arg type="int" value="15"/>
-                <constructor-arg type="int" value="15"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="publicThreadPoolSize" value="15"/>
 
-        <property name="systemExecutorServiceShutdown" value="true"/>
+        <property name="systemThreadPoolSize" value="15"/>
 
         <property name="portableConfiguration">
             <bean class="org.apache.ignite.portables.PortableConfiguration">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62cb1e43/modules/core/src/test/config/job-loadtest/client.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/job-loadtest/client.xml b/modules/core/src/test/config/job-loadtest/client.xml
index e96c4db..da93cc5 100644
--- a/modules/core/src/test/config/job-loadtest/client.xml
+++ b/modules/core/src/test/config/job-loadtest/client.xml
@@ -60,44 +60,11 @@
         </property>
 
         <!-- Disable pools -->
-        <property name="executorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg type="int" value="20"/>
-                <constructor-arg type="int" value="20"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="publicThreadPoolSize" value="20"/>
 
-        <property name="systemExecutorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg type="int" value="20"/>
-                <constructor-arg type="int" value="20"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="systemThreadPoolSize" value="20"/>
 
-        <property name="peerClassLoadingExecutorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg type="int" value="2"/>
-                <constructor-arg type="int" value="2"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="peerClassLoadingThreadPoolSize" value="2"/>
 
         <property name="discoverySpi">
             <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62cb1e43/modules/core/src/test/config/job-loadtest/server.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/job-loadtest/server.xml b/modules/core/src/test/config/job-loadtest/server.xml
index 0d002c7..2af22e1 100644
--- a/modules/core/src/test/config/job-loadtest/server.xml
+++ b/modules/core/src/test/config/job-loadtest/server.xml
@@ -38,18 +38,7 @@
 
         <property name="deploymentMode" value="CONTINUOUS"/>
 
-        <property name="executorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg type="int" value="300"/>
-                <constructor-arg type="int" value="300"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="publicThreadPoolSize" value="300"/>
 
         <property name="failoverSpi">
             <bean class="org.apache.ignite.spi.failover.jobstealing.JobStealingFailoverSpi">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62cb1e43/modules/core/src/test/config/jobs-load-base.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/jobs-load-base.xml b/modules/core/src/test/config/jobs-load-base.xml
index bfd78bb..ce3fdd6 100644
--- a/modules/core/src/test/config/jobs-load-base.xml
+++ b/modules/core/src/test/config/jobs-load-base.xml
@@ -87,31 +87,9 @@
 
         <property name="deploymentMode" value="SHARED"/>
 
-        <property name="executorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg type="int" value="#{T(java.lang.Runtime).getRuntime().availableProcessors()
/ 2}"/>
-                <constructor-arg type="int" value="#{T(java.lang.Runtime).getRuntime().availableProcessors()
/ 2}"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="publicThreadPoolSize" value="#{T(java.lang.Runtime).getRuntime().availableProcessors()
/ 2}"/>
 
-        <property name="systemExecutorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg type="int" value="#{T(java.lang.Runtime).getRuntime().availableProcessors()
/ 2}"/>
-                <constructor-arg type="int" value="#{T(java.lang.Runtime).getRuntime().availableProcessors()
/ 2}"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="systemThreadPoolSize" value="#{T(java.lang.Runtime).getRuntime().availableProcessors()
/ 2}"/>
 
         <property name="loadBalancingSpi">
             <bean class="org.apache.ignite.spi.loadbalancing.roundrobin.RoundRobinLoadBalancingSpi">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62cb1e43/modules/core/src/test/config/load/dsi-load-base.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/dsi-load-base.xml b/modules/core/src/test/config/load/dsi-load-base.xml
index fe32f1b..d8c1684 100644
--- a/modules/core/src/test/config/load/dsi-load-base.xml
+++ b/modules/core/src/test/config/load/dsi-load-base.xml
@@ -74,31 +74,9 @@
 
         <property name="deploymentMode" value="CONTINUOUS"/>
 
-        <property name="executorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg type="int" value="#{T(java.lang.Runtime).getRuntime().availableProcessors()
* 4}"/>
-                <constructor-arg type="int" value="#{T(java.lang.Runtime).getRuntime().availableProcessors()
* 4}"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="publicThreadPoolSize" value="#{T(java.lang.Runtime).getRuntime().availableProcessors()
* 4}"/>
 
-        <property name="systemExecutorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg type="int" value="#{T(java.lang.Runtime).getRuntime().availableProcessors()
* 8}"/>
-                <constructor-arg type="int" value="#{T(java.lang.Runtime).getRuntime().availableProcessors()
* 8}"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="systemThreadPoolSize" value="#{T(java.lang.Runtime).getRuntime().availableProcessors()
* 8}"/>
 
         <property name="failoverSpi">
             <bean class="org.apache.ignite.spi.failover.always.AlwaysFailoverSpi">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62cb1e43/modules/core/src/test/config/load/merge-sort-base.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/merge-sort-base.xml b/modules/core/src/test/config/load/merge-sort-base.xml
index 65bdcf0..e6027c7 100644
--- a/modules/core/src/test/config/load/merge-sort-base.xml
+++ b/modules/core/src/test/config/load/merge-sort-base.xml
@@ -60,44 +60,11 @@
         </property>
 
         <!-- Disable pools -->
-        <property name="executorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg type="int" value="100"/>
-                <constructor-arg type="int" value="100"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="publicThreadPoolSize" value="100"/>
 
-        <property name="systemExecutorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg type="int" value="100"/>
-                <constructor-arg type="int" value="100"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="systemThreadPoolSize" value="100"/>
 
-        <property name="peerClassLoadingExecutorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg type="int" value="100"/>
-                <constructor-arg type="int" value="100"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="peerClassLoadingThreadPoolSize" value="100"/>
 
         <!-- Discovery SPI configuration. -->
         <property name="discoverySpi">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62cb1e43/modules/core/src/test/config/spring-multicache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-multicache.xml b/modules/core/src/test/config/spring-multicache.xml
index d9b575e..9d9f959 100644
--- a/modules/core/src/test/config/spring-multicache.xml
+++ b/modules/core/src/test/config/spring-multicache.xml
@@ -277,53 +277,20 @@
             By default thread pool size is 100.
             All threads are pre-started and are available for use.
         -->
-        <property name="executorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg type="int" value="10"/>
-                <constructor-arg type="int" value="10"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="publicThreadPoolSize" value="10"/>
 
         <!--
             Uncomment to provide custom configuration for System executor service.
             By default the thread pool size is 5 which should be good enough.
             Threads are not started unless used.
         -->
-        <property name="systemExecutorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg type="int" value="10"/>
-                <constructor-arg type="int" value="10"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="systemThreadPoolSize" value="10"/>
 
         <!--
             Uncomment to provide custom configuration for P2P executor service.
             By default the thread pool size is 20 which should be good enough.
             Threads are not started unless used.
         -->
-        <property name="peerClassLoadingExecutorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg type="int" value="2"/>
-                <constructor-arg type="int" value="2"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="peerClassLoadingThreadPoolSize" value="2"/>
     </bean>
 </beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62cb1e43/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
index 6eefec7..01bd44f 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
@@ -62,36 +62,14 @@
             By default thread pool size is 100.
             All threads are pre-started and are available for use.
         -->
-        <property name="executorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg type="int" value="400"/>
-                <constructor-arg type="int" value="400"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="publicThreadPoolSize" value="400"/>
 
         <!--
             Uncomment to provide custom configuration for System executor service.
             By default the thread pool size is 5 which should be good enough.
             Threads are not started unless used.
         -->
-        <property name="systemExecutorService">
-            <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor">
-                <constructor-arg type="int" value="400"/>
-                <constructor-arg type="int" value="400"/>
-                <constructor-arg type="long">
-                    <util:constant static-field="java.lang.Long.MAX_VALUE"/>
-                </constructor-arg>
-                <constructor-arg type="java.util.concurrent.BlockingQueue">
-                    <bean class="java.util.concurrent.LinkedBlockingQueue"/>
-                </constructor-arg>
-            </bean>
-        </property>
+        <property name="systemThreadPoolSize" value="400"/>
 
         <!--
             Uncomment if you plan to populate cache form lifecycle bean.


Mime
View raw message