Repository: ignite Updated Branches: refs/heads/ignite-1093-2 d8bfdce2e -> 524539ebe
1093 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/524539eb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/524539eb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/524539eb Branch: refs/heads/ignite-1093-2 Commit: 524539ebe9799aaa3a7e06952333ffd8f2a47d13 Parents: d8bfdce Author: Anton Vinogradov <[email protected]> Authored: Fri Oct 9 19:46:04 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Fri Oct 9 19:46:04 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/distributed/dht/GridDhtLocalPartition.java | 4 ++++ modules/yardstick/config/benchmark-rebalancing.properties | 2 ++ modules/yardstick/config/ignite-rebalancing-multicast-config.xml | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/524539eb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java index aac32b0..eb2cee2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java @@ -545,6 +545,10 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>, return false; } + while (!map.isEmpty()) { + clearAll(0); + } + if (map.isEmpty() && state.compareAndSet(EVICTING, EVICTED, 0, 0)) { if (log.isDebugEnabled()) log.debug("Evicted partition: " + this); http://git-wip-us.apache.org/repos/asf/ignite/blob/524539eb/modules/yardstick/config/benchmark-rebalancing.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-rebalancing.properties b/modules/yardstick/config/benchmark-rebalancing.properties index 796e49f..604c7ac 100644 --- a/modules/yardstick/config/benchmark-rebalancing.properties +++ b/modules/yardstick/config/benchmark-rebalancing.properties @@ -70,6 +70,8 @@ nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} # Run configuration. CONFIGS="\ -cfg ${SCRIPT_DIR}/../config/ignite-rebalancing-multicast-config.xml -nn ${nodesNum} -b 1 -w 0 -d 140 -t 64 -sm PRIMARY_SYNC -dn IgniteRebalancePutGetBenchmark -sn IgniteNode -ds PutGet2 -cl -r 20000000 -cn rebalance2,\ +-cfg ${SCRIPT_DIR}/../config/ignite-rebalancing-multicast-config.xml -nn ${nodesNum} -b 1 -w 0 -d 140 -t 64 -sm PRIMARY_SYNC -dn IgniteRebalancePutGetBenchmark -sn IgniteNode -ds PutGet2_1 -cl -r 20000000 -cn rebalance2,\ +-cfg ${SCRIPT_DIR}/../config/ignite-rebalancing-multicast-config.xml -nn ${nodesNum} -b 1 -w 0 -d 140 -t 64 -sm PRIMARY_SYNC -dn IgniteRebalancePutGetBenchmark -sn IgniteNode -ds PutGet2_2 -cl -r 20000000 -cn rebalance2,\ " #-cfg ${SCRIPT_DIR}/../config/ignite-rebalancing-multicast-config.xml -nn ${nodesNum} -b 1 -w 0 -d 140 -t 64 -sm PRIMARY_SYNC -dn IgniteRebalancePutGetBenchmark -sn IgniteNode -ds PutGet1 -cl -r 20000000 -cn rebalance1,\ #-cfg ${SCRIPT_DIR}/../config/ignite-rebalancing-multicast-config.xml -nn ${nodesNum} -b 1 -w 0 -d 140 -t 64 -sm PRIMARY_SYNC -dn IgniteRebalancePutGetBenchmark -sn IgniteNode -ds PutGet2 -cl -r 20000000 -cn rebalance2,\ http://git-wip-us.apache.org/repos/asf/ignite/blob/524539eb/modules/yardstick/config/ignite-rebalancing-multicast-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-rebalancing-multicast-config.xml b/modules/yardstick/config/ignite-rebalancing-multicast-config.xml index 667c148..8e663c1 100644 --- a/modules/yardstick/config/ignite-rebalancing-multicast-config.xml +++ b/modules/yardstick/config/ignite-rebalancing-multicast-config.xml @@ -115,7 +115,7 @@ <property name="warmupClosure" ref="warmupClosure"/> - <property name="rebalanceThreadPoolSize" value="2"/> + <property name="rebalanceThreadPoolSize" value="1"/> </bean> <bean id="warmupClosure" class="org.apache.ignite.startup.BasicWarmupClosure">
