Merge remote-tracking branch 'remotes/community/ignite-2.1.2' into ignite-2.1.2-exchange
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/02597402 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/02597402 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/02597402 Branch: refs/heads/ignite-2.1.2-exchange Commit: 025974023a7c97db05ba62cbee95261661aba2d3 Parents: c95b860 764eeea Author: sboikov <[email protected]> Authored: Wed Jun 28 09:09:59 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed Jun 28 09:09:59 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/IgniteDataStreamer.java | 12 +- .../cache/CacheAffinitySharedManager.java | 21 +- .../cache/GridCacheSharedContext.java | 3 +- .../cache/IgniteCacheOffheapManagerImpl.java | 137 +++++-- .../binary/CacheObjectBinaryProcessorImpl.java | 4 +- .../dht/GridClientPartitionTopology.java | 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 153 ++++---- .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../dht/preloader/GridDhtPartitionDemander.java | 4 +- .../GridDhtPartitionsExchangeFuture.java | 24 +- .../distributed/near/GridNearLockFuture.java | 4 +- .../cache/local/GridLocalLockFuture.java | 5 +- .../GridCacheDatabaseSharedManager.java | 9 +- .../persistence/GridCacheOffheapManager.java | 31 +- .../IgniteCacheDatabaseSharedManager.java | 1 - .../persistence/pagemem/PageMemoryImpl.java | 21 +- .../internal/visor/VisorDataTransferObject.java | 8 +- .../ignite/internal/visor/cache/VisorCache.java | 20 +- .../cache/VisorCacheAggregatedMetrics.java | 6 +- .../internal/visor/cache/VisorCacheMetrics.java | 28 ++ .../visor/cache/VisorMemoryMetrics.java | 10 +- .../node/VisorMemoryPolicyConfiguration.java | 36 +- .../resources/META-INF/classnames.properties | 46 +-- .../GridDiscoveryManagerAliveCacheSelfTest.java | 2 - .../cache/IgniteActiveClusterTest.java | 182 ++++++++++ .../IgniteCacheClearDuringRebalanceTest.java | 126 +++++++ .../persistence/IgnitePdsDynamicCacheTest.java | 11 + .../cache/transactions/TxDeadlockCauseTest.java | 279 +++++++++++++++ .../junits/GridTestKernalContext.java | 1 + .../testsuites/IgniteCacheTestSuite2.java | 3 + .../DynamicIndexAbstractBasicSelfTest.java | 81 ++++- ...exingComplexClientAtomicPartitionedTest.java | 33 ++ ...dexingComplexClientAtomicReplicatedTest.java | 33 ++ ...mplexClientTransactionalPartitionedTest.java | 33 ++ ...omplexClientTransactionalReplicatedTest.java | 33 ++ ...exingComplexServerAtomicPartitionedTest.java | 33 ++ ...dexingComplexServerAtomicReplicatedTest.java | 33 ++ ...mplexServerTransactionalPartitionedTest.java | 33 ++ ...omplexServerTransactionalReplicatedTest.java | 33 ++ .../index/H2DynamicIndexingComplexTest.java | 356 +++++++++++++++++++ .../cache/index/H2DynamicTableSelfTest.java | 182 ++++++++-- .../IgniteCacheQuerySelfTestSuite.java | 30 +- .../Cache/Query/CacheQueriesTest.cs | 7 + .../Impl/Cache/CacheEntryFilterHolder.cs | 13 + .../cluster-select/cluster-select.controller.js | 51 +-- .../cluster-select/cluster-select.pug | 16 +- .../app/modules/agent/AgentManager.service.js | 174 +++++---- .../frontend/app/modules/cluster/Cache.js | 19 +- .../modules/configuration/Version.service.js | 9 +- .../configuration/generator/Maven.service.js | 159 +++++---- .../frontend/app/primitives/ui-grid/index.scss | 8 - .../views/templates/agent-download.tpl.pug | 9 +- .../ignite/console/agent/rest/RestExecutor.java | 12 +- 53 files changed, 2133 insertions(+), 450 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/02597402/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/02597402/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 77963e9,4ca9643..e19cc72 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@@ -1336,13 -1271,12 +1337,14 @@@ public class GridDhtPartitionsExchangeF } } - if (discoEvt.type() == EVT_NODE_LEFT || + if (serverNodeDiscoveryEvent() && + (discoEvt.type() == EVT_NODE_LEFT || discoEvt.type() == EVT_NODE_FAILED || - discoEvt.type() == EVT_NODE_JOINED) + discoEvt.type() == EVT_NODE_JOINED)) detectLostPartitions(); + long start = U.currentTimeMillis(); + Map<Integer, CacheValidation> m = U.newHashMap(cctx.cache().cacheGroups().size()); for (CacheGroupContext grp : cctx.cache().cacheGroups())
