You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/08/02 10:38:29 UTC
[11/17] ignite git commit: 5578
5578
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1e9602fb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1e9602fb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1e9602fb
Branch: refs/heads/ignite-5578-debug
Commit: 1e9602fbf9653106302418f914d565ded4db4bc9
Parents: 977b752
Author: sboikov <sb...@gridgain.com>
Authored: Wed Aug 2 11:55:41 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Aug 2 11:55:41 2017 +0300
----------------------------------------------------------------------
.../affinity/GridAffinityAssignmentCache.java | 8 --------
.../cache/CacheAffinitySharedManager.java | 20 +++++++++++---------
...CacheExchangeMessageDuplicatedStateTest.java | 3 ---
3 files changed, 11 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1e9602fb/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index c60a690..410da73 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -337,14 +337,6 @@ public class GridAffinityAssignmentCache {
}
/**
- * @param topVer
- * @return
- */
- public boolean lastVersionEquals(AffinityTopologyVersion topVer) {
- return topVer.equals(lastVersion());
- }
-
- /**
* @return Last calculated affinity version.
*/
public AffinityTopologyVersion lastVersion() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/1e9602fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index 2138261..1ff2b56 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@ -1053,13 +1053,6 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
}
/**
- * @return All registered cache groups.
- */
- public Collection<CacheGroupDescriptor> cacheGroups() {
- return caches.allGroups();
- }
-
- /**
* @param c Cache closure.
* @throws IgniteCheckedException If failed
*/
@@ -1486,6 +1479,7 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
continue;
if (fut.cacheGroupAddedOnExchange(grp.groupId(), grp.receivedFrom())) {
+ // Do not calculate affinity since it can change in case of exchange merge.
if (!fut.context().mergeExchanges()) {
List<List<ClusterNode>> assignment = grp.affinity().calculate(topVer,
fut.discoveryEvent(),
@@ -1657,7 +1651,7 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
final GridAffinityAssignmentCache aff = grpHolder.affinity();
if (newAff) {
- if (!aff.lastVersionEquals(topVer)) {
+ if (!aff.lastVersion().equals(topVer)) {
List<List<ClusterNode>> assign =
aff.calculate(topVer, fut.discoveryEvent(), fut.discoCache());
@@ -1717,7 +1711,7 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
if (newAff) {
GridAffinityAssignmentCache aff = grpHolder.affinity();
- if (!aff.lastVersionEquals(topVer)) {
+ if (!aff.lastVersion().equals(topVer)) {
List<List<ClusterNode>> assign = aff.calculate(topVer,
fut.discoveryEvent(),
fut.discoCache());
@@ -1786,6 +1780,7 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
}
/**
+ * @param fut Current exchange future.
* @param crd Coordinator flag.
* @throws IgniteCheckedException If failed.
* @return Rabalance info.
@@ -2175,6 +2170,13 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
}
/**
+ * @return All registered cache groups.
+ */
+ public Collection<CacheGroupDescriptor> cacheGroups() {
+ return caches.allGroups();
+ }
+
+ /**
*
*/
public void dumpDebugInfo() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/1e9602fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
index dc88852..bff63fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
@@ -237,9 +237,6 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT
private void checkFullMessage(GridDhtPartitionsFullMessage msg) {
Map<Integer, Integer> dupPartsData = getFieldValue(msg, "dupPartsData");
- if (dupPartsData == null)
- System.out.println();
-
assertNotNull(dupPartsData);
checkFullMessage(AFF1_CACHE1, AFF1_CACHE2, dupPartsData, msg);