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 76CD3200BD3 for ; Tue, 1 Nov 2016 03:37:25 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7583F160B05; Tue, 1 Nov 2016 02:37:25 +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 27C37160B2A for ; Tue, 1 Nov 2016 03:37:22 +0100 (CET) Received: (qmail 35644 invoked by uid 500); 1 Nov 2016 02:37:22 -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 34669 invoked by uid 99); 1 Nov 2016 02:37:21 -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; Tue, 01 Nov 2016 02:37:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AF511F170D; Tue, 1 Nov 2016 02:37:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shroman@apache.org To: commits@ignite.apache.org Date: Tue, 01 Nov 2016 02:38:04 -0000 Message-Id: In-Reply-To: <58ea4a590a9e4d1c9109181957ebbad1@git.apache.org> References: <58ea4a590a9e4d1c9109181957ebbad1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [45/50] [abbrv] ignite git commit: IGNITE-1384 Fixed archived-at: Tue, 01 Nov 2016 02:37:25 -0000 IGNITE-1384 Fixed Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6d75fe6b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6d75fe6b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6d75fe6b Branch: refs/heads/ignite-2788 Commit: 6d75fe6b8a22ef48eb0a7265234e690a693ea6d2 Parents: 6e1d45e Author: Yakov Zhdanov Authored: Fri Apr 29 14:46:41 2016 +0300 Committer: shtykh_roman Committed: Fri May 13 16:11:16 2016 +0900 ---------------------------------------------------------------------- .../processors/task/GridTaskWorker.java | 2 +- .../java/org/apache/ignite/lang/IgniteUuid.java | 2 +- .../internal/GridTaskExecutionSelfTest.java | 76 +++++++++++++++++++- 3 files changed, 77 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6d75fe6b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java index 659d5a6..05970ed 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java @@ -558,7 +558,7 @@ class GridTaskWorker extends GridWorker implements GridTimeoutObject { if (node == null) throw new IgniteCheckedException("Node can not be null [mappedJob=" + mappedJob + ", ses=" + ses + ']'); - IgniteUuid jobId = IgniteUuid.fromUuid(node.id()); + IgniteUuid jobId = IgniteUuid.fromUuid(ctx.localNodeId()); GridJobSiblingImpl sib = new GridJobSiblingImpl(ses.getId(), jobId, node.id(), ctx); http://git-wip-us.apache.org/repos/asf/ignite/blob/6d75fe6b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java index 5c6bb9a..7de389e 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java @@ -216,4 +216,4 @@ public final class IgniteUuid implements Comparable, Iterable> futs = new ArrayList<>(2016); + + IgniteCompute compute = grid(1).compute(grid(1).cluster().forNodeId(grid(3).localNode().id())).withAsync(); + + for (int i = 0; i < 1000; i++) { + compute.call(new IgniteCallable() { + @JobContextResource + ComputeJobContext ctx; + + boolean held; + + @Override public Object call() throws Exception { + if (!held) { + ctx.holdcc(1000); + + held = true; + } + + return null; + } + }); + + futs.add(compute.future()); + } + + info("Finished first loop."); + + AtomicLong idx = U.field(IgniteUuid.class, "cntGen"); + + idx.set(locId); + + IgniteCompute compute1 = grid(2).compute(grid(2).cluster().forNodeId(grid(3).localNode().id())).withAsync(); + + for (int i = 0; i < 100; i++) { + compute1.call(new IgniteCallable() { + @JobContextResource + ComputeJobContext ctx; + + boolean held; + + @Override public Object call() throws Exception { + if (!held) { + ctx.holdcc(1000); + + held = true; + } + + return null; + } + }); + + futs.add(compute1.future()); + } + + for (IgniteFuture fut : futs) + fut.get(); + } +}