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 81074200CEB for ; Fri, 7 Jul 2017 11:34:08 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7FD5B168AE1; Fri, 7 Jul 2017 09:34:08 +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 C706F168AC1 for ; Fri, 7 Jul 2017 11:34:07 +0200 (CEST) Received: (qmail 71327 invoked by uid 500); 7 Jul 2017 09:34:07 -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 71224 invoked by uid 99); 7 Jul 2017 09:34:07 -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; Fri, 07 Jul 2017 09:34:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AA755F5518; Fri, 7 Jul 2017 09:34:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Fri, 07 Jul 2017 09:34:09 -0000 Message-Id: <27a3cd0bb4424673ab7076c09eada9fb@git.apache.org> In-Reply-To: <3720fc9a8c26467191fbf18c323a45d9@git.apache.org> References: <3720fc9a8c26467191fbf18c323a45d9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/46] ignite git commit: IGNITE-5527: Prevent starvation in stripe pool on unstable topology. archived-at: Fri, 07 Jul 2017 09:34:08 -0000 IGNITE-5527: Prevent starvation in stripe pool on unstable topology. (cherry picked from commit 97ea507) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f3912902 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f3912902 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f3912902 Branch: refs/heads/ignite-2.1 Commit: f39129020999561e9def300b9cc136138ea3698e Parents: 6c9d222 Author: Andrey V. Mashenkov Authored: Fri Jun 16 19:54:26 2017 +0300 Committer: Andrey V. Mashenkov Committed: Tue Jul 4 17:39:28 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridDeferredAckMessageSender.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f3912902/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridDeferredAckMessageSender.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridDeferredAckMessageSender.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridDeferredAckMessageSender.java index 89aa725..a8e8226 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridDeferredAckMessageSender.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridDeferredAckMessageSender.java @@ -173,7 +173,8 @@ public abstract class GridDeferredAckMessageSender { * @return {@code True} if request was handled, {@code false} if this buffer is filled and cannot be used. */ public boolean add(T ver) { - readLock().lock(); + if(!readLock().tryLock()) + return false; // Here, writeLock is help by another thread and guard is already true. boolean snd = false;