ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [05/50] [abbrv] incubator-ignite git commit: IGNITE-160 Fixed review notes.
Date Mon, 09 Feb 2015 15:31:43 GMT
IGNITE-160 Fixed review notes.


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

Branch: refs/heads/ignite-sql-tests
Commit: 65414eeb479a25ee8f88bfbbbe64e19abe6b9c83
Parents: 77ab127
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Fri Feb 6 18:28:54 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Fri Feb 6 18:28:54 2015 +0300

----------------------------------------------------------------------
 .../ComputeExecutionRejectedException.java      |  2 +-
 .../ClientConnectionConfiguration.java          |  4 +-
 .../configuration/IgniteConfiguration.java      | 87 +++++++++-----------
 .../apache/ignite/internal/IgniteKernal.java    |  4 +-
 .../org/apache/ignite/internal/IgnitionEx.java  | 79 +++++++++---------
 .../managers/communication/GridIoManager.java   |  4 +-
 .../node/VisorExecutorServiceConfiguration.java |  2 +-
 .../spi/collision/noop/NoopCollisionSpi.java    |  2 +-
 8 files changed, 86 insertions(+), 98 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/65414eeb/modules/core/src/main/java/org/apache/ignite/compute/ComputeExecutionRejectedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeExecutionRejectedException.java
b/modules/core/src/main/java/org/apache/ignite/compute/ComputeExecutionRejectedException.java
index 435d0ca..4d504bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeExecutionRejectedException.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeExecutionRejectedException.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.*;
  * This exception defines execution rejection. This exception is used to indicate
  * the situation when execution service provided by the user in configuration
  * rejects execution.
- * @see org.apache.ignite.configuration.IgniteConfiguration#getExecutorService()
+ * @see org.apache.ignite.configuration.IgniteConfiguration#getPublicThreadPoolSize()
  */
 public class ComputeExecutionRejectedException extends IgniteException {
     /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/65414eeb/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
index 46a417c..72d5720 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
@@ -42,10 +42,10 @@ public class ClientConnectionConfiguration {
     public static final int DFLT_REST_PORT_RANGE = 100;
 
     /** Default size of REST thread pool. */
-    public static final int DFLT_REST_CORE_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
+    public static final int DFLT_REST_CORE_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_THREAD_CNT;
 
     /** Default max size of REST thread pool. */
-    public static final int DFLT_REST_MAX_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
+    public static final int DFLT_REST_MAX_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_THREAD_CNT;
 
     /** Default max queue capacity of REST thread pool. */
     public static final int DFLT_REST_THREADPOOL_QUEUE_CAP = Integer.MAX_VALUE;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/65414eeb/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index a664c28..e59deff 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -135,10 +135,7 @@ public class IgniteConfiguration {
     public static final int AVAILABLE_PROC_CNT = Runtime.getRuntime().availableProcessors();
 
     /** Default core size of public thread pool. */
-    public static final int DFLT_PUBLIC_CORE_THREAD_CNT = Math.max(8, AVAILABLE_PROC_CNT)
* 2;
-
-    /** Default max size of public thread pool. */
-    public static final int DFLT_PUBLIC_MAX_THREAD_CNT = DFLT_PUBLIC_CORE_THREAD_CNT;
+    public static final int DFLT_PUBLIC_THREAD_CNT = Math.max(8, AVAILABLE_PROC_CNT) * 2;
 
     /** Default keep alive time for public thread pool. */
     public static final long DFLT_PUBLIC_KEEP_ALIVE_TIME = 0;
@@ -147,10 +144,10 @@ public class IgniteConfiguration {
     public static final int DFLT_PUBLIC_THREADPOOL_QUEUE_CAP = Integer.MAX_VALUE;
 
     /** Default size of system thread pool. */
-    public static final int DFLT_SYSTEM_CORE_THREAD_CNT = DFLT_PUBLIC_CORE_THREAD_CNT;
+    public static final int DFLT_SYSTEM_CORE_THREAD_CNT = DFLT_PUBLIC_THREAD_CNT;
 
     /** Default max size of system thread pool. */
-    public static final int DFLT_SYSTEM_MAX_THREAD_CNT = DFLT_PUBLIC_CORE_THREAD_CNT;
+    public static final int DFLT_SYSTEM_MAX_THREAD_CNT = DFLT_PUBLIC_THREAD_CNT;
 
     /** Default keep alive time for system thread pool. */
     public static final long DFLT_SYSTEM_KEEP_ALIVE_TIME = 0;
@@ -164,12 +161,6 @@ public class IgniteConfiguration {
     /** Default size of management thread pool. */
     public static final int DFLT_MGMT_THREAD_CNT = 4;
 
-    /** Default size of REST thread pool. */
-    public static final int DFLT_REST_CORE_THREAD_CNT = DFLT_PUBLIC_CORE_THREAD_CNT;
-
-    /** Default max size of REST thread pool. */
-    public static final int DFLT_REST_MAX_THREAD_CNT = DFLT_PUBLIC_CORE_THREAD_CNT;
-
     /** Default keep alive time for REST thread pool. */
     public static final long DFLT_REST_KEEP_ALIVE_TIME = 0;
 
@@ -225,22 +216,22 @@ public class IgniteConfiguration {
     private IgniteLogger log;
 
     /** Public pool size. */
-    private int pubPoolSz = DFLT_PUBLIC_CORE_THREAD_CNT;
+    private int pubPoolSize = DFLT_PUBLIC_THREAD_CNT;
 
     /** System pool size. */
-    private int sysPoolSz = DFLT_SYSTEM_CORE_THREAD_CNT;
+    private int sysPoolSize = DFLT_SYSTEM_CORE_THREAD_CNT;
 
     /** Management pool size. */
-    private int mgmtPoolSz = DFLT_MGMT_THREAD_CNT;
+    private int mgmtPoolSize = DFLT_MGMT_THREAD_CNT;
 
     /** GGFS pool size. */
-    private int ggfsPoolSz = AVAILABLE_PROC_CNT;
+    private int ggfsPoolSize = AVAILABLE_PROC_CNT;
 
     /** Lifecycle email notification. */
     private boolean lifeCycleEmailNtf = true;
 
     /** P2P pool size. */
-    private int p2pPoolSz = DFLT_P2P_THREAD_CNT;
+    private int p2pPoolSize = DFLT_P2P_THREAD_CNT;
 
     /** Ignite installation folder. */
     private String ggHome;
@@ -551,12 +542,12 @@ public class IgniteConfiguration {
         clockSyncSamples = cfg.getClockSyncSamples();
         deployMode = cfg.getDeploymentMode();
         discoStartupDelay = cfg.getDiscoveryStartupDelay();
-        pubPoolSz = cfg.getExecutorService();
+        pubPoolSize = cfg.getPublicThreadPoolSize();
         ggHome = cfg.getIgniteHome();
         ggWork = cfg.getWorkDirectory();
         gridName = cfg.getGridName();
         ggfsCfg = cfg.getGgfsConfiguration();
-        ggfsPoolSz = cfg.getGgfsExecutorService();
+        ggfsPoolSize = cfg.getGgfsThreadPoolSize();
         hadoopCfg = cfg.getHadoopConfiguration();
         inclEvtTypes = cfg.getIncludeEventTypes();
         includeProps = cfg.getIncludeProperties();
@@ -574,13 +565,13 @@ public class IgniteConfiguration {
         metricsExpTime = cfg.getMetricsExpireTime();
         metricsLogFreq = cfg.getMetricsLogFrequency();
         metricsUpdateFreq = cfg.getMetricsUpdateFrequency();
-        mgmtPoolSz = cfg.getManagementThreadPoolSize();
+        mgmtPoolSize = cfg.getManagementThreadPoolSize();
         netTimeout = cfg.getNetworkTimeout();
         nodeId = cfg.getNodeId();
         p2pEnabled = cfg.isPeerClassLoadingEnabled();
         p2pLocClsPathExcl = cfg.getPeerClassLoadingLocalClassPathExclude();
         p2pMissedCacheSize = cfg.getPeerClassLoadingMissedResourcesCacheSize();
-        p2pPoolSz = cfg.getPeerClassLoadingThreadPoolSize();
+        p2pPoolSize = cfg.getPeerClassLoadingThreadPoolSize();
         pluginCfgs = cfg.getPluginConfigurations();
         portableCfg = cfg.getPortableConfiguration();
         qryCfg = cfg.getQueryConfiguration();
@@ -614,7 +605,7 @@ public class IgniteConfiguration {
         smtpSsl = cfg.isSmtpSsl();
         smtpStartTls = cfg.isSmtpStartTls();
         streamerCfg = cfg.getStreamerConfiguration();
-        sysPoolSz = cfg.getSystemThreadPoolSize();
+        sysPoolSize = cfg.getSystemThreadPoolSize();
         timeSrvPortBase = cfg.getTimeServerPortBase();
         timeSrvPortRange = cfg.getTimeServerPortRange();
         txCfg = cfg.getTransactionsConfiguration();
@@ -1065,13 +1056,13 @@ public class IgniteConfiguration {
      * This executor service will be in charge of processing {@link org.apache.ignite.compute.ComputeJob
GridJobs}
      * and user messages sent to node.
      * <p>
-     * If not provided, executor service will have size {@link #DFLT_PUBLIC_CORE_THREAD_CNT}.
+     * If not provided, executor service will have size {@link #DFLT_PUBLIC_THREAD_CNT}.
      *
      * @return Thread pool size to be used in grid to process job execution
      *      requests and user messages sent to the node.
      */
-    public int getExecutorService() {
-        return pubPoolSz;
+    public int getPublicThreadPoolSize() {
+        return pubPoolSize;
     }
 
     /**
@@ -1082,7 +1073,7 @@ public class IgniteConfiguration {
      * @return Thread pool size to be used in grid for internal system messages.
      */
     public int getSystemThreadPoolSize() {
-        return sysPoolSz;
+        return sysPoolSize;
     }
 
     /**
@@ -1095,7 +1086,7 @@ public class IgniteConfiguration {
      *      jobs processing.
      */
     public int getManagementThreadPoolSize() {
-        return mgmtPoolSz;
+        return mgmtPoolSize;
     }
 
     /**
@@ -1109,7 +1100,7 @@ public class IgniteConfiguration {
      *      requests handling.
      */
     public int getPeerClassLoadingThreadPoolSize() {
-        return p2pPoolSz;
+        return p2pPoolSize;
     }
 
     /**
@@ -1119,58 +1110,58 @@ public class IgniteConfiguration {
      *
      * @return Thread pool size to be used for GGFS outgoing message sending.
      */
-    public int getGgfsExecutorService() {
-        return ggfsPoolSz;
+    public int getGgfsThreadPoolSize() {
+        return ggfsPoolSize;
     }
 
     /**
      * Sets thread pool size to use within grid.
      *
-     * @param poolSz Thread pool size to use within grid.
-     * @see IgniteConfiguration#getExecutorService()
+     * @param poolSize Thread pool size to use within grid.
+     * @see IgniteConfiguration#getPublicThreadPoolSize()
      */
-    public void setPublicThreadPoolSize(int poolSz) {
-        this.pubPoolSz = poolSz;
+    public void setPublicThreadPoolSize(int poolSize) {
+        this.pubPoolSize = poolSize;
     }
 
     /**
      * Sets system thread pool size to use within grid.
      *
-     * @param poolSz Thread pool size to use within grid.
+     * @param poolSize Thread pool size to use within grid.
      * @see IgniteConfiguration#getSystemThreadPoolSize()
      */
-    public void setSystemThreadPoolSize(int poolSz) {
-        this.sysPoolSz = poolSz;
+    public void setSystemThreadPoolSize(int poolSize) {
+        this.sysPoolSize = poolSize;
     }
 
     /**
      * Sets management thread pool size to use within grid.
      *
-     * @param poolSz Thread pool size to use within grid.
+     * @param poolSize Thread pool size to use within grid.
      * @see IgniteConfiguration#getManagementThreadPoolSize()
      */
-    public void setManagementThreadPoolSize(int poolSz) {
-        this.mgmtPoolSz = poolSz;
+    public void setManagementThreadPoolSize(int poolSize) {
+        this.mgmtPoolSize = poolSize;
     }
 
     /**
      * Sets thread pool size to use for peer class loading.
      *
-     * @param poolSz Thread pool size to use within grid.
+     * @param poolSize Thread pool size to use within grid.
      * @see IgniteConfiguration#getPeerClassLoadingThreadPoolSize()
      */
-    public void setPeerClassLoadingThreadPoolSize(int poolSz) {
-        this.p2pPoolSz = poolSz;
+    public void setPeerClassLoadingThreadPoolSize(int poolSize) {
+        this.p2pPoolSize = poolSize;
     }
 
     /**
      * Set thread pool size that will be used to process outgoing GGFS messages.
      *
-     * @param poolSz Executor service to use for outgoing GGFS messages.
-     * @see IgniteConfiguration#getGgfsExecutorService()
+     * @param poolSize Executor service to use for outgoing GGFS messages.
+     * @see IgniteConfiguration#getGgfsThreadPoolSize()
      */
-    public void setGgfsExecutorService(int poolSz) {
-        this.ggfsPoolSz = poolSz;
+    public void setGgfsThreadPoolSize(int poolSize) {
+        this.ggfsPoolSize = poolSize;
     }
 
     /**
@@ -1785,7 +1776,7 @@ public class IgniteConfiguration {
      * on arrive to mapped node. This approach suits well for large amount of small
      * jobs (which is a wide-spread use case). User still can control the number
      * of concurrent jobs by setting maximum thread pool size defined by
-     * GridConfiguration.getExecutorService() configuration property.
+     * GridConfiguration.getPublicThreadPoolSize() configuration property.
      *
      * @return Grid collision SPI implementation or {@code null} to use default implementation.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/65414eeb/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index a85b72e..b05f247 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -433,7 +433,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx,
Ignit
     @Override public String getExecutorServiceFormatted() {
         assert cfg != null;
 
-        return String.valueOf(cfg.getExecutorService());
+        return String.valueOf(cfg.getPublicThreadPoolSize());
     }
 
     /** {@inheritDoc} */
@@ -1131,7 +1131,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx,
Ignit
         A.notNull(cfg.getMBeanServer(), "cfg.getMBeanServer()");
         A.notNull(cfg.getGridLogger(), "cfg.getGridLogger()");
         A.notNull(cfg.getMarshaller(), "cfg.getMarshaller()");
-        A.notNull(cfg.getExecutorService(), "cfg.getExecutorService()");
+        A.notNull(cfg.getPublicThreadPoolSize(), "cfg.getPublicThreadPoolSize()");
         A.notNull(cfg.getUserAttributes(), "cfg.getUserAttributes()");
 
         // All SPIs should be non-null.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/65414eeb/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 0508bb7..1d9e9e0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1394,6 +1394,33 @@ public class IgnitionEx {
             myCfg.setQueryConfiguration(cfg.getQueryConfiguration());
             myCfg.setAtomicConfiguration(cfg.getAtomicConfiguration());
 
+            ClientConnectionConfiguration clientCfg = cfg.getClientConnectionConfiguration();
+
+            if (clientCfg == null) {
+                    clientCfg = new ClientConnectionConfiguration();
+
+                    clientCfg.setClientMessageInterceptor(cfg.getClientMessageInterceptor());
+                    clientCfg.setRestAccessibleFolders(cfg.getRestAccessibleFolders());
+                    clientCfg.setRestIdleTimeout(cfg.getRestIdleTimeout());
+                    clientCfg.setRestJettyPath(cfg.getRestJettyPath());
+                    clientCfg.setRestPortRange(cfg.getRestPortRange());
+                    clientCfg.setRestSecretKey(cfg.getRestSecretKey());
+                    clientCfg.setRestTcpDirectBuffer(cfg.isRestTcpDirectBuffer());
+                    clientCfg.setRestTcpHost(cfg.getRestTcpHost());
+                    clientCfg.setRestTcpNoDelay(cfg.isRestTcpNoDelay());
+                    clientCfg.setRestTcpPort(cfg.getRestTcpPort());
+                    clientCfg.setRestTcpReceiveBufferSize(cfg.getRestTcpReceiveBufferSize());
+                    clientCfg.setRestTcpSelectorCount(cfg.getRestTcpSelectorCount());
+                    clientCfg.setRestTcpSendBufferSize(cfg.getRestTcpSendBufferSize());
+                    clientCfg.setRestTcpSendQueueLimit(cfg.getRestTcpSendQueueLimit());
+                    clientCfg.setRestTcpSslClientAuth(cfg.isRestTcpSslClientAuth());
+                    clientCfg.setRestTcpSslContextFactory(cfg.getRestTcpSslContextFactory());
+                    clientCfg.setRestTcpSslEnabled(cfg.isRestTcpSslEnabled());
+            }
+            else
+                clientCfg = new ClientConnectionConfiguration(clientCfg);
+
+
             String ntfStr = IgniteSystemProperties.getString(IGNITE_LIFECYCLE_EMAIL_NOTIFY);
 
             if (ntfStr != null)
@@ -1457,8 +1484,8 @@ public class IgnitionEx {
 
             execSvc = new IgniteThreadPoolExecutor(
                 "pub-" + cfg.getGridName(),
-                cfg.getExecutorService(),
-                cfg.getExecutorService(),
+                cfg.getPublicThreadPoolSize(),
+                cfg.getPublicThreadPoolSize(),
                 DFLT_PUBLIC_KEEP_ALIVE_TIME,
                 new LinkedBlockingQueue<Runnable>(DFLT_PUBLIC_THREADPOOL_QUEUE_CAP));
 
@@ -1502,23 +1529,18 @@ public class IgnitionEx {
             // Note that we do not pre-start threads here as ggfs pool may not be needed.
             ggfsExecSvc = new IgniteThreadPoolExecutor(
                 "ggfs-" + cfg.getGridName(),
-                cfg.getGgfsExecutorService(),
-                cfg.getGgfsExecutorService(),
+                cfg.getGgfsThreadPoolSize(),
+                cfg.getGgfsThreadPoolSize(),
                 0,
                 new LinkedBlockingQueue<Runnable>());
 
-
-            ClientConnectionConfiguration clientCfg = cfg.getClientConnectionConfiguration();
-
-            if (clientCfg != null) {
-                restExecSvc = new IgniteThreadPoolExecutor(
-                    "rest-" + cfg.getGridName(),
-                    clientCfg.getRestThreadPoolSize(),
-                    clientCfg.getRestThreadPoolSize(),
-                    DFLT_REST_KEEP_ALIVE_TIME,
-                    new LinkedBlockingQueue<Runnable>(DFLT_REST_THREADPOOL_QUEUE_CAP)
-                );
-            }
+            restExecSvc = new IgniteThreadPoolExecutor(
+                "rest-" + cfg.getGridName(),
+                clientCfg.getRestThreadPoolSize(),
+                clientCfg.getRestThreadPoolSize(),
+                DFLT_REST_KEEP_ALIVE_TIME,
+                new LinkedBlockingQueue<Runnable>(DFLT_REST_THREADPOOL_QUEUE_CAP)
+            );
 
             utilityCacheExecSvc = new IgniteThreadPoolExecutor(
                 "utility-" + cfg.getGridName(),
@@ -1675,31 +1697,6 @@ public class IgnitionEx {
             myCfg.setSmtpPassword(cfg.getSmtpPassword());
             myCfg.setAdminEmails(cfg.getAdminEmails());
 
-            if (clientCfg == null) {
-                // If client config is not provided then create config copying values from
GridConfiguration.
-                clientCfg = new ClientConnectionConfiguration();
-
-                clientCfg.setClientMessageInterceptor(cfg.getClientMessageInterceptor());
-                clientCfg.setRestAccessibleFolders(cfg.getRestAccessibleFolders());
-                clientCfg.setRestIdleTimeout(cfg.getRestIdleTimeout());
-                clientCfg.setRestJettyPath(cfg.getRestJettyPath());
-                clientCfg.setRestPortRange(cfg.getRestPortRange());
-                clientCfg.setRestSecretKey(cfg.getRestSecretKey());
-                clientCfg.setRestTcpDirectBuffer(cfg.isRestTcpDirectBuffer());
-                clientCfg.setRestTcpHost(cfg.getRestTcpHost());
-                clientCfg.setRestTcpNoDelay(cfg.isRestTcpNoDelay());
-                clientCfg.setRestTcpPort(cfg.getRestTcpPort());
-                clientCfg.setRestTcpReceiveBufferSize(cfg.getRestTcpReceiveBufferSize());
-                clientCfg.setRestTcpSelectorCount(cfg.getRestTcpSelectorCount());
-                clientCfg.setRestTcpSendBufferSize(cfg.getRestTcpSendBufferSize());
-                clientCfg.setRestTcpSendQueueLimit(cfg.getRestTcpSendQueueLimit());
-                clientCfg.setRestTcpSslClientAuth(cfg.isRestTcpSslClientAuth());
-                clientCfg.setRestTcpSslContextFactory(cfg.getRestTcpSslContextFactory());
-                clientCfg.setRestTcpSslEnabled(cfg.isRestTcpSslEnabled());
-            }
-            else
-                clientCfg = new ClientConnectionConfiguration(clientCfg);
-
             // REST configuration.
             myCfg.setClientConnectionConfiguration(clientCfg);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/65414eeb/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index b00a3f4..78c9baf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -586,7 +586,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
         }
         catch (RejectedExecutionException e) {
             U.error(log, "Failed to process regular message due to execution rejection. Increase
the upper bound " +
-                "on 'ExecutorService' provided by 'GridConfiguration.getExecutorService()'.
" +
+                "on 'ExecutorService' provided by 'GridConfiguration.getPublicThreadPoolSize()'.
" +
                 "Will attempt to process message in the listener thread instead.", e);
 
             c.run();
@@ -1304,7 +1304,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
             }
             catch (RejectedExecutionException e) {
                 U.error(log, "Failed to process delayed message due to execution rejection.
Increase the upper bound " +
-                    "on executor service provided in 'GridConfiguration.getExecutorService()').
Will attempt to " +
+                    "on executor service provided in 'GridConfiguration.getPublicThreadPoolSize()').
Will attempt to " +
                     "process message in the listener thread instead.", e);
 
                 for (GridCommunicationMessageSet msgSet : msgSets)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/65414eeb/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
index b9b5728..6aefb13 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
@@ -48,7 +48,7 @@ public class VisorExecutorServiceConfiguration implements Serializable {
     public static VisorExecutorServiceConfiguration from(IgniteConfiguration c) {
         VisorExecutorServiceConfiguration cfg = new VisorExecutorServiceConfiguration();
 
-        cfg.executeService(c.getExecutorService());
+        cfg.executeService(c.getPublicThreadPoolSize());
 
         cfg.systemExecutorService(c.getSystemThreadPoolSize());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/65414eeb/modules/core/src/main/java/org/apache/ignite/spi/collision/noop/NoopCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/noop/NoopCollisionSpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/collision/noop/NoopCollisionSpi.java
index 1782263..76ca6d1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/noop/NoopCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/noop/NoopCollisionSpi.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.*;
  * jobs are activated immediately on arrival to mapped node. This approach suits well
  * for large amount of small jobs (which is a wide-spread use case). User still can
  * control the number of concurrent jobs by setting maximum thread pool size defined
- * by {@link org.apache.ignite.configuration.IgniteConfiguration#getExecutorService()} configuration
property.
+ * by {@link org.apache.ignite.configuration.IgniteConfiguration#getPublicThreadPoolSize()}
configuration property.
  */
 @IgniteSpiNoop
 @IgniteSpiMultipleInstancesSupport(true)


Mime
View raw message