Merge remote-tracking branch 'community/ignite-2.1.2' into ignite-2.1.2 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9790a46c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9790a46c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9790a46c Branch: refs/heads/ignite-2.1 Commit: 9790a46c59e2fdc29703246db3dc7ba9abcd108a Parents: 0b9527e 17694c1 Author: sboikov <sboi...@gridgain.com> Authored: Mon Jul 10 12:02:41 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Jul 10 12:02:41 2017 +0300 ---------------------------------------------------------------------- ...ishSnapshotOperationAckDiscoveryMessage.java | 84 ------- .../snapshot/SnapshotCheckParameters.java | 75 ------ .../pagemem/snapshot/SnapshotOperation.java | 235 ------------------- .../pagemem/snapshot/SnapshotOperationType.java | 49 ---- ...artSnapshotOperationAckDiscoveryMessage.java | 149 ------------ .../StartSnapshotOperationDiscoveryMessage.java | 192 --------------- .../GridCachePartitionExchangeManager.java | 9 +- .../processors/cache/GridCacheProcessor.java | 22 +- .../cache/GridCacheSharedContext.java | 6 +- .../dht/GridDhtPartitionTopologyImpl.java | 8 +- .../GridDhtPartitionsExchangeFuture.java | 54 ++--- .../GridCacheDatabaseSharedManager.java | 3 +- .../persistence/IgniteCacheSnapshotManager.java | 150 ------------ .../persistence/file/FilePageStoreManager.java | 2 +- .../snapshot/IgniteCacheSnapshotManager.java | 161 +++++++++++++ .../snapshot/SnapshotDiscoveryMessage.java | 33 +++ .../persistence/snapshot/SnapshotOperation.java | 44 ++++ .../datastructures/DataStructuresProcessor.java | 6 +- .../resources/META-INF/classnames.properties | 5 - .../loadtests/hashmap/GridCacheTestContext.java | 6 +- 20 files changed, 286 insertions(+), 1007 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9790a46c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java index 7c62cca,a69872f..fe0a0c6 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java @@@ -1740,11 -1740,11 +1740,11 @@@ public class GridDhtPartitionTopologyIm result.add(e.getKey()); } - } - U.warn(log, "Partition has been scheduled for rebalancing due to outdated update counter " + - "[nodeId=" + ctx.localNodeId() + ", cacheOrGroupName=" + grp.cacheOrGroupName() + - ", partId=" + p + ", haveHistory=" + haveHistory + "]"); + U.warn(log, "Partition has been scheduled for rebalancing due to outdated update counter " + - "[nodeId=" + ctx.localNodeId() + "cacheOrGroupName=" + grp.cacheOrGroupName() + ++ "[nodeId=" + ctx.localNodeId() + ", cacheOrGroupName=" + grp.cacheOrGroupName() + + ", partId=" + p + ", haveHistory=" + haveHistory + "]"); + } } if (updateSeq)