You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dm...@apache.org on 2016/01/29 13:53:25 UTC
[1/2] ignite git commit: Proper initialization of utility and
marshalling pools.
Repository: ignite
Updated Branches:
refs/heads/master d2a107b0d -> 8a8a8c176
Proper initialization of utility and marshalling pools.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c2e5638d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c2e5638d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c2e5638d
Branch: refs/heads/master
Commit: c2e5638d01fbe44f90878d1aee6bf4979a935a7c
Parents: a34d705
Author: Denis Magda <dm...@gridgain.com>
Authored: Fri Jan 29 15:51:44 2016 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Fri Jan 29 15:51:44 2016 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgnitionEx.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c2e5638d/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 5153fb3..8f23b05 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
@@ -1662,7 +1662,7 @@ public class IgnitionEx {
"utility",
cfg.getGridName(),
myCfg.getUtilityCacheThreadPoolSize(),
- DFLT_SYSTEM_MAX_THREAD_CNT,
+ myCfg.getUtilityCacheThreadPoolSize(),
myCfg.getUtilityCacheKeepAliveTime(),
new LinkedBlockingQueue<Runnable>(DFLT_SYSTEM_THREADPOOL_QUEUE_CAP));
@@ -1670,7 +1670,7 @@ public class IgnitionEx {
"marshaller-cache",
cfg.getGridName(),
myCfg.getMarshallerCacheThreadPoolSize(),
- DFLT_SYSTEM_MAX_THREAD_CNT,
+ myCfg.getMarshallerCacheThreadPoolSize(),
myCfg.getMarshallerCacheKeepAliveTime(),
new LinkedBlockingQueue<Runnable>(DFLT_SYSTEM_THREADPOOL_QUEUE_CAP));
[2/2] ignite git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/ignite into master-main
Posted by dm...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into master-main
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8a8a8c17
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8a8a8c17
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8a8a8c17
Branch: refs/heads/master
Commit: 8a8a8c17602505adb4234bdd440b2ae20ee9a25e
Parents: c2e5638 d2a107b
Author: Denis Magda <dm...@gridgain.com>
Authored: Fri Jan 29 15:52:38 2016 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Fri Jan 29 15:52:38 2016 +0300
----------------------------------------------------------------------
.../examples/datagrid/CacheAffinityExample.java | 8 +-
.../java8/datagrid/CacheAffinityExample.java | 6 +-
modules/benchmarks/pom.xml | 32 +-
.../benchmarks/jmh/JmhAbstractBenchmark.java | 150 ++++++++++
.../jmh/cache/JmhCacheAbstractBenchmark.java | 181 ++++++++++++
.../jmh/cache/JmhCachePutBenchmark.java | 124 ++++++++
.../benchmarks/jmh/cache/PutBenchmark.java | 170 -----------
.../jmh/runner/JmhIdeBenchmarkRunner.java | 232 +++++++++++++++
.../internal/client/ClientGetAffinityTask.java | 4 +-
.../java/org/apache/ignite/IgniteCluster.java | 7 +-
.../apache/ignite/cache/affinity/Affinity.java | 24 +-
.../affinity/GridAffinityProcessor.java | 60 ++--
.../cache/GridCacheAffinityManager.java | 47 ++-
.../cache/affinity/GridCacheAffinityImpl.java | 48 ++-
.../dht/preloader/GridDhtPartitionDemander.java | 4 +-
.../near/GridNearTxFinishFuture.java | 96 +++---
.../ignite/internal/GridAffinityMappedTest.java | 8 +-
.../internal/GridAffinityNoCacheSelfTest.java | 290 +++++++++++++++++++
.../internal/GridAffinityP2PSelfTest.java | 8 +-
.../ignite/internal/GridAffinitySelfTest.java | 8 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 4 +-
.../cache/GridCacheAffinityRoutingSelfTest.java | 10 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 4 +-
.../GridCacheDaemonNodeAbstractSelfTest.java | 17 +-
.../cache/GridCacheDeploymentSelfTest.java | 8 +-
.../cache/GridCacheEntryMemorySizeSelfTest.java | 6 +-
...hePartitionedProjectionAffinitySelfTest.java | 8 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 4 +-
.../dht/GridCacheDhtMultiBackupTest.java | 4 +-
.../near/GridCacheNearOnlyTopologySelfTest.java | 4 +-
.../near/GridCacheNearTxMultiNodeSelfTest.java | 4 +-
...titionedExplicitLockNodeFailureSelfTest.java | 6 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 10 +-
.../processors/igfs/IgfsStreamsSelfTest.java | 4 +-
.../GridServicePackagePrivateSelfTest.java | 17 +-
.../ignite/loadtests/dsi/GridDsiClient.java | 4 +-
.../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +-
.../testsuites/IgniteComputeGridTestSuite.java | 4 +-
modules/docker/1.5.0.final/Dockerfile | 40 +++
modules/docker/1.5.0.final/run.sh | 50 ++++
modules/docker/Dockerfile | 6 +-
41 files changed, 1343 insertions(+), 382 deletions(-)
----------------------------------------------------------------------