Repository: ignite Updated Branches: refs/heads/master cbbd9ad4a -> 2c97f7316
IGNITE-9834 Cancel tcp-client-disco-msg-worker in normal order after validation error - Fixes #4939. Signed-off-by: Alexey Goncharuk <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2c97f731 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2c97f731 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2c97f731 Branch: refs/heads/master Commit: 2c97f731662ff6db3f4e71e82eb2f0794a7496f7 Parents: cbbd9ad Author: Alexey Platonov <[email protected]> Authored: Thu Oct 11 13:01:07 2018 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Thu Oct 11 13:02:15 2018 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2c97f731/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java index 3b57457..d3a8b18 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java @@ -1884,6 +1884,7 @@ class ClientImpl extends TcpDiscoveryImpl { err = spi.duplicateIdError((TcpDiscoveryDuplicateIdMessage)msg); else if (discoMsg instanceof TcpDiscoveryAuthFailedMessage) err = spi.authenticationFailedError((TcpDiscoveryAuthFailedMessage)msg); + //TODO: https://issues.apache.org/jira/browse/IGNITE-9829 else if (discoMsg instanceof TcpDiscoveryCheckFailedMessage) err = spi.checkFailedError((TcpDiscoveryCheckFailedMessage)msg); @@ -1898,6 +1899,8 @@ class ClientImpl extends TcpDiscoveryImpl { else joinError(err); + cancel(); + break; } }
