Repository: ignite Updated Branches: refs/heads/master d75101083 -> 813247399
IGNITE-6987 Showed actual client connector configuration "Thread pool size" property. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/81324739 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/81324739 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/81324739 Branch: refs/heads/master Commit: 81324739979d1a3e0dd167d66fe5bdc9ddc0548c Parents: d751010 Author: vsisko <[email protected]> Authored: Wed Dec 6 22:23:02 2017 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Dec 6 22:23:02 2017 +0700 ---------------------------------------------------------------------- .../node/VisorExecutorServiceConfiguration.java | 18 +++++++++--------- .../config/VisorConfigurationCommand.scala | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/81324739/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 31a3713..bf2572b 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 @@ -21,9 +21,9 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; import java.util.List; +import org.apache.ignite.configuration.ClientConnectorConfiguration; import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.SqlConnectorConfiguration; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.internal.visor.VisorDataTransferObject; @@ -74,8 +74,8 @@ public class VisorExecutorServiceConfiguration extends VisorDataTransferObject { /** Utility cache pool size. */ private int utilityCachePoolSize; - /** SQL connector configuration pool size. */ - private int sqlConnCfgPoolSize; + /** Client connector configuration pool size. */ + private int cliConnCfgPoolSize; /** List of executor configurations. */ private List<VisorExecutorConfiguration> executors; @@ -112,10 +112,10 @@ public class VisorExecutorServiceConfiguration extends VisorDataTransferObject { svcPoolSize = c.getServiceThreadPoolSize(); utilityCachePoolSize = c.getUtilityCacheThreadPoolSize(); - SqlConnectorConfiguration scc = c.getSqlConnectorConfiguration(); + ClientConnectorConfiguration scc = c.getClientConnectorConfiguration(); if (scc != null) - sqlConnCfgPoolSize = scc.getThreadPoolSize(); + cliConnCfgPoolSize = scc.getThreadPoolSize(); executors = VisorExecutorConfiguration.list(c.getExecutorConfiguration()); } @@ -216,8 +216,8 @@ public class VisorExecutorServiceConfiguration extends VisorDataTransferObject { /** * @return Thread pool that is in charge of processing ODBC tasks. */ - public int getSqlConnectorConfigurationThreadPoolSize() { - return sqlConnCfgPoolSize; + public int getClientConnectorConfigurationThreadPoolSize() { + return cliConnCfgPoolSize; } /** @@ -242,7 +242,7 @@ public class VisorExecutorServiceConfiguration extends VisorDataTransferObject { out.writeInt(stripedPoolSize); out.writeInt(svcPoolSize); out.writeInt(utilityCachePoolSize); - out.writeInt(sqlConnCfgPoolSize); + out.writeInt(cliConnCfgPoolSize); U.writeCollection(out, executors); } @@ -261,7 +261,7 @@ public class VisorExecutorServiceConfiguration extends VisorDataTransferObject { stripedPoolSize = in.readInt(); svcPoolSize = in.readInt(); utilityCachePoolSize = in.readInt(); - sqlConnCfgPoolSize = in.readInt(); + cliConnCfgPoolSize = in.readInt(); executors = U.readList(in); } http://git-wip-us.apache.org/repos/asf/ignite/blob/81324739/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala index b9b0af9..0185228 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala @@ -290,7 +290,7 @@ class VisorConfigurationCommand extends VisorConsoleCommand { execSvcT += ("Peer-to-Peer thread pool size", safe(execCfg.getPeerClassLoadingThreadPoolSize)) execSvcT += ("Rebalance Thread Pool size", execCfg.getRebalanceThreadPoolSize) execSvcT += ("REST thread pool size", safe(execCfg.getRestThreadPoolSize)) - execSvcT += ("SQL processor thread pool size", safe(execCfg.getSqlConnectorConfigurationThreadPoolSize)) + execSvcT += ("Client connector thread pool size", safe(execCfg.getClientConnectorConfigurationThreadPoolSize)) execSvcT.render()
