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 9EDD6200B4B for ; Thu, 7 Jul 2016 08:01:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9DA11160A64; Thu, 7 Jul 2016 06:01:30 +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 BAA7B160A9A for ; Thu, 7 Jul 2016 08:01:28 +0200 (CEST) Received: (qmail 80890 invoked by uid 500); 7 Jul 2016 06:01:28 -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 79682 invoked by uid 99); 7 Jul 2016 06:01: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 Jul 2016 06:01:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D0E64E78B5; Thu, 7 Jul 2016 06:01:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Thu, 07 Jul 2016 06:01:43 -0000 Message-Id: <4bf98bc7e273452abb4a079aa1270e04@git.apache.org> In-Reply-To: <078d677a2cf641a7b437be012bf63361@git.apache.org> References: <078d677a2cf641a7b437be012bf63361@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/50] [abbrv] ignite git commit: Fixed IGFS max size. archived-at: Thu, 07 Jul 2016 06:01:30 -0000 Fixed IGFS max size. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/583ef2ed Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/583ef2ed Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/583ef2ed Branch: refs/heads/ignite-1232 Commit: 583ef2edbc3b05c65d794611553e8a7ff0a83619 Parents: 860167c Author: vsisko Authored: Tue Jul 5 00:21:56 2016 +0700 Committer: Alexey Kuznetsov Committed: Tue Jul 5 00:21:56 2016 +0700 ---------------------------------------------------------------------- .../org/apache/ignite/internal/visor/igfs/VisorIgfs.java | 2 +- .../ignite/internal/visor/igfs/VisorIgfsMetrics.java | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/583ef2ed/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java index 29c79fe..114d92d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java @@ -72,7 +72,7 @@ public class VisorIgfs implements Serializable, LessNamingBean { return new VisorIgfs( igfs.name(), igfs.configuration().getDefaultMode(), - VisorIgfsMetrics.from(igfs.metrics()), + VisorIgfsMetrics.from(igfs), igfs.configuration().getSecondaryFileSystem() != null ); } http://git-wip-us.apache.org/repos/asf/ignite/blob/583ef2ed/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsMetrics.java index af7af06..58acee1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsMetrics.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsMetrics.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.visor.igfs; import java.io.Serializable; +import org.apache.ignite.IgniteFileSystem; import org.apache.ignite.igfs.IgfsMetrics; import org.apache.ignite.internal.LessNamingBean; import org.apache.ignite.internal.util.typedef.internal.S; @@ -72,15 +73,17 @@ public class VisorIgfsMetrics implements Serializable, LessNamingBean { private long bytesWrtTm; /** - * @param m IGFS metrics. + * @param igfs Source IGFS. * @return Data transfer object for given IGFS metrics. */ - public static VisorIgfsMetrics from(IgfsMetrics m) { - assert m != null; + public static VisorIgfsMetrics from(IgniteFileSystem igfs) { + assert igfs != null; + + IgfsMetrics m = igfs.metrics(); VisorIgfsMetrics metrics = new VisorIgfsMetrics(); - metrics.totalSpaceSz = m.maxSpaceSize(); + metrics.totalSpaceSz = igfs.configuration().getMaxSpaceSize(); metrics.usedSpaceSz = m.localSpaceSize(); metrics.foldersCnt = m.directoriesCount(); metrics.filesCnt = m.filesCount();