ignite-12163 fix test activation after fail get lock
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bc4209ba Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bc4209ba Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bc4209ba Branch: refs/heads/ignite-5075-pds Commit: bc4209bac205a682729d8ab174348bf188356565 Parents: c4a12b0 Author: Dmitriy Govorukhin <[email protected]> Authored: Wed May 17 12:52:01 2017 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Wed May 17 12:52:01 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cluster/GridClusterStateProcessor.java | 2 +- .../cache/database/GridCacheDatabaseSharedManager.java | 4 +++- .../processors/cache/database/file/FilePageStoreManager.java | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/bc4209ba/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java index 1286ba9..2cb6a1e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java @@ -379,7 +379,7 @@ public class GridClusterStateProcessor extends GridProcessorAdapter { actx.setFail(); - // revert change if activation request fail + // Revert change if activation request fail. if (actx.activate) { try { cacheProc.onKernalStopCaches(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/bc4209ba/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java index 73d6072..a5274b9 100755 --- a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java +++ b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java @@ -437,7 +437,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan log.debug("DeActivate database manager [id=" + cctx.localNodeId() + " topVer=" + cctx.discovery().topologyVersionEx() + " ]"); - onKernalStop0(true); + onKernalStop0(false); /* Must be here, because after deactivate we can invoke activate and file lock must be already configured */ stopping = false; @@ -477,6 +477,8 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan cctx.localNodeId() + " path=" + fileLockHolder.lockPath() + "]"); fileLockHolder.tryLock(lockWaitTime); + + System.out.println("Lock: " + fileLockHolder.lockPath() + " node " + cctx.igniteInstanceName()); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bc4209ba/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/file/FilePageStoreManager.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/file/FilePageStoreManager.java b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/file/FilePageStoreManager.java index af47c29..1bb83d2 100755 --- a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/file/FilePageStoreManager.java +++ b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/file/FilePageStoreManager.java @@ -154,6 +154,8 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen " topVer=" + cctx.discovery().topologyVersionEx() + " ]"); stop0(true); + + idxCacheStores.clear(); } /** {@inheritDoc} */
