zk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/308bef23 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/308bef23 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/308bef23 Branch: refs/heads/ignite-zk Commit: 308bef23b9fc7dbbc10b201e8ef065abb99b92cc Parents: cf95cb5 Author: sboikov <[email protected]> Authored: Fri Dec 29 14:51:47 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Dec 29 14:51:47 2017 +0300 ---------------------------------------------------------------------- .../jdbc2/JdbcAbstractDmlStatementSelfTest.java | 6 +++-- .../zk/internal/ZkDiscoveryCustomEventData.java | 3 +-- .../zk/internal/ZkDiscoveryEventData.java | 23 +++++++++-------- .../internal/ZkDiscoveryNodeFailEventData.java | 4 +-- .../internal/ZkDiscoveryNodeJoinEventData.java | 3 +-- .../zk/internal/ZookeeperDiscoveryImpl.java | 27 ++++++++++---------- 6 files changed, 34 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/308bef23/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java index f220b47..ce65828 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java @@ -138,8 +138,10 @@ public abstract class JdbcAbstractDmlStatementSelfTest extends GridCommonAbstrac @Override protected void afterTest() throws Exception { ((IgniteEx)ignite(0)).context().cache().dynamicDestroyCache(DEFAULT_CACHE_NAME, true, true, false); - conn.close(); - assertTrue(conn.isClosed()); + if (conn != null) { + conn.close(); + assertTrue(conn.isClosed()); + } cleanUpWorkingDir(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/308bef23/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryCustomEventData.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryCustomEventData.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryCustomEventData.java index ec55682..21dfe62 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryCustomEventData.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryCustomEventData.java @@ -18,7 +18,6 @@ package org.apache.ignite.spi.discovery.zk.internal; import java.util.UUID; -import org.apache.ignite.internal.events.DiscoveryCustomEvent; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; @@ -60,7 +59,7 @@ class ZkDiscoveryCustomEventData extends ZkDiscoveryEventData { DiscoverySpiCustomMessage msg, String evtPath) { - super(evtId, DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT, topVer); + super(evtId, ZK_EVT_CUSTOM_EVT, topVer); assert sndNodeId != null; assert msg != null || origEvtId != 0 || !F.isEmpty(evtPath); http://git-wip-us.apache.org/repos/asf/ignite/blob/308bef23/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryEventData.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryEventData.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryEventData.java index 7216f39..d667a17 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryEventData.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryEventData.java @@ -20,26 +20,29 @@ package org.apache.ignite.spi.discovery.zk.internal; import java.io.Serializable; import java.util.Collection; import java.util.Set; -import java.util.TreeMap; import org.apache.ignite.internal.util.typedef.internal.U; -import org.jetbrains.annotations.Nullable; - -import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; -import static org.apache.ignite.events.EventType.EVT_NODE_JOINED; -import static org.apache.ignite.internal.events.DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT; /** * */ abstract class ZkDiscoveryEventData implements Serializable { /** */ + static final byte ZK_EVT_NODE_JOIN = 1; + + /** */ + static final byte ZK_EVT_NODE_FAILED = 2; + + /** */ + static final byte ZK_EVT_CUSTOM_EVT = 3; + + /** */ private static final long serialVersionUID = 0L; /** */ private final long evtId; /** */ - private final int evtType; + private final byte evtType; /** */ private final long topVer; @@ -55,8 +58,8 @@ abstract class ZkDiscoveryEventData implements Serializable { * @param evtType Event type. * @param topVer Topology version. */ - ZkDiscoveryEventData(long evtId, int evtType, long topVer) { - assert evtType == EVT_NODE_JOINED || evtType == EVT_NODE_FAILED || evtType == EVT_DISCOVERY_CUSTOM_EVT : evtType; + ZkDiscoveryEventData(long evtId, byte evtType, long topVer) { + assert evtType == ZK_EVT_NODE_JOIN || evtType == ZK_EVT_NODE_FAILED || evtType == ZK_EVT_CUSTOM_EVT : evtType; this.evtId = evtId; this.evtType = evtType; @@ -149,7 +152,7 @@ abstract class ZkDiscoveryEventData implements Serializable { /** * @return Event type. */ - int eventType() { + byte eventType() { return evtType; } http://git-wip-us.apache.org/repos/asf/ignite/blob/308bef23/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryNodeFailEventData.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryNodeFailEventData.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryNodeFailEventData.java index b75cb7c..c76158f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryNodeFailEventData.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryNodeFailEventData.java @@ -17,8 +17,6 @@ package org.apache.ignite.spi.discovery.zk.internal; -import org.apache.ignite.events.EventType; - /** * */ @@ -35,7 +33,7 @@ class ZkDiscoveryNodeFailEventData extends ZkDiscoveryEventData { * @param failedNodeInternalId Failed node ID. */ ZkDiscoveryNodeFailEventData(long evtId, long topVer, long failedNodeInternalId) { - super(evtId, EventType.EVT_NODE_FAILED, topVer); + super(evtId, ZK_EVT_NODE_FAILED, topVer); this.failedNodeInternalId = failedNodeInternalId; } http://git-wip-us.apache.org/repos/asf/ignite/blob/308bef23/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryNodeJoinEventData.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryNodeJoinEventData.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryNodeJoinEventData.java index 93341d6..ff75d22 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryNodeJoinEventData.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryNodeJoinEventData.java @@ -18,7 +18,6 @@ package org.apache.ignite.spi.discovery.zk.internal; import java.util.UUID; -import org.apache.ignite.events.EventType; /** * @@ -67,7 +66,7 @@ class ZkDiscoveryNodeJoinEventData extends ZkDiscoveryEventData { int dataForJoinedPartCnt, int secSubjPartCnt) { - super(evtId, EventType.EVT_NODE_JOINED, topVer); + super(evtId, ZK_EVT_NODE_JOIN, topVer); this.nodeId = nodeId; this.joinedInternalId = joinedInternalId; http://git-wip-us.apache.org/repos/asf/ignite/blob/308bef23/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 ffade09..10755ad 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 @@ -92,6 +92,7 @@ import org.jetbrains.annotations.Nullable; import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED; import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_RECONNECTED; import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; +import static org.apache.ignite.events.EventType.EVT_NODE_JOINED; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IGNITE_INSTANCE_NAME; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SECURITY_SUBJECT_V2; @@ -2426,7 +2427,7 @@ public class ZookeeperDiscoveryImpl { for (Map.Entry<Long, ZkDiscoveryEventData> e : rtState.evtsData.evts.entrySet()) { ZkDiscoveryEventData evtData = e.getValue(); - if (evtData.eventType() == DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT) { + if (evtData.eventType() == ZkDiscoveryEventData.ZK_EVT_CUSTOM_EVT) { ZkDiscoveryCustomEventData evtData0 = (ZkDiscoveryCustomEventData)newEvts.evts.get(evtData.eventId()); @@ -2459,15 +2460,14 @@ public class ZookeeperDiscoveryImpl { for (ZkDiscoveryEventData evtData : evts.tailMap(rtState.locNodeInfo.lastProcEvt, false).values()) { if (!rtState.joined) { - if (evtData.eventType() != EventType.EVT_NODE_JOINED) + if (evtData.eventType() != ZkDiscoveryEventData.ZK_EVT_NODE_JOIN) continue; ZkDiscoveryNodeJoinEventData evtData0 = (ZkDiscoveryNodeJoinEventData)evtData; UUID joinedId = evtData0.nodeId; - boolean locJoin = evtData.eventType() == EventType.EVT_NODE_JOINED && - evtData0.joinedInternalId == rtState.internalOrder; + boolean locJoin = evtData0.joinedInternalId == rtState.internalOrder; if (locJoin) { assert locNode.id().equals(joinedId); @@ -2482,7 +2482,7 @@ public class ZookeeperDiscoveryImpl { log.debug("New discovery event data [evt=" + evtData + ", evtsHist=" + evts.size() + ']'); switch (evtData.eventType()) { - case EventType.EVT_NODE_JOINED: { + case ZkDiscoveryEventData.ZK_EVT_NODE_JOIN: { ZkDiscoveryNodeJoinEventData evtData0 = (ZkDiscoveryNodeJoinEventData)evtData; ZkJoiningNodeData joiningData; @@ -2510,13 +2510,13 @@ public class ZookeeperDiscoveryImpl { break; } - case EventType.EVT_NODE_FAILED: { + case ZkDiscoveryEventData.ZK_EVT_NODE_FAILED: { notifyNodeFail((ZkDiscoveryNodeFailEventData)evtData); break; } - case DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT: { + case ZkDiscoveryEventData.ZK_EVT_CUSTOM_EVT: { ZkDiscoveryCustomEventData evtData0 = (ZkDiscoveryCustomEventData)evtData; if (evtData0.ackEvent() && evtData0.topologyVersion() < locNode.order()) @@ -2742,7 +2742,7 @@ public class ZookeeperDiscoveryImpl { final List<ClusterNode> topSnapshot = rtState.top.topologySnapshot(); - lsnr.onDiscovery(evtData.eventType(), + lsnr.onDiscovery(EVT_NODE_JOINED, evtData.topologyVersion(), locNode, topSnapshot, @@ -3219,7 +3219,8 @@ public class ZookeeperDiscoveryImpl { final List<ClusterNode> topSnapshot = rtState.top.topologySnapshot(); - lsnr.onDiscovery(evtData.eventType(), + lsnr.onDiscovery( + DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT, evtData.topologyVersion(), sndNode, topSnapshot, @@ -3244,7 +3245,7 @@ public class ZookeeperDiscoveryImpl { final List<ClusterNode> topSnapshot = rtState.top.topologySnapshot(); - lsnr.onDiscovery(evtData.eventType(), + lsnr.onDiscovery(EVT_NODE_JOINED, evtData.topologyVersion(), joinedNode, topSnapshot, @@ -3354,13 +3355,13 @@ public class ZookeeperDiscoveryImpl { prevEvtData = null; switch (evtData.eventType()) { - case EventType.EVT_NODE_JOINED: { + case ZkDiscoveryEventData.ZK_EVT_NODE_JOIN: { handleProcessedJoinEventAsync((ZkDiscoveryNodeJoinEventData)evtData); break; } - case DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT: { + case ZkDiscoveryEventData.ZK_EVT_CUSTOM_EVT: { DiscoverySpiCustomMessage ack = handleProcessedCustomEvent(ctx, (ZkDiscoveryCustomEventData)evtData); @@ -3378,7 +3379,7 @@ public class ZookeeperDiscoveryImpl { break; } - case EventType.EVT_NODE_FAILED: { + case ZkDiscoveryEventData.ZK_EVT_NODE_FAILED: { if (log.isDebugEnabled()) log.debug("All nodes processed node fail [evtData=" + evtData + ']');
