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 6DD37200CA8 for ; Wed, 31 May 2017 14:47:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6C984160BBA; Wed, 31 May 2017 12:47:13 +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 B38AE160BEA for ; Wed, 31 May 2017 14:47:12 +0200 (CEST) Received: (qmail 97326 invoked by uid 500); 31 May 2017 12:47:11 -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 97133 invoked by uid 99); 31 May 2017 12:47:11 -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; Wed, 31 May 2017 12:47:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B5B01E382D; Wed, 31 May 2017 12:47:11 +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: Wed, 31 May 2017 12:47:23 -0000 Message-Id: <63223ee2c4ab450b95ab06cbbd5f0a4a@git.apache.org> In-Reply-To: <2f41acee39044eeeb02298e2afd8c31c@git.apache.org> References: <2f41acee39044eeeb02298e2afd8c31c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/13] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-5075 archived-at: Wed, 31 May 2017 12:47:13 -0000 Merge remote-tracking branch 'remotes/origin/master' into ignite-5075 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java # modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java # modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4ef76013 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ef76013 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ef76013 Branch: refs/heads/ignite-5075 Commit: 4ef76013b161ed6f238fd79a48d4986896eaf81b Parents: d429c3e Author: sboikov Authored: Wed May 31 15:47:00 2017 +0300 Committer: sboikov Committed: Wed May 31 15:47:00 2017 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionDemander.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4ef76013/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java index 78da020..c4c628f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java @@ -395,7 +395,7 @@ public class GridDhtPartitionDemander { Collection parts= e.getValue().partitions(); - assert parts != null : "Partitions are null [grp=" + grp.name() + ", fromNode=" + nodeId + "]"; + assert parts != null : "Partitions are null [grp=" + grp.cacheOrGroupName() + ", fromNode=" + nodeId + "]"; fut.remaining.put(nodeId, new T2<>(U.currentTimeMillis(), parts)); } @@ -439,14 +439,14 @@ public class GridDhtPartitionDemander { final int finalCnt = cnt; - cctx.kernalContext().closure().runLocalSafe(new Runnable() { -@Override public void run() { - try { + ctx.kernalContext().closure().runLocalSafe(new Runnable() { + @Override public void run() { + try { if (!fut.isDone()) { - ctx.io().sendOrderedMessage(node, - rebalanceTopics.get(finalCnt), initD, grp.ioPolicy(), initD.timeout()); + ctx.io().sendOrderedMessage(node, + rebalanceTopics.get(finalCnt), initD, grp.ioPolicy(), initD.timeout()); -// Cleanup required in case partitions demanded in parallel with cancellation. + // Cleanup required in case partitions demanded in parallel with cancellation. synchronized (fut) { if (fut.isDone()) fut.cleanupRemoteContexts(node.id());