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 37210200BE9 for ; Mon, 26 Dec 2016 14:45:51 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 35BDF160B3B; Mon, 26 Dec 2016 13:45:51 +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 80938160B2A for ; Mon, 26 Dec 2016 14:45:50 +0100 (CET) Received: (qmail 65051 invoked by uid 500); 26 Dec 2016 13:45:49 -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 65042 invoked by uid 99); 26 Dec 2016 13:45:49 -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, 26 Dec 2016 13:45:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4D6FFDFBE9; Mon, 26 Dec 2016 13:45:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: av@apache.org To: commits@ignite.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-4424 REPLICATED cache isn't synced across nodes Date: Mon, 26 Dec 2016 13:45:49 +0000 (UTC) archived-at: Mon, 26 Dec 2016 13:45:51 -0000 Repository: ignite Updated Branches: refs/heads/ignite-4424 f5db458a8 -> 8c47ab468 IGNITE-4424 REPLICATED cache isn't synced across nodes Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8c47ab46 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8c47ab46 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8c47ab46 Branch: refs/heads/ignite-4424 Commit: 8c47ab468004c8449449069a77c5a81cd2f4236f Parents: f5db458 Author: Anton Vinogradov Authored: Mon Dec 26 16:45:40 2016 +0300 Committer: Anton Vinogradov Committed: Mon Dec 26 16:45:40 2016 +0300 ---------------------------------------------------------------------- .../distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java | 2 +- .../cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8c47ab46/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java index 97a0b41..7376aff 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java @@ -470,7 +470,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda singleReq0 = mapSingleUpdate(topVer, futVer, updVer); synchronized (mux) { - assert this.futVer == futVer || this.error() != null; + assert this.futVer == futVer || (this.isDone() && this.error() != null); assert this.topVer == topVer; this.updVer = updVer; http://git-wip-us.apache.org/repos/asf/ignite/blob/8c47ab46/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index fc944f3..950e5bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -675,7 +675,7 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu } synchronized (mux) { - assert this.futVer == futVer || this.error() != null; + assert this.futVer == futVer || (this.isDone() && this.error() != null); assert this.topVer == topVer; this.updVer = updVer;