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 2018/11/20 20:43:35 UTC
[6/8] ignite git commit: Merge remote-tracking branch
'origin/ignite-10044' into ignite-10044
Merge remote-tracking branch 'origin/ignite-10044' into ignite-10044
# Conflicts:
# modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c4683f02
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c4683f02
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c4683f02
Branch: refs/heads/ignite-10044
Commit: c4683f026873e977917518c88875bed69f6d496c
Parents: 134f433 763ea32
Author: sboikov <sb...@apache.org>
Authored: Tue Nov 20 20:52:21 2018 +0300
Committer: sboikov <sb...@apache.org>
Committed: Tue Nov 20 20:52:21 2018 +0300
----------------------------------------------------------------------
.../distributed/IgniteCachePartitionLossPolicySelfTest.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c4683f02/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
index ea00b1f,be16e60..324a68d
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
@@@ -569,23 -526,18 +569,22 @@@ public class IgniteCachePartitionLossPo
info("Newly started node: " + grd.cluster().localNode().id());
- verifyLostPartitions(grd, lostParts);
+ for (String cacheName : CACHE_NAMES) {
+ verifyLostPartitions(grd, cacheName, lostPartsMap.get(cacheName));
- // Check that partition state does not change after we start each node.
- for (Ignite ig : G.allGrids()) {
- verifyLostPartitions(ig, lostParts);
+ // Check that partition state does not change after we start each node.
+ for (Ignite ig : G.allGrids()) {
+ if (skipCache(ig, cacheName))
+ continue;
+
+ verifyLostPartitions(ig, cacheName, lostPartsMap.get(cacheName));
- verifyCacheOps(canWrite, safe, ig);
+ verifyCacheOps(cacheName, canWrite, safe, ig);
- // TODO Query effectively waits for rebalance due to https://issues.apache.org/jira/browse/IGNITE-10057
- // TODO and after resetLostPartition there is another OWNING copy in the cluster due to https://issues.apache.org/jira/browse/IGNITE-10058.
- // TODO Uncomment after https://issues.apache.org/jira/browse/IGNITE-10058 is fixed.
+ // TODO Query effectively waits for rebalance due to https://issues.apache.org/jira/browse/IGNITE-10057
+ // TODO and after resetLostPartition there is another OWNING copy in the cluster due to https://issues.apache.org/jira/browse/IGNITE-10058.
+ // TODO Uncomment after https://issues.apache.org/jira/browse/IGNITE-10058 is fixed.
// validateQuery(safe, ig);
- }
}
}