subject:"\[5\/5\] ignite git commit\: zk"

[5/5] ignite git commit: zk

2017-12-07 Thread sboikov

zk


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f50c7ccb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f50c7ccb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f50c7ccb

Branch: refs/heads/ignite-zk
Commit: f50c7ccb5e80731426446c2051231fd55c912d23
Parents: c0dfb20
Author: sboikov 
Authored: Thu Dec 7 13:49:16 2017 +0300
Committer: sboikov 
Committed: Thu Dec 7 15:49:31 2017 +0300

--
 .../GridCachePartitionExchangeManager.java  |  2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |  7 +
 .../spi/discovery/zk/ZookeeperDiscoverySpi.java | 32 +---
 .../discovery/zk/internal/ZookeeperClient.java  |  4 ++-
 .../zk/internal/ZookeeperDiscoveryImpl.java |  5 +--
 .../ignite/internal/GridDiscoverySelfTest.java  |  5 +--
 .../internal/GridSameVmStartupSelfTest.java | 19 +---
 .../binary/BinaryMetadataUpdatesFlowTest.java   |  6 
 8 files changed, 64 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f50c7ccb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 30d3d26..4f481fe 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -413,7 +413,7 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 if (evt.type() != EVT_DISCOVERY_CUSTOM_EVT) {
 assert evt.type() != EVT_NODE_JOINED || n.isLocal() || n.order() > 
loc.order() :
 "Node joined with smaller-than-local " +
-"order [newOrder=" + n.order() + ", locOrder=" + 
loc.order() + ']';
+"order [newOrder=" + n.order() + ", locOrder=" + 
loc.order() + ", evt=" + evt + ']';
 
 exchId = exchangeId(n.id(), affinityTopologyVersion(evt), evt);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f50c7ccb/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 662a2b9..e03e2cf 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -2100,6 +2100,13 @@ public class TcpCommunicationSpi extends 
IgniteSpiAdapter implements Communicati
 }
 }
 
+/**
+ * @return Bound TCP server port.
+ */
+public int boundPort() {
+return boundTcpPort;
+}
+
 /** {@inheritDoc} */
 @Override public void spiStart(String igniteInstanceName) throws 
IgniteSpiException {
 assert locHost != null;

http://git-wip-us.apache.org/repos/asf/ignite/blob/f50c7ccb/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
index bd7f427..b9c2431 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
@@ -32,6 +32,7 @@ import 
org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpi;
 import 
org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpiInternalListener;
 import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.A;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteBiTuple;
@@ -42,6 +43,7 @@ import org.apache.ignite.spi.IgniteSpiConfiguration;
 import org.apache.ignite.spi.IgniteSpiContext;
 import org.apache.ignite.spi.IgniteSpiException;
 import

[5/5] ignite git commit: zk

2017-11-22 Thread sboikov

zk


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/42bbed0a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/42bbed0a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/42bbed0a

Branch: refs/heads/ignite-zk
Commit: 42bbed0adda149acb098fddfc830bcea768697d7
Parents: 8bd1e07
Author: sboikov 
Authored: Wed Nov 22 17:08:56 2017 +0300
Committer: sboikov 
Committed: Wed Nov 22 17:30:35 2017 +0300

--
 modules/core/pom.xml|   15 +
 .../spi/discovery/zk/ZookeeperDiscoverySpi.java |  313 
 .../discovery/zk/internal/ZkAliveNodeData.java  |   37 +
 .../discovery/zk/internal/ZkClusterNodes.java   |   92 ++
 .../zk/internal/ZkDiscoveryCustomEventData.java |   72 +
 .../zk/internal/ZkDiscoveryEventData.java   |  110 ++
 .../zk/internal/ZkDiscoveryEventsData.java  |   67 +
 .../internal/ZkDiscoveryNodeFailEventData.java  |   51 +
 .../internal/ZkDiscoveryNodeJoinEventData.java  |   53 +
 .../discovery/zk/internal/ZkEventAckFuture.java |  142 ++
 .../discovery/zk/internal/ZkIgnitePaths.java|  222 +++
 .../zk/internal/ZkJoinEventDataForJoined.java   |   53 +
 .../zk/internal/ZkJoiningNodeData.java  |   61 +
 .../discovery/zk/internal/ZookeeperClient.java  |  816 ++
 .../ZookeeperClientFailedException.java |   30 +
 .../zk/internal/ZookeeperClusterNode.java   |  239 +++
 .../zk/internal/ZookeeperDiscoveryImpl.java | 1454 +
 .../zk/internal/ZookeeperClientTest.java|  404 +
 .../ZookeeperDiscoverySpiBasicTest.java |  994 
 .../testframework/junits/GridAbstractTest.java  |   24 +
 .../zookeeper/ZkTestClientCnxnSocketNIO.java|  131 ++
 .../spi/discovery/zk/ZookeeperDiscoverySpi.java |  293 
 .../discovery/zk/internal/ZkAliveNodeData.java  |   37 -
 .../discovery/zk/internal/ZkClusterNodes.java   |   92 --
 .../zk/internal/ZkDiscoveryCustomEventData.java |   72 -
 .../zk/internal/ZkDiscoveryEventData.java   |  110 --
 .../zk/internal/ZkDiscoveryEventsData.java  |   67 -
 .../internal/ZkDiscoveryNodeFailEventData.java  |   51 -
 .../internal/ZkDiscoveryNodeJoinEventData.java  |   53 -
 .../discovery/zk/internal/ZkEventAckFuture.java |  142 --
 .../discovery/zk/internal/ZkIgnitePaths.java|  137 --
 .../zk/internal/ZkJoinEventDataForJoined.java   |   53 -
 .../zk/internal/ZkJoiningNodeData.java  |   61 -
 .../discovery/zk/internal/ZookeeperClient.java  |  816 --
 .../ZookeeperClientFailedException.java |   30 -
 .../zk/internal/ZookeeperClusterNode.java   |  224 ---
 .../zk/internal/ZookeeperDiscoveryImpl.java | 1455 --
 .../zk/internal/ZookeeperClientTest.java|  404 -
 .../ZookeeperDiscoverySpiBasicTest.java |  994 
 .../zookeeper/ZkTestClientCnxnSocketNIO.java|  131 --
 40 files changed, 5380 insertions(+), 5222 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/42bbed0a/modules/core/pom.xml
--
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 622e076..34e6327 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -74,6 +74,21 @@
 ${jetbrains.annotations.version}
 
 
+
+
+org.apache.zookeeper
+zookeeper
+${zookeeper.version}
+
+
+
+org.apache.curator
+curator-test
+${curator.version}
+test
+
+
+
 
 mx4j
 mx4j-tools

http://git-wip-us.apache.org/repos/asf/ignite/blob/42bbed0a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
new file mode 100644
index 000..ab59dc4
--- /dev/null
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
@@ -0,0 +1,313 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ *

[5/5] ignite git commit: zk

2017-11-15 Thread sboikov

zk


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4ec75fa2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ec75fa2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ec75fa2

Branch: refs/heads/ignite-zk
Commit: 4ec75fa2900e3f4624d6516e0c50fc1877d7b5cc
Parents: aa0ca90
Author: sboikov 
Authored: Wed Nov 15 13:12:26 2017 +0300
Committer: sboikov 
Committed: Wed Nov 15 13:12:26 2017 +0300

--
 .../ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java  | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/4ec75fa2/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 cee9e65..6488a6f 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
@@ -315,12 +315,12 @@ public class ZookeeperDiscoverySpi extends 
IgniteSpiAdapter implements Discovery
 /** {@inheritDoc} */
 @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) 
throws IgniteException {
 // TODO ZK
-try {
-
zkCurator.create().withMode(CreateMode.PERSISTENT_SEQUENTIAL).forPath(CUSTOM_EVTS_PATH,
 marshal(msg));
-}
-catch (Exception e) {
-throw new IgniteSpiException(e);
-}
+//try {
+//
zkCurator.create().withMode(CreateMode.PERSISTENT_SEQUENTIAL).forPath(CUSTOM_EVTS_PATH,
 marshal(msg));
+//}
+//catch (Exception e) {
+//throw new IgniteSpiException(e);
+//}
 }
 
 /** {@inheritDoc} */

[5/5] ignite git commit: zk

[5/5] ignite git commit: zk

[5/5] ignite git commit: zk

3 matches

Site Navigation

Mail list logo

Footer information