Repository: ignite Updated Branches: refs/heads/master 5f568790a -> 0772a96f3
IGNITE-8508 Proper ordering of ZK discovery custom events ACKs Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0772a96f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0772a96f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0772a96f Branch: refs/heads/master Commit: 0772a96f363b7685da0f3735f1c559f1735e4a4c Parents: 5f56879 Author: Alexey Goncharuk <[email protected]> Authored: Wed May 16 15:25:51 2018 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Wed May 16 15:25:51 2018 +0300 ---------------------------------------------------------------------- .../spi/discovery/zk/internal/ZkDiscoveryEventsData.java | 11 +++++++++++ .../discovery/zk/internal/ZookeeperDiscoveryImpl.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0772a96f/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryEventsData.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryEventsData.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryEventsData.java index dce861b..6520b8c 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryEventsData.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryEventsData.java @@ -21,6 +21,8 @@ import java.io.Serializable; import java.util.Collection; import java.util.TreeMap; import java.util.UUID; + +import org.apache.ignite.internal.util.typedef.internal.S; import org.jetbrains.annotations.Nullable; /** @@ -118,4 +120,13 @@ class ZkDiscoveryEventsData implements Serializable { evt.initRemainingAcks(nodes); } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(ZkDiscoveryEventsData.class, this, + "topVer", topVer, + "evtIdGen", evtIdGen, + "procCustEvt", procCustEvt, + "evts", evts); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/0772a96f/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java index 0604458..43d6aeb 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java @@ -3658,7 +3658,7 @@ public class ZookeeperDiscoveryImpl { ZkDiscoveryCustomEventData ackEvtData = new ZkDiscoveryCustomEventData( evtId, origEvt.eventId(), - origEvt.topologyVersion(), // Use topology version from original event. + rtState.evtsData.topVer, // Use actual topology version because topology version must be growing. locNode.id(), null, null);
