Merge branches 'ignite-383' and 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-383
Conflicts:
modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/19007879
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/19007879
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/19007879
Branch: refs/heads/sprint-2
Commit: 190078796f06291f8e2ecbecf90725980f3832ff
Parents: 6bb9dbc
Author: Yakov Zhdanov <yzhda...@gridgain.com>
Authored: Wed Mar 11 18:29:12 2015 +0300
Committer: Yakov Zhdanov <yzhda...@gridgain.com>
Committed: Wed Mar 11 18:29:12 2015 +0300
----------------------------------------------------------------------
.../core/src/main/java/org/apache/ignite/IgniteCache.java | 6 +++---
.../src/main/java/org/apache/ignite/cache/GridCache.java | 6 +++---
.../org/apache/ignite/configuration/CacheConfiguration.java | 9 ++++-----
.../main/java/org/apache/ignite/internal/IgnitionEx.java | 2 +-
.../internal/processors/cache/GridCacheAttributes.java | 9 +--------
.../processors/cache/GridCachePartitionExchangeManager.java | 2 +-
.../internal/processors/cache/GridCacheProcessor.java | 4 ++--
.../dht/preloader/GridDhtPartitionDemandPool.java | 2 +-
.../cache/distributed/dht/preloader/GridDhtPreloader.java | 2 +-
.../visor/cache/VisorCachePreloadConfiguration.java | 2 +-
.../IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java | 2 +-
.../distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java | 2 +-
.../near/GridCachePartitionedHitsAndMissesSelfTest.java | 2 +-
13 files changed, 21 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19007879/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 70ef9e5..b7fabbd 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -459,7 +459,7 @@ public interface IgniteCache<K, V> extends
javax.cache.Cache<K, V>, IgniteAsyncS
/**
* This cache node to re-balance its partitions. This method is usually
used when
- * {@link CacheConfiguration#getRebalancePartitionedDelay()} configuration
parameter has non-zero value.
+ * {@link CacheConfiguration#getRebalanceDelay()} configuration parameter
has non-zero value.
* When many nodes are started or stopped almost concurrently, it is more
efficient to delay
* rebalancing until the node topology is stable to make sure that no
redundant re-partitioning
* happens.
@@ -467,12 +467,12 @@ public interface IgniteCache<K, V> extends
javax.cache.Cache<K, V>, IgniteAsyncS
* In case of{@link CacheMode#PARTITIONED} caches, for better efficiency
user should
* usually make sure that new nodes get placed on the same place of
consistent hash ring as
* the left nodes, and that nodes are restarted before
- * {@link CacheConfiguration#getRebalancePartitionedDelay()
rebalanceDelay} expires. To place nodes
+ * {@link CacheConfiguration#getRebalanceDelay() rebalanceDelay} expires.
To place nodes
* on the same place in consistent hash ring, use
* {@link
CacheRendezvousAffinityFunction#setHashIdResolver(CacheAffinityNodeHashResolver)}
to make sure that
* a node maps to the same hash ID if re-started.
* <p>
- * See {@link CacheConfiguration#getRebalancePartitionedDelay()} for more
information on how to configure
+ * See {@link CacheConfiguration#getRebalanceDelay()} for more information
on how to configure
* rebalance re-partition delay.
* <p>
* @return Future that will be completed when rebalancing is finished.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19007879/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
b/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
index 946000d..71debac 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
@@ -199,7 +199,7 @@ public interface GridCache<K, V> extends CacheProjection<K,
V> {
/**
* Forces this cache node to re-balance its partitions. This method is
usually used when
- * {@link CacheConfiguration#getRebalancePartitionedDelay()} configuration
parameter has non-zero value.
+ * {@link CacheConfiguration#getRebalanceDelay()} configuration parameter
has non-zero value.
* When many nodes are started or stopped almost concurrently, it is more
efficient to delay
* rebalancing until the node topology is stable to make sure that no
redundant re-partitioning
* happens.
@@ -207,12 +207,12 @@ public interface GridCache<K, V> extends
CacheProjection<K, V> {
* In case of{@link CacheMode#PARTITIONED} caches, for better efficiency
user should
* usually make sure that new nodes get placed on the same place of
consistent hash ring as
* the left nodes, and that nodes are restarted before
- * {@link CacheConfiguration#getRebalancePartitionedDelay()
rebalanceDelay} expires. To place nodes
+ * {@link CacheConfiguration#getRebalanceDelay() rebalanceDelay} expires.
To place nodes
* on the same place in consistent hash ring, use
* {@link
org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction#setHashIdResolver(CacheAffinityNodeHashResolver)}
to make sure that
* a node maps to the same hash ID if re-started.
* <p>
- * See {@link
org.apache.ignite.configuration.CacheConfiguration#getRebalancePartitionedDelay()}
for more information on how to configure
+ * See {@link
org.apache.ignite.configuration.CacheConfiguration#getRebalanceDelay()} for
more information on how to configure
* rebalance re-partition delay.
* <p>
* @return Future that will be completed when rebalancing is finished.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19007879/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 a49c25a..7bb32c6 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
@@ -382,7 +382,7 @@ public class CacheConfiguration<K, V> extends
MutableConfiguration<K, V> {
nearEvictPlc = cc.getNearEvictionPolicy();
rebalanceMode = cc.getRebalanceMode();
rebalanceBatchSize = cc.getRebalanceBatchSize();
- rebalanceDelay = cc.getRebalancePartitionedDelay();
+ rebalanceDelay = cc.getRebalanceDelay();
rebalanceOrder = cc.getRebalanceOrder();
rebalancePoolSize = cc.getRebalanceThreadPoolSize();
rebalanceTimeout = cc.getRebalanceTimeout();
@@ -1321,7 +1321,6 @@ public class CacheConfiguration<K, V> extends
MutableConfiguration<K, V> {
* after they leave topology, or if you plan to start multiple nodes at
once or one after another
* and don't want to repartition and rebalance until all nodes are started.
* <p>
- * Delayed rebalancing is applied to {@link CacheMode#PARTITIONED} caches
only.
* For better efficiency user should usually make sure that new nodes get
placed on
* the same place of consistent hash ring as the left nodes, and that
nodes are
* restarted before this delay expires. To place nodes on the same place
in consistent hash ring,
@@ -1338,16 +1337,16 @@ public class CacheConfiguration<K, V> extends
MutableConfiguration<K, V> {
* start rebalancing manually, or positive value to specify delay in
milliseconds
* after which rebalancing should start automatically.
*/
- public long getRebalancePartitionedDelay() {
+ public long getRebalanceDelay() {
return rebalanceDelay;
}
/**
- * Sets rebalance delay (see {@link #getRebalancePartitionedDelay()} for
more information).
+ * Sets rebalance delay (see {@link #getRebalanceDelay()} for more
information).
*
* @param rebalanceDelay Rebalance delay to set.
*/
- public void setRebalancePartitionedDelay(long rebalanceDelay) {
+ public void setRebalanceDelay(long rebalanceDelay) {
this.rebalanceDelay = rebalanceDelay;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19007879/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 92b242f..bd29bf8 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
@@ -1873,7 +1873,7 @@ public class IgnitionEx {
cache.setAtomicityMode(TRANSACTIONAL);
cache.setSwapEnabled(false);
cache.setQueryIndexEnabled(false);
- cache.setPreloadMode(SYNC);
+ cache.setRebalanceMode(SYNC);
cache.setWriteSynchronizationMode(FULL_SYNC);
cache.setAffinity(new CacheRendezvousAffinityFunction(false, 100));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19007879/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
index eb8ae54..dd08260 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
@@ -390,14 +390,7 @@ public class GridCacheAttributes implements Externalizable
{
}
/**
- * @return Flag indicating if cached values should be additionally stored
in serialized form.
- */
- public boolean storeValueBytes() {
- return storeValBytes;
- }
-
- /**
- * @return Preload batch size.
+ * @return Rebalance batch size.
*/
public int rebalanceBatchSize() {
return rebalanceBatchSize;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19007879/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index fc3f11a..39de6bf 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -851,7 +851,7 @@ public class GridCachePartitionExchangeManager<K, V>
extends GridCacheSharedMana
}
for (GridCacheContext<K, V> cacheCtx :
cctx.cacheContexts()) {
- long delay =
cacheCtx.config().getRebalancePartitionedDelay();
+ long delay = cacheCtx.config().getRebalanceDelay();
GridDhtPreloaderAssignments<K, V> assigns = null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19007879/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 fc1e5ab..7deb1fe 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
@@ -374,7 +374,7 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
throw new IgniteCheckedException("Cannot enable write-through
(writer or store is not provided) " +
"for cache: " + cc.getName());
- long delay = cc.getRebalancePartitionedDelay();
+ long delay = cc.getRebalanceDelay();
if (delay != 0) {
if (cc.getCacheMode() != PARTITIONED)
@@ -1321,7 +1321,7 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
if (cfg.getRebalanceMode() == SYNC) {
if (cfg.getCacheMode() == REPLICATED ||
- (cfg.getCacheMode() == PARTITIONED &&
cfg.getRebalancePartitionedDelay() >= 0))
+ (cfg.getCacheMode() == PARTITIONED &&
cfg.getRebalanceDelay() >= 0))
cache.preloader().syncFuture().get();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19007879/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
index f569021..0f2443e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
@@ -330,7 +330,7 @@ public class GridDhtPartitionDemandPool<K, V> {
if (log.isDebugEnabled())
log.debug("Adding partition assignments: " + assigns);
- long delay = cctx.config().getRebalancePartitionedDelay();
+ long delay = cctx.config().getRebalanceDelay();
if (delay == 0 || force) {
assert assigns != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19007879/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index 498a5e5..b7ae4d3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -226,7 +226,7 @@ public class GridDhtPreloader<K, V> extends
GridCachePreloaderAdapter<K, V> {
final long start = U.currentTimeMillis();
- if (cctx.config().getRebalancePartitionedDelay() >= 0) {
+ if (cctx.config().getRebalanceDelay() >= 0) {
U.log(log, "Starting rebalancing in " +
cctx.config().getRebalanceMode() + " mode: " + cctx.name());
demandPool.syncFuture().listen(new CI1<Object>() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19007879/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java
index b04223d..dbf7b6a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java
@@ -58,7 +58,7 @@ public class VisorCachePreloadConfiguration implements
Serializable {
cfg.mode = ccfg.getRebalanceMode();
cfg.batchSize = ccfg.getRebalanceBatchSize();
cfg.threadPoolSize = ccfg.getRebalanceThreadPoolSize();
- cfg.partitionedDelay = ccfg.getRebalancePartitionedDelay();
+ cfg.partitionedDelay = ccfg.getRebalanceDelay();
cfg.throttle = ccfg.getRebalanceThrottle();
cfg.timeout = ccfg.getRebalanceTimeout();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19007879/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
index 1b4706e..130b8b6 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
@@ -59,7 +59,7 @@ public class IgnitePutAllUpdateNonPreloadedPartitionSelfTest
extends GridCommonA
ccfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
ccfg.setCacheMode(CacheMode.PARTITIONED);
- ccfg.setRebalancePartitionedDelay(-1);
+ ccfg.setRebalanceDelay(-1);
return ccfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19007879/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
index 399d2f9..121dd77 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
@@ -74,7 +74,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends
GridCommonAbstractTest {
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cc.setRebalanceMode(preloadMode);
- cc.setRebalancePartitionedDelay(delay);
+ cc.setRebalanceDelay(delay);
cc.setAffinity(new CacheRendezvousAffinityFunction(false, 128));
cc.setBackups(1);
cc.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19007879/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
index af53f8d..423c819 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
@@ -86,7 +86,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest
extends GridCommonAbstrac
cfg.setEvictionPolicy(null);
cfg.setBackups(1);
cfg.setDistributionMode(PARTITIONED_ONLY);
- cfg.setRebalancePartitionedDelay(-1);
+ cfg.setRebalanceDelay(-1);
cfg.setBackups(1);
cfg.setStatisticsEnabled(true);
