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 79234200CE0 for ; Thu, 10 Aug 2017 15:53:03 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7796F16B413; Thu, 10 Aug 2017 13:53: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 513C516B41B for ; Thu, 10 Aug 2017 15:53:02 +0200 (CEST) Received: (qmail 6667 invoked by uid 500); 10 Aug 2017 13:53:01 -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 6464 invoked by uid 99); 10 Aug 2017 13:53:01 -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, 10 Aug 2017 13:53:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B7937F32A6; Thu, 10 Aug 2017 13:52:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Thu, 10 Aug 2017 13:53:13 -0000 Message-Id: In-Reply-To: <7e422cabd1664a31b6055684c882da3d@git.apache.org> References: <7e422cabd1664a31b6055684c882da3d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/30] ignite git commit: IGNITE-5984 - Test fix: scan for a test key only after late affinity assignment changes archived-at: Thu, 10 Aug 2017 13:53:03 -0000 IGNITE-5984 - Test fix: scan for a test key only after late affinity assignment changes Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c141ded2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c141ded2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c141ded2 Branch: refs/heads/ignite-5872 Commit: c141ded2565b0b277add5007f73a6fa7e97b3372 Parents: 9da6938 Author: Alexey Goncharuk Authored: Tue Aug 8 14:53:34 2017 +0300 Committer: Alexey Goncharuk Committed: Tue Aug 8 14:53:34 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAbstractLocalStoreSelfTest.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c141ded2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java index ae9986d..328cde8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java @@ -47,6 +47,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.events.Event; import org.apache.ignite.events.EventType; +import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.store.CacheLocalStore; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.G; @@ -294,6 +295,12 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst awaitPartitionMapExchange(); + // We need a backup key on grid 1, so we must wait for late affinity assignment to change. + AffinityTopologyVersion waitTopVer = new AffinityTopologyVersion(2, 1); + + grid(1).context().cache().context().exchange().affinityReadyFuture(waitTopVer).get(); + grid(2).context().cache().context().exchange().affinityReadyFuture(waitTopVer).get(); + final String name = BACKUP_CACHE_2; int key1 = -1;