From commits-return-118573-archive-asf-public=cust-asf.ponee.io@ignite.apache.org Thu Jun 7 13:55:28 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 103CC180663 for ; Thu, 7 Jun 2018 13:55:27 +0200 (CEST) Received: (qmail 65256 invoked by uid 500); 7 Jun 2018 11:55:27 -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 65246 invoked by uid 99); 7 Jun 2018 11:55:27 -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, 07 Jun 2018 11:55:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 08BACDFC7B; Thu, 7 Jun 2018 11:55:27 +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 Message-Id: <8e2742db468a41899dc639a8c4ee47ea@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-8706 Fixed testMemoryUsageMultipleNodes Date: Thu, 7 Jun 2018 11:55:27 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/master 0c9a4bf3e -> 0dc8b4baf IGNITE-8706 Fixed testMemoryUsageMultipleNodes Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0dc8b4ba Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0dc8b4ba Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0dc8b4ba Branch: refs/heads/master Commit: 0dc8b4baf6aec3acd4f0e89198b180246abccb48 Parents: 0c9a4bf Author: Alexey Goncharuk Authored: Thu Jun 7 14:55:13 2018 +0300 Committer: Alexey Goncharuk Committed: Thu Jun 7 14:55:13 2018 +0300 ---------------------------------------------------------------------- .../processors/cache/persistence/file/FilePageStore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0dc8b4ba/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java index ae4880d..852eb0d 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java @@ -279,9 +279,9 @@ public class FilePageStore implements PageStore { throw new PersistentStorageIOException("Failed to delete partition file: " + cfgFile.getPath(), e); } finally { - allocated.set(0); + allocatedTracker.updateTotalAllocatedPages(-1L * pages()); - allocatedTracker.updateTotalAllocatedPages(-1L * this.pages()); + allocated.set(0); inited = false;