IGNITE-8827 Fixed failing test
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/df4fd65a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/df4fd65a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/df4fd65a Branch: refs/heads/ignite-8446 Commit: df4fd65a32dcbd3db8f86db4a320b649b7a9a7e7 Parents: a0fa79a Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Wed Jul 11 19:50:58 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Wed Jul 11 19:50:58 2018 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/processors/cache/WalStateManager.java | 4 +++- .../persistence/db/wal/IgniteWalIteratorSwitchSegmentTest.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/df4fd65a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java index 4597798..52e3ecb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java @@ -131,7 +131,9 @@ public class WalStateManager extends GridCacheSharedManagerAdapter { if (kernalCtx != null) { IgniteConfiguration cfg = kernalCtx.config(); - srv = !cfg.isClientMode() && !cfg.isDaemon(); + boolean client = cfg.isClientMode() != null && cfg.isClientMode(); + + srv = !client && !cfg.isDaemon(); log = kernalCtx.log(WalStateManager.class); } http://git-wip-us.apache.org/repos/asf/ignite/blob/df4fd65a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalIteratorSwitchSegmentTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalIteratorSwitchSegmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalIteratorSwitchSegmentTest.java index b30466e..00ed6f1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalIteratorSwitchSegmentTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalIteratorSwitchSegmentTest.java @@ -34,6 +34,7 @@ import org.apache.ignite.internal.pagemem.wal.record.SwitchSegmentRecord; import org.apache.ignite.internal.pagemem.wal.record.WALRecord; import org.apache.ignite.internal.processors.cache.GridCacheIoManager; import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; +import org.apache.ignite.internal.processors.cache.WalStateManager; import org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager; import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheDatabaseSharedManager; import org.apache.ignite.internal.processors.cache.persistence.file.FileIO; @@ -360,7 +361,7 @@ public class IgniteWalIteratorSwitchSegmentTest extends GridCommonAbstractTest { null, null, walMgr, - null, + new WalStateManager(kctx), new GridCacheDatabaseSharedManager(kctx), null, null,
