ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/3] ignite git commit: ignite-1093
Date Tue, 25 Aug 2015 16:46:55 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1093 933fd6fdd -> b771c931a


ignite-1093


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

Branch: refs/heads/ignite-1093
Commit: 6e516fee8680b3242975d544dbed951c045ed127
Parents: 933fd6f
Author: Anton Vinogradov <vinogradov.anton@gmail.com>
Authored: Tue Aug 25 14:51:55 2015 +0300
Committer: Anton Vinogradov <vinogradov.anton@gmail.com>
Committed: Tue Aug 25 14:51:55 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/configuration/CacheConfiguration.java   | 10 ++++------
 .../internal/processors/cache/GridCacheProcessor.java     |  4 +---
 2 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6e516fee/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index d0d0861..8057329 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -1299,11 +1299,9 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
         return this;
     }
 
+    @Deprecated
     /**
-     * Gets count of threads used at rebalancing.
-     * Limited by {@link IgniteConfiguration#maxRebalanceThreadPoolSize}
-     * <p>
-     * Default value is {@link #DFLT_REBALANCE_THREAD_POOL_SIZE}.
+     * Use {@link IgniteConfiguration#getRebalanceThreadPoolSize()} instead.
      *
      * @return Size of rebalancing thread pool.
      */
@@ -1311,9 +1309,9 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
         return rebalancePoolSize;
     }
 
+    @Deprecated
     /**
-     * Sets count of threads used at rebalancing.
-     * Limited by {@link IgniteConfiguration#maxRebalanceThreadPoolSize}
+     * Use {@link IgniteConfiguration#getRebalanceThreadPoolSize()} instead.
      *
      * @param rebalancePoolSize Size of rebalancing thread pool.
      * @return {@code this} for chaining.

http://git-wip-us.apache.org/repos/asf/ignite/blob/6e516fee/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index dd4d30b..f283008 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -324,10 +324,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
             U.warn(log, "AffinityFunction configuration parameter will be ignored for local
cache [cacheName=" +
                 U.maskName(cc.getName()) + ']');
 
-        if (cc.getRebalanceMode() != CacheRebalanceMode.NONE) {
-            assertParameter(cc.getRebalanceThreadPoolSize() > 0, "rebalanceThreadPoolSize
> 0");
+        if (cc.getRebalanceMode() != CacheRebalanceMode.NONE)
             assertParameter(cc.getRebalanceBatchSize() > 0, "rebalanceBatchSize > 0");
-        }
 
         if (cc.getCacheMode() == PARTITIONED || cc.getCacheMode() == REPLICATED) {
             if (cc.getAtomicityMode() == ATOMIC && cc.getWriteSynchronizationMode()
== FULL_ASYNC)


Mime
View raw message