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/07/24 09:03:21 UTC
[8/8] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-5805
Merge remote-tracking branch 'remotes/origin/master' into ignite-5805
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/62ed19ab
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/62ed19ab
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/62ed19ab
Branch: refs/heads/ignite-5805
Commit: 62ed19ab5c87af31f3d9e2ac3e079ec8081454bd
Parents: a5ef374 aeb9336
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jul 24 12:01:23 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jul 24 12:01:23 2017 +0300
----------------------------------------------------------------------
.../cache/CacheAffinitySharedManager.java | 51 ++-
.../dht/GridClientPartitionTopology.java | 7 +-
.../dht/GridDhtPartitionTopology.java | 12 +-
.../dht/GridDhtPartitionTopologyImpl.java | 45 +-
.../dht/preloader/GridDhtPartitionMap.java | 7 +-
.../GridDhtPartitionsExchangeFuture.java | 120 +++---
.../GridCacheDatabaseSharedManager.java | 6 +-
.../wal/FileWriteAheadLogManager.java | 93 +++--
.../dotnet/PlatformDotNetCacheStore.java | 31 ++
.../CacheLateAffinityAssignmentTest.java | 36 +-
.../distributed/CachePartitionStateTest.java | 410 +++++++++++++++++++
.../TestCacheNodeExcludingFilter.java | 53 +++
.../db/IgnitePdsCacheRestoreTest.java | 208 ++++++++++
.../testsuites/IgniteCacheTestSuite6.java | 38 ++
.../ignite/testsuites/IgnitePdsTestSuite.java | 3 +
.../Apache.Ignite.Core.Tests.csproj | 5 +
.../Cache/Store/CacheStoreSessionTest.cs | 90 ++--
.../Store/CacheStoreSessionTestCodeConfig.cs | 68 +++
.../Store/CacheStoreSessionTestSharedFactory.cs | 48 +++
.../Cache/Store/CacheStoreTest.cs | 10 +-
.../cache-store-session-shared-factory.xml | 76 ++++
.../Config/Cache/Store/cache-store-session.xml | 20 +-
.../Impl/Cache/Store/CacheStoreInternal.cs | 14 +-
modules/web-console/frontend/app/app.js | 14 +
.../frontend/app/data/pom-dependencies.json | 5 +-
.../configuration/generator/Maven.service.js | 9 +-
.../frontend/app/modules/states/errors.state.js | 6 +-
.../frontend/app/modules/states/signin.state.js | 10 +-
.../frontend/webpack/webpack.common.js | 4 +-
29 files changed, 1285 insertions(+), 214 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/62ed19ab/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index 7bdb908,f519b4e..0f46a90
--- 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
@@@ -1433,15 -1468,11 +1468,11 @@@ public class CacheAffinitySharedManager
@Override public void applyx(CacheGroupDescriptor desc) throws IgniteCheckedException {
CacheGroupHolder grpHolder = grpHolders.get(desc.groupId());
- if (grpHolder != null) {
- if (grpHolder.client()) // Affinity for non-client holders calculated in {@link #onServerLeft}.
- grpHolder.affinity().calculate(fut.topologyVersion(), fut.discoveryEvent(), fut.discoCache());
-
+ if (grpHolder != null)
return;
- }
// Need initialize holders and affinity if this node became coordinator during this exchange.
- final Integer grpId = desc.groupId();
+ int grpId = desc.groupId();
CacheGroupContext grp = cctx.cache().cacheGroup(grpId);
http://git-wip-us.apache.org/repos/asf/ignite/blob/62ed19ab/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
----------------------------------------------------------------------