From commits-return-116274-archive-asf-public=cust-asf.ponee.io@ignite.apache.org Thu Jan 11 14:49:03 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id E3860180656 for ; Thu, 11 Jan 2018 14:49:03 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D38A5160C41; Thu, 11 Jan 2018 13:49:03 +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 243E8160C1F for ; Thu, 11 Jan 2018 14:49:02 +0100 (CET) Received: (qmail 27751 invoked by uid 500); 11 Jan 2018 13:49:02 -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 27742 invoked by uid 99); 11 Jan 2018 13:49:02 -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; Thu, 11 Jan 2018 13:49:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3C7B3E9457; Thu, 11 Jan 2018 13:49:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agura@apache.org To: commits@ignite.apache.org Message-Id: <08a3fdf5af054b92b849fb8198e53b4b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-7340 Fix flaky GridServiceProcessorMultiNodeConfigSelfTest#checkDeployOnEachNodeUpdateTopology Date: Thu, 11 Jan 2018 13:49:02 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/master 65e1c5779 -> 6136ecd1a ignite-7340 Fix flaky GridServiceProcessorMultiNodeConfigSelfTest#checkDeployOnEachNodeUpdateTopology Signed-off-by: Andrey Gura Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6136ecd1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6136ecd1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6136ecd1 Branch: refs/heads/master Commit: 6136ecd1a92cac26894c74a306b3df6d5646c524 Parents: 65e1c57 Author: dkarachentsev Authored: Thu Jan 11 16:48:43 2018 +0300 Committer: Andrey Gura Committed: Thu Jan 11 16:48:43 2018 +0300 ---------------------------------------------------------------------- .../internal/processors/service/GridServiceProcessor.java | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6136ecd1/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 8581023..6df107b 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 @@ -1289,6 +1289,14 @@ public class GridServiceProcessor extends GridProcessorAdapter implements Ignite * @param assigns Assignments. */ private void redeploy(GridServiceAssignments assigns) { + if (assigns.topologyVersion() < ctx.discovery().topologyVersion()) { + if (log.isDebugEnabled()) + log.debug("Skip outdated assignment [assigns=" + assigns + + ", topVer=" + ctx.discovery().topologyVersion() + ']'); + + return; + } + String svcName = assigns.name(); Integer assignCnt = assigns.assigns().get(ctx.localNodeId());