# ignite-901
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f2c7f6f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f2c7f6f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f2c7f6f6 Branch: refs/heads/ignite-901 Commit: f2c7f6f60d0062c2849395333ad9db256eb94d4d Parents: 4d2b180 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jul 16 09:30:52 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jul 16 09:30:52 2015 +0300 ---------------------------------------------------------------------- .../managers/discovery/GridDiscoveryManager.java | 1 + .../internal/processors/cache/GridCacheProcessor.java | 3 +-- .../processors/datastructures/GridCacheQueueAdapter.java | 11 ----------- .../spi/communication/tcp/TcpCommunicationSpi.java | 6 +++--- .../org/apache/ignite/spi/discovery/tcp/ClientImpl.java | 11 ++++++----- .../spi/discovery/tcp/internal/TcpDiscoveryNode.java | 7 ------- 6 files changed, 11 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2c7f6f6/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 a95a200..9650307 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 @@ -1849,6 +1849,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { * @param topVer Topology version. * @param node Node. * @param topSnapshot Topology snapshot. + * @param data Custom message. */ void addEvent( int type, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2c7f6f6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 652b8cb..bda0485 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -792,8 +792,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { ctx.marshallerContext().onMarshallerCacheStarted(ctx); marshallerCache().context().preloader().syncFuture().listen(new CIX1<IgniteInternalFuture<?>>() { - @Override - public void applyx(IgniteInternalFuture<?> f) throws IgniteCheckedException { + @Override public void applyx(IgniteInternalFuture<?> f) throws IgniteCheckedException { ctx.marshallerContext().onMarshallerCachePreloaded(ctx); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2c7f6f6/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java index f62c4eb..9fd7356 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java @@ -106,17 +106,6 @@ public abstract class GridCacheQueueAdapter<T> extends AbstractCollection<T> imp writeSem = bounded() ? new Semaphore(hdr.capacity() - hdr.size(), true) : null; } - /** - * @return {@code True} if queue header found in cache. - * @throws IgniteCheckedException If failed. - */ - @SuppressWarnings("unchecked") - public boolean checkHeader() throws IgniteCheckedException { - GridCacheQueueHeader hdr = (GridCacheQueueHeader)cache.get(queueKey); - - return !queueRemoved(hdr, id); - } - /** {@inheritDoc} */ @Override public String name() { return queueName; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2c7f6f6/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 4bace29..2bce637 100644 --- 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 @@ -2264,7 +2264,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter ch.write(ByteBuffer.wrap(U.IGNITE_HEADER)); if (recovery != null) { - HandshakeMessage msg = new HandshakeMessage(getSpiContext().localNode().id(), + HandshakeMessage msg = new HandshakeMessage(getLocalNode().id(), recovery.incrementConnectCount(), recovery.receivedCount()); @@ -2415,7 +2415,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter * @return Node ID message. */ private NodeIdMessage nodeIdMessage() { - return new NodeIdMessage(getSpiContext().localNode().id()); + return new NodeIdMessage(getLocalNode().id()); } /** {@inheritDoc} */ @@ -2931,7 +2931,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter } try { - UUID id = getSpiContext().localNode().id(); + UUID id = getLocalNode().id(); NodeIdMessage msg = new NodeIdMessage(id); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2c7f6f6/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java index a294a3a..572ba2c 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java @@ -163,6 +163,9 @@ class ClientImpl extends TcpDiscoveryImpl { locNode = spi.locNode; + // Marshal credentials for backward compatibility and security. + marshalCredentials(locNode); + sockWriter = new SocketWriter(); sockWriter.start(); @@ -390,10 +393,6 @@ class ClientImpl extends TcpDiscoveryImpl { long startTime = U.currentTimeMillis(); - // Marshal credentials for backward compatibility and security. - if (!recon) - marshalCredentials(locNode); - while (true) { if (Thread.currentThread().isInterrupted()) throw new InterruptedException(); @@ -470,7 +469,7 @@ class ClientImpl extends TcpDiscoveryImpl { /** * @param recon {@code True} if reconnects. * @param addr Address. - * @return Socket, connect response and client acknowledge flag. + * @return Socket, connect response and client acknowledge support flag. */ @Nullable private T3<Socket, Integer, Boolean> sendJoinRequest(boolean recon, InetSocketAddress addr) { assert addr != null; @@ -1346,6 +1345,8 @@ class ClientImpl extends TcpDiscoveryImpl { if (err != null) { if (state == DISCONNECTED) { + U.error(log, "Failed to reconnect, segment local node.", err); + state = SEGMENTED; notifyDiscovery(EVT_NODE_SEGMENTED, topVer, locNode, allVisibleNodes()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2c7f6f6/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java index 6462370..032cf01 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java @@ -435,13 +435,6 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste } /** - * @return Metrics provider. - */ - public DiscoveryMetricsProvider metricsProvider() { - return metricsProvider; - } - - /** * @param clientRouterNodeId Client router node ID. */ public void clientRouterNodeId(UUID clientRouterNodeId) {
