Repository: ignite Updated Branches: refs/heads/ignite-zk 8ab3b5667 -> 73f5af60c
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3736abe2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3736abe2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3736abe2 Branch: refs/heads/ignite-zk Commit: 3736abe27a080ac7962dd8ede9e7b7414c4a82ae Parents: 8ab3b56 Author: sboikov <[email protected]> Authored: Tue Nov 14 14:14:25 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Nov 14 14:14:25 2017 +0300 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 5 ++- .../GridDhtPartitionsExchangeFuture.java | 3 +- .../spi/discovery/zk/ZookeeperClusterNode.java | 15 ++++++++- .../spi/discovery/zk/ZookeeperDiscoverySpi.java | 32 ++++++++++++++------ .../zk/ZookeeperDiscoverySpiBasicTest.java | 6 +++- 5 files changed, 45 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3736abe2/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 022dc97..a6737dc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -2522,9 +2522,8 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { switch (type) { case EVT_NODE_JOINED: { -// TODO ZK -// assert !discoOrdered || topVer.topologyVersion() == node.order() : "Invalid topology version [topVer=" + topVer + -// ", node=" + node + ']'; + assert !discoOrdered || topVer.topologyVersion() == node.order() : "Invalid topology version [topVer=" + topVer + + ", node=" + node + ']'; try { checkAttributes(F.asList(node)); http://git-wip-us.apache.org/repos/asf/ignite/blob/3736abe2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 5d9186b..d29293e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -1598,8 +1598,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte mergedJoinExchMsgs = new LinkedHashMap<>(); if (msg != null) { - // TODO ZK - // assert msg.exchangeId().topologyVersion().equals(new AffinityTopologyVersion(node.order())); + assert msg.exchangeId().topologyVersion().equals(new AffinityTopologyVersion(node.order())); if (log.isInfoEnabled()) { log.info("Merge server join exchange, message received [curFut=" + initialVersion() + http://git-wip-us.apache.org/repos/asf/ignite/blob/3736abe2/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperClusterNode.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperClusterNode.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperClusterNode.java index dc0f374..ae638b8 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperClusterNode.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperClusterNode.java @@ -47,6 +47,9 @@ public class ZookeeperClusterNode implements ClusterNode, Serializable { private Serializable consistentId; /** */ + private long internalOrder; + + /** */ private long order; /** */ @@ -154,9 +157,19 @@ public class ZookeeperClusterNode implements ClusterNode, Serializable { return order; } + public long internalOrder() { + return internalOrder; + } + /** - * @param order Order of the node. + * @param internalOrder Order of the node. */ + public void internalOrder(long internalOrder) { + assert internalOrder > 0 : internalOrder; + + this.internalOrder = internalOrder; + } + public void order(long order) { assert order > 0 : order; http://git-wip-us.apache.org/repos/asf/ignite/blob/3736abe2/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java index ce04d33..bae183d 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java @@ -380,12 +380,18 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery zkCurator.getCuratorListenable().addListener(new CuratorListener() { @Override public void eventReceived(CuratorFramework client, CuratorEvent evt) throws Exception { - log.info("Curator event: " + evt.getType()); + IgniteLogger log = ZookeeperDiscoverySpi.this.log; + + if (log != null) + log.info("Curator event: " + evt.getType()); } }); zkCurator.getConnectionStateListenable().addListener(new ConnectionStateListener() { @Override public void stateChanged(CuratorFramework client, ConnectionState newState) { - log.info("Curator event, connection: " + newState); + IgniteLogger log = ZookeeperDiscoverySpi.this.log; + + if (log != null) + log.info("Curator event, connection: " + newState); } }); @@ -644,7 +650,7 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery assert joinData != null && joinData.node != null && joinData.joiningNodeData != null : joinData; - joinData.node.order(data.order); + joinData.node.internalOrder(data.order); data.joinData = joinData; } @@ -823,7 +829,9 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery ZKJoiningNodeData joinData = joined.joinData; synchronized (curTop) { - curTop.put(joinData.node.order(), joinData.node); + joinData.node.order(v); + + curTop.put(joinData.node.internalOrder(), joinData.node); ZKDiscoveryEvent joinEvt = new ZKDiscoveryEvent(EventType.EVT_NODE_JOINED, v, @@ -963,6 +971,9 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery locJoin = e.evtType == EventType.EVT_NODE_JOINED && e.node.id().equals(locNode.id()); if (locJoin) { + assert e.node.order() > 0 && e.node.internalOrder() > 0 : e.node; + + locNode.internalOrder(e.node.internalOrder()); locNode.order(e.node.order()); fireEvt = true; @@ -980,9 +991,9 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery synchronized (curTop) { if (locJoin) { for (ZookeeperClusterNode node : e.allNodes) { - assert node.order() > 0 : node; + assert node.internalOrder() > 0 : node; - Object old = curTop.put(node.order(), node); + Object old = curTop.put(node.internalOrder(), node); assert old == null : node; } @@ -1006,7 +1017,7 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery exchange.onExchange(dataBag); - Object old = curTop.put(node.order(), node); + Object old = curTop.put(node.internalOrder(), node); assert old == null : node; @@ -1016,7 +1027,7 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery case EventType.EVT_NODE_FAILED: { ZookeeperClusterNode node = e.node; - Object failedNode = curTop.remove(node.order()); + Object failedNode = curTop.remove(node.internalOrder()); assert failedNode != null : node; @@ -1160,7 +1171,10 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery private class ZookeeperWatcher implements Watcher { /** {@inheritDoc} */ @Override public void process(WatchedEvent event) { - log.info("Process event [type=" + event.getType() + ", state=" + event.getState() + ", path=" + event.getPath() + ']'); + IgniteLogger log = ZookeeperDiscoverySpi.this.log; + + if (log != null) + log.info("Process event [type=" + event.getType() + ", state=" + event.getState() + ", path=" + event.getPath() + ']'); if (event.getType() == Event.EventType.NodeChildrenChanged) { zk.getChildren(event.getPath(), this, nodesUpdateCallback, null); http://git-wip-us.apache.org/repos/asf/ignite/blob/3736abe2/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiBasicTest.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiBasicTest.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiBasicTest.java index dfb2199..b4db065 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiBasicTest.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiBasicTest.java @@ -78,6 +78,9 @@ public class ZookeeperDiscoverySpiBasicTest extends GridCommonAbstractTest { private boolean testSockNio; /** */ + private int sesTimeout; + + /** */ private ConcurrentHashMap<String, ZookeeperDiscoverySpi> spis = new ConcurrentHashMap<>(); /** {@inheritDoc} */ @@ -91,7 +94,7 @@ public class ZookeeperDiscoverySpiBasicTest extends GridCommonAbstractTest { ZookeeperDiscoverySpi zkSpi = new ZookeeperDiscoverySpi(); - zkSpi.setSessionTimeout(10_000); + zkSpi.setSessionTimeout(sesTimeout > 0 ? sesTimeout : 10_000); spis.put(igniteInstanceName, zkSpi); @@ -386,6 +389,7 @@ public class ZookeeperDiscoverySpiBasicTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private void connectionRestore_Coordinator(int initNodes, int startNodes, int failCnt) throws Exception { + sesTimeout = 30_000; testSockNio = true; Ignite node0 = startGrids(initNodes);
