You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2018/11/30 12:47:11 UTC
ignite git commit: IGNITE-10484 Fixed activate/deactivate hang -
Fixes #5534.
Repository: ignite
Updated Branches:
refs/heads/master bfe9283e9 -> 73f4f91f2
IGNITE-10484 Fixed activate/deactivate hang - Fixes #5534.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/73f4f91f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/73f4f91f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/73f4f91f
Branch: refs/heads/master
Commit: 73f4f91f2e7961bd243e5ad837eefba29533e63c
Parents: bfe9283
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Nov 30 15:46:21 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Nov 30 15:46:21 2018 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/internal/IgniteKernal.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/73f4f91f/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 284a4cb..faf46cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1088,6 +1088,14 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
IgniteInternalFuture<Boolean> transitionWaitFut = joinData.transitionWaitFuture();
+ // Notify discovery manager the first to make sure that topology is discovered.
+ // Active flag is not used in managers, so it is safe to pass true.
+ ctx.discovery().onKernalStart(true);
+
+ // Notify IO manager the second so further components can send and receive messages.
+ // Must notify the IO manager before transition state await to make sure IO connection can be established.
+ ctx.io().onKernalStart(true);
+
boolean active;
if (transitionWaitFut != null) {
@@ -1101,12 +1109,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
else
active = joinData.active();
- // Notify discovery manager the first to make sure that topology is discovered.
- ctx.discovery().onKernalStart(active);
-
- // Notify IO manager the second so further components can send and receive messages.
- ctx.io().onKernalStart(active);
-
boolean recon = false;
// Callbacks.