Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C8C04200CC3 for ; Sat, 10 Jun 2017 08:20:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C7847160BD4; Sat, 10 Jun 2017 06:20:37 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CF6FE160BED for ; Sat, 10 Jun 2017 08:20:36 +0200 (CEST) Received: (qmail 33421 invoked by uid 500); 10 Jun 2017 06:20:36 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 32918 invoked by uid 99); 10 Jun 2017 06:20:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Jun 2017 06:20:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 36900F4A48; Sat, 10 Jun 2017 06:20:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Sat, 10 Jun 2017 06:20:50 -0000 Message-Id: In-Reply-To: <41101d210221411aa053e09cda13646e@git.apache.org> References: <41101d210221411aa053e09cda13646e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [19/19] ignite git commit: ignite-5155 archived-at: Sat, 10 Jun 2017 06:20:37 -0000 ignite-5155 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b1d2c7ad Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b1d2c7ad Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b1d2c7ad Branch: refs/heads/ignite-5155 Commit: b1d2c7ad4998f7d8f9f58e9cc3f6ad18a39f4910 Parents: 3688a40 Author: sboikov Authored: Sat Jun 10 09:08:52 2017 +0300 Committer: sboikov Committed: Sat Jun 10 09:08:52 2017 +0300 ---------------------------------------------------------------------- .../core/src/main/java/org/apache/ignite/internal/GridTopic.java | 1 + .../ignite/internal/processors/cache/GridCacheIoManager.java | 2 -- .../processors/cache/GridCachePartitionExchangeManager.java | 3 ++- .../internal/processors/cache/GridCacheSharedManagerAdapter.java | 1 - .../ignite/internal/processors/cluster/ClusterProcessor.java | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b1d2c7ad/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java index ab2d572..abdbf95 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java @@ -96,6 +96,7 @@ public enum GridTopic { /** */ TOPIC_TX, + /** */ TOPIC_SNAPSHOT, /** */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b1d2c7ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index 0fe1a7f..946d256 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@ -20,12 +20,10 @@ package org.apache.ignite.internal.processors.cache; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; http://git-wip-us.apache.org/repos/asf/ignite/blob/b1d2c7ad/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 ef21bf1..fdf8a2f 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 @@ -1623,7 +1623,8 @@ public class GridCachePartitionExchangeManager extends GridCacheSharedMana } /** - * Logs the future and dumps diagnostic info if needed. + * Logs the future and add diagnostic info closure. + * * @param fut Future. * @param ctx Diagnostic prepare context. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b1d2c7ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedManagerAdapter.java index 8ae8679..c98a8f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedManagerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedManagerAdapter.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; -import org.apache.ignite.IgniteSystemProperties; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteFuture; http://git-wip-us.apache.org/repos/asf/ignite/blob/b1d2c7ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java index b32a325..ad29254 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java @@ -372,7 +372,7 @@ public class ClusterProcessor extends GridProcessorAdapter { } /** - * Send diagnostic message closure to remote node. When response received dumps + * Sends diagnostic message closure to remote node. When response received dumps * remote message and local communication info about connection(s) with remote node. * * @param nodeId Target node ID.