Repository: ignite Updated Branches: refs/heads/ignite-zk 1ccbac03c -> beada20fa
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/beada20f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/beada20f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/beada20f Branch: refs/heads/ignite-zk Commit: beada20fa90b8ee533a1c8372f0b853adc6ccb0a Parents: 1ccbac0 Author: sboikov <[email protected]> Authored: Mon Nov 27 16:38:20 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Nov 27 16:38:20 2017 +0300 ---------------------------------------------------------------------- .../cluster/ClusterMetricsUpdateMessage.java | 3 +++ .../processors/cluster/ClusterNodeMetrics.java | 3 +++ .../discovery/zk/internal/ZookeeperDiscoveryImpl.java | 14 ++++++++++++++ 3 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/beada20f/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java index f6db706..c990fc5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java @@ -34,6 +34,9 @@ import org.jetbrains.annotations.Nullable; */ public class ClusterMetricsUpdateMessage implements Message { /** */ + private static final long serialVersionUID = 0L; + + /** */ private byte[] nodeMetrics; /** */ http://git-wip-us.apache.org/repos/asf/ignite/blob/beada20f/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterNodeMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterNodeMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterNodeMetrics.java index 75a83a5..22a385f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterNodeMetrics.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterNodeMetrics.java @@ -29,6 +29,9 @@ import org.apache.ignite.internal.ClusterMetricsSnapshot; */ class ClusterNodeMetrics implements Serializable { /** */ + private static final long serialVersionUID = 0L; + + /** */ private final byte[] metrics; /** */ http://git-wip-us.apache.org/repos/asf/ignite/blob/beada20f/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java index a08e879..f742ad0 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java @@ -799,6 +799,9 @@ public class ZookeeperDiscoveryImpl { evtWorker.evtsQ.add(new Runnable() { @Override public void run() { + if (connState == ConnectionState.DISCONNECTED) + connState = ConnectionState.STARTED; + lsnr.onDiscovery(EventType.EVT_NODE_JOINED, 1L, locNode, @@ -806,6 +809,17 @@ public class ZookeeperDiscoveryImpl { Collections.<Long, Collection<ClusterNode>>emptyMap(), null); + if (state.prevJoined) { + lsnr.onDiscovery(EVT_CLIENT_NODE_RECONNECTED, + 1L, + locNode, + topSnapshot, + Collections.<Long, Collection<ClusterNode>>emptyMap(), + null); + + U.quietAndWarn(log, "Client node was reconnected after it was already considered failed."); + } + joinFut.onDone(); } });
