Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D035217F09 for ; Mon, 1 Jun 2015 22:19:47 +0000 (UTC) Received: (qmail 73383 invoked by uid 500); 1 Jun 2015 22:19:47 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 73353 invoked by uid 500); 1 Jun 2015 22:19:47 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 73344 invoked by uid 99); 1 Jun 2015 22:19:47 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2015 22:19:47 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id B26BA1A4250 for ; Mon, 1 Jun 2015 22:19:45 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.791 X-Spam-Level: X-Spam-Status: No, score=0.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id XeFS5s_PH4fv for ; Mon, 1 Jun 2015 22:19:31 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 8D94047C46 for ; Mon, 1 Jun 2015 22:19:16 +0000 (UTC) Received: (qmail 70225 invoked by uid 99); 1 Jun 2015 22:19:15 -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; Mon, 01 Jun 2015 22:19:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 26121E083A; Mon, 1 Jun 2015 22:19:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 01 Jun 2015 22:19:51 -0000 Message-Id: In-Reply-To: <2331b7ed2ccf46ad99699422a6f7ad50@git.apache.org> References: <2331b7ed2ccf46ad99699422a6f7ad50@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [39/50] [abbrv] incubator-ignite git commit: # ignite-943 # ignite-943 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6c837c07 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6c837c07 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6c837c07 Branch: refs/heads/ignite-389 Commit: 6c837c0783f04874157ac414f7161273c8c4d9f8 Parents: f499cfe Author: sboikov Authored: Fri May 29 23:43:25 2015 +0300 Committer: sboikov Committed: Fri May 29 23:43:25 2015 +0300 ---------------------------------------------------------------------- .../processors/service/GridServiceProcessor.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c837c07/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java index aedac75..8eff6bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java @@ -1101,11 +1101,12 @@ public class GridServiceProcessor extends GridProcessorAdapter { try { depExe.submit(new BusyRunnable() { @Override public void run0() { - long topVer = ((DiscoveryEvent)evt).topologyVersion(); + AffinityTopologyVersion topVer = + new AffinityTopologyVersion(((DiscoveryEvent)evt).topologyVersion()); - ClusterNode oldest = U.oldest(ctx.discovery().nodes(topVer), null); + ClusterNode oldest = CU.oldestAliveCacheServerNode(cache.context().shared(), topVer); - if (oldest.isLocal()) { + if (oldest != null && oldest.isLocal()) { final Collection retries = new ConcurrentLinkedQueue<>(); if (ctx.deploy().enabled()) @@ -1128,7 +1129,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { ctx.cache().internalCache(UTILITY_CACHE_NAME).context().affinity(). affinityReadyFuture(topVer).get(); - reassign(dep, topVer); + reassign(dep, topVer.topologyVersion()); } catch (IgniteCheckedException ex) { if (!(e instanceof ClusterTopologyCheckedException)) @@ -1145,7 +1146,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { } if (!retries.isEmpty()) - onReassignmentFailed(topVer, retries); + onReassignmentFailed(topVer.topologyVersion(), retries); } // Clean up zombie assignments.