IGNITE-3775: IGFS: Uncommented deadlock tests. This closes #1044.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c85b7021 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c85b7021 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c85b7021 Branch: refs/heads/ignite-3661 Commit: c85b7021270730e72369dd97aacc3c3dd017851d Parents: e1c7937 Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Thu Sep 8 15:10:11 2016 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Thu Sep 8 15:10:11 2016 +0300 ---------------------------------------------------------------------- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../processors/igfs/IgfsAbstractSelfTest.java | 31 ++++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c85b7021/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 3f4d812..a31c82e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -296,7 +296,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (int i = 0; i < gridCount(); i++) { Boolean clientMode = grid(i).configuration().isClientMode(); - if (clientMode) + if (clientMode != null && clientMode) // Can be null in multi jvm tests. continue; grid(0).services(grid(0).cluster()).deployNodeSingleton(SERVICE_NAME1, new DummyServiceImpl()); http://git-wip-us.apache.org/repos/asf/ignite/blob/c85b7021/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java index c9b08d9..89979ad 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java @@ -2290,22 +2290,21 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest { private void checkDeadlocksRepeat(final int lvlCnt, final int childrenDirPerLvl, final int childrenFilePerLvl, int primaryLvlCnt, int renCnt, int delCnt, int updateCnt, int mkdirsCnt, int createCnt) throws Exception { - // TODO: Enable. -// if (relaxedConsistency()) -// return; -// -// for (int i = 0; i < REPEAT_CNT; i++) { -// try { -// checkDeadlocks(lvlCnt, childrenDirPerLvl, childrenFilePerLvl, primaryLvlCnt, renCnt, delCnt, -// updateCnt, mkdirsCnt, createCnt); -// -// if (i % 10 == 0) -// X.println(" - " + i); -// } -// finally { -// clear(igfs, igfsSecondary); -// } -// } + if (relaxedConsistency()) + return; + + for (int i = 0; i < REPEAT_CNT; i++) { + try { + checkDeadlocks(lvlCnt, childrenDirPerLvl, childrenFilePerLvl, primaryLvlCnt, renCnt, delCnt, + updateCnt, mkdirsCnt, createCnt); + + if (i % 10 == 0) + X.println(" - " + i); + } + finally { + clear(igfs, igfsSecondary); + } + } } /**
