IGNITE-8774 Daemon moves cluster to compatibility mode when joins fixed. - Fixes #4243.
Signed-off-by: Dmitriy Pavlov <dpav...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/84a7b595 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/84a7b595 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/84a7b595 Branch: refs/heads/ignite-8783 Commit: 84a7b595f8173a34325963cf776955e8a757a583 Parents: 0d82f10 Author: Aleksey Plekhanov <plehanov.a...@gmail.com> Authored: Mon Jul 16 16:25:16 2018 +0300 Committer: Dmitriy Pavlov <dpav...@apache.org> Committed: Mon Jul 16 16:25:16 2018 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/ServerImpl.java | 3 ++- .../IgniteStandByClusterTest.java | 21 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/84a7b595/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 50bb383..8c8f857 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -4355,7 +4355,8 @@ class ServerImpl extends TcpDiscoveryImpl { if (dataPacket.hasJoiningNodeData()) spi.onExchange(dataPacket, U.resolveClassLoader(spi.ignite().configuration())); - spi.collectExchangeData(dataPacket); + if (!node.isDaemon()) + spi.collectExchangeData(dataPacket); processMessageFailedNodes(msg); } http://git-wip-us.apache.org/repos/asf/ignite/blob/84a7b595/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteStandByClusterTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteStandByClusterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteStandByClusterTest.java index 1427e70..6900af8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteStandByClusterTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteStandByClusterTest.java @@ -256,6 +256,27 @@ public class IgniteStandByClusterTest extends GridCommonAbstractTest { } /** + * Check that daemon node does not move cluster to compatibility mode. + */ + public void testJoinDaemonToBaseline() throws Exception { + Ignite ignite0 = startGrid(0); + + startGrid(1); + + ignite0.cluster().active(true); + + startGrid( + getConfiguration("daemon") + .setDaemon(true) + .setClientMode(true) + ); + + stopGrid(1); + + startGrid(1); + } + + /** * @throws Exception if fail. */ public void testCheckStatusFromDaemon() throws Exception {
