ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject ignite git commit: ignite-5107 - Removed obsolete metrics API
Date Fri, 28 Apr 2017 07:49:50 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5107 [created] 8f73a9d38


ignite-5107 - Removed obsolete metrics API


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8f73a9d3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8f73a9d3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8f73a9d3

Branch: refs/heads/ignite-5107
Commit: 8f73a9d381f145c1d1791097eda6ea6de2269c13
Parents: ab2a5b9
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Authored: Fri Apr 28 10:49:22 2017 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Fri Apr 28 10:49:22 2017 +0300

----------------------------------------------------------------------
 .../apache/ignite/cluster/ClusterMetrics.java   | 35 ---------------
 .../ClusterLocalNodeMetricsMXBeanImpl.java      | 10 -----
 .../ignite/internal/ClusterMetricsSnapshot.java | 46 --------------------
 .../apache/ignite/internal/IgniteKernal.java    |  3 +-
 .../internal/client/GridClientNodeMetrics.java  | 14 ------
 .../impl/GridClientNodeMetricsAdapter.java      | 18 --------
 .../connection/GridClientNioTcpConnection.java  |  1 -
 .../discovery/GridDiscoveryManager.java         |  6 ---
 .../managers/discovery/GridLocalMetrics.java    | 11 -----
 .../platform/PlatformContextImpl.java           |  2 -
 .../message/GridClientNodeMetricsBean.java      | 32 --------------
 .../top/GridTopologyCommandHandler.java         |  1 -
 .../mxbean/ClusterLocalNodeMetricsMXBean.java   |  9 ----
 ...ClusterMetricsSnapshotSerializeSelfTest.java |  4 --
 .../Cluster/IClusterMetrics.cs                  | 10 -----
 .../Impl/Cluster/ClusterMetricsImpl.cs          |  8 ----
 .../visor/commands/node/VisorNodeCommand.scala  |  1 -
 17 files changed, 1 insertion(+), 210 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8f73a9d3/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java
index 7dd4707..d4ff7b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java
@@ -518,20 +518,6 @@ public interface ClusterMetrics {
     public long getNonHeapMemoryUsed();
 
     /**
-     * Returns the amount of non-heap memory in bytes that is committed for
-     * the JVM to use. This amount of memory is
-     * guaranteed for the JVM to use.
-     * The non-heap memory consists of one or more memory pools. This value is
-     * the sum of {@code committed} non-heap memory values of all non-heap memory pools.
-     * <p>
-     * <b>Note:</b> this is <b>not</b> an aggregated metric and it's
calculated
-     * from the time of the node's startup.
-     *
-     * @return The amount of committed memory in bytes.
-     */
-    public long getNonHeapMemoryCommitted();
-
-    /**
      * Returns the maximum amount of non-heap memory in bytes that can be
      * used for memory management. This method returns {@code -1}
      * if the maximum memory size is undefined.
@@ -553,27 +539,6 @@ public interface ClusterMetrics {
     public long getNonHeapMemoryMaximum();
 
     /**
-     * Returns the total amount of non-heap memory in bytes that can be
-     * used for memory management. This method returns {@code -1}
-     * if the total memory size is undefined.
-     * <p>
-     * This amount of memory is not guaranteed to be available
-     * for memory management if it is greater than the amount of
-     * committed memory.  The JVM may fail to allocate
-     * memory even if the amount of used memory does not exceed this
-     * maximum size.
-     * <p>
-     * This value represents a setting of the non-heap memory for Java VM and is
-     * not a sum of all initial non-heap values for all memory pools.
-     * <p>
-     * <b>Note:</b> this is <b>not</b> an aggregated metric and it's
calculated
-     * from the time of the node's startup.
-     *
-     * @return The total amount of memory in bytes; {@code -1} if undefined.
-     */
-    public long getNonHeapMemoryTotal();
-
-    /**
      * Returns the uptime of the JVM in milliseconds.
      *
      * @return Uptime of the JVM in milliseconds.

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f73a9d3/modules/core/src/main/java/org/apache/ignite/internal/ClusterLocalNodeMetricsMXBeanImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ClusterLocalNodeMetricsMXBeanImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/ClusterLocalNodeMetricsMXBeanImpl.java
index ef81c6a..cec1eec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ClusterLocalNodeMetricsMXBeanImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ClusterLocalNodeMetricsMXBeanImpl.java
@@ -188,11 +188,6 @@ public class ClusterLocalNodeMetricsMXBeanImpl implements ClusterLocalNodeMetric
     }
 
     /** {@inheritDoc} */
-    @Override public long getNonHeapMemoryCommitted() {
-        return node.metrics().getNonHeapMemoryCommitted();
-    }
-
-    /** {@inheritDoc} */
     @Override public long getNonHeapMemoryInitialized() {
         return node.metrics().getNonHeapMemoryInitialized();
     }
@@ -203,11 +198,6 @@ public class ClusterLocalNodeMetricsMXBeanImpl implements ClusterLocalNodeMetric
     }
 
     /** {@inheritDoc} */
-    @Override public long getNonHeapMemoryTotal() {
-        return node.metrics().getNonHeapMemoryTotal();
-    }
-
-    /** {@inheritDoc} */
     @Override public long getNonHeapMemoryUsed() {
         return node.metrics().getNonHeapMemoryUsed();
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f73a9d3/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
b/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
index 8a0bc5e..204682d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
@@ -75,9 +75,7 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
         8/*heap memory total*/ +
         8/*non-heap memory init*/ +
         8/*non-heap memory used*/ +
-        8/*non-heap memory committed*/ +
         8/*non-heap memory max*/ +
-        8/*non-heap memory total*/ +
         8/*uptime*/ +
         8/*start time*/ +
         8/*node start time*/ +
@@ -202,15 +200,9 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
     private long nonHeapUsed = -1;
 
     /** */
-    private long nonHeapCommitted = -1;
-
-    /** */
     private long nonHeapMax = -1;
 
     /** */
-    private long nonHeapTotal = -1;
-
-    /** */
     private long upTime = -1;
 
     /** */
@@ -306,9 +298,7 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
         heapMax = 0;
         nonHeapInit = 0;
         nonHeapUsed = 0;
-        nonHeapCommitted = 0;
         nonHeapMax = 0;
-        nonHeapTotal = 0;
         upTime = 0;
         startTime = 0;
         nodeStartTime = 0;
@@ -378,14 +368,10 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
 
             heapInit += m.getHeapMemoryInitialized();
 
-            nonHeapCommitted += m.getNonHeapMemoryCommitted();
-
             nonHeapUsed += m.getNonHeapMemoryUsed();
 
             nonHeapMax = max(nonHeapMax, m.getNonHeapMemoryMaximum());
 
-            nonHeapTotal += m.getNonHeapMemoryTotal();
-
             nonHeapInit += m.getNonHeapMemoryInitialized();
 
             upTime = max(upTime, m.getUpTime());
@@ -439,15 +425,6 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
         this.heapTotal = heapTotal;
     }
 
-    /**
-     * Sets non-heap total heap size.
-     *
-     * @param nonHeapTotal Total heap.
-     */
-    public void setNonHeapMemoryTotal(long nonHeapTotal) {
-        this.nonHeapTotal = nonHeapTotal;
-    }
-
     /** {@inheritDoc} */
     @Override public long getLastUpdateTime() {
         return lastUpdateTime;
@@ -856,21 +833,11 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
     }
 
     /** {@inheritDoc} */
-    @Override public long getNonHeapMemoryCommitted() {
-        return nonHeapCommitted;
-    }
-
-    /** {@inheritDoc} */
     @Override public long getNonHeapMemoryMaximum() {
         return nonHeapMax;
     }
 
     /** {@inheritDoc} */
-    @Override public long getNonHeapMemoryTotal() {
-        return nonHeapTotal;
-    }
-
-    /** {@inheritDoc} */
     @Override public long getUpTime() {
         return upTime;
     }
@@ -1031,15 +998,6 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
     }
 
     /**
-     * Sets committed non-heap memory.
-     *
-     * @param nonHeapCommitted Committed non-heap memory.
-     */
-    public void setNonHeapMemoryCommitted(long nonHeapCommitted) {
-        this.nonHeapCommitted = nonHeapCommitted;
-    }
-
-    /**
      * Sets maximum possible non-heap memory.
      *
      * @param nonHeapMax Maximum possible non-heap memory.
@@ -1308,9 +1266,7 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
         buf.putLong(metrics.getHeapMemoryTotal());
         buf.putLong(metrics.getNonHeapMemoryInitialized());
         buf.putLong(metrics.getNonHeapMemoryUsed());
-        buf.putLong(metrics.getNonHeapMemoryCommitted());
         buf.putLong(metrics.getNonHeapMemoryMaximum());
-        buf.putLong(metrics.getNonHeapMemoryTotal());
         buf.putLong(metrics.getStartTime());
         buf.putLong(metrics.getNodeStartTime());
         buf.putLong(metrics.getUpTime());
@@ -1381,9 +1337,7 @@ public class ClusterMetricsSnapshot implements ClusterMetrics {
         metrics.setHeapMemoryTotal(buf.getLong());
         metrics.setNonHeapMemoryInitialized(buf.getLong());
         metrics.setNonHeapMemoryUsed(buf.getLong());
-        metrics.setNonHeapMemoryCommitted(buf.getLong());
         metrics.setNonHeapMemoryMaximum(buf.getLong());
-        metrics.setNonHeapMemoryTotal(buf.getLong());
         metrics.setStartTime(buf.getLong());
         metrics.setNodeStartTime(buf.getLong());
         metrics.setUpTime(buf.getLong());

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f73a9d3/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 8ba6a88..9cbb51f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1150,7 +1150,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable
{
                             long nonHeapMax = m.getNonHeapMemoryMaximum();
 
                             long nonHeapUsedInMBytes = nonHeapUsed / 1024 / 1024;
-                            long nonHeapCommInMBytes = m.getNonHeapMemoryCommitted() / 1024
/ 1024;
 
                             double freeNonHeapPct = nonHeapMax > 0 ? ((double)((nonHeapMax
- nonHeapUsed) * 100)) / nonHeapMax : -1;
 
@@ -1220,7 +1219,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable
{
                                 "    ^-- Heap [used=" + dblFmt.format(heapUsedInMBytes) +
"MB, free=" +
                                 dblFmt.format(freeHeapPct) + "%, comm=" + dblFmt.format(heapCommInMBytes)
+ "MB]" + NL +
                                 "    ^-- Non heap [used=" + dblFmt.format(nonHeapUsedInMBytes)
+ "MB, free=" +
-                                dblFmt.format(freeNonHeapPct) + "%, comm=" + dblFmt.format(nonHeapCommInMBytes)
+ "MB]" + NL +
+                                dblFmt.format(freeNonHeapPct) + "%]" + NL +
                                 "    ^-- Public thread pool [active=" + pubPoolActiveThreads
+ ", idle=" +
                                 pubPoolIdleThreads + ", qSize=" + pubPoolQSize + "]" + NL
+
                                 "    ^-- System thread pool [active=" + sysPoolActiveThreads
+ ", idle=" +

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f73a9d3/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNodeMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNodeMetrics.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNodeMetrics.java
index dc9fd92..707b179 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNodeMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNodeMetrics.java
@@ -369,20 +369,6 @@ public interface GridClientNodeMetrics extends Serializable {
     public long getNonHeapMemoryUsed();
 
     /**
-     * Returns the amount of non-heap memory in bytes that is committed for
-     * the Java virtual machine to use. This amount of memory is
-     * guaranteed for the Java virtual machine to use.
-     * The non-heap memory consists of one or more memory pools. This value is
-     * the sum of {@code committed} non-heap memory values of all non-heap memory pools.
-     * <p>
-     * <b>Note:</b> this is <b>not</b> an aggregated metric and it's
calculated
-     * from the time of the node's startup.
-     *
-     * @return The amount of committed memory in bytes.
-     */
-    public long getNonHeapMemoryCommitted();
-
-    /**
      * Returns the maximum amount of non-heap memory in bytes that can be
      * used for memory management. This method returns {@code -1}
      * if the maximum memory size is undefined.

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f73a9d3/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeMetricsAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeMetricsAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeMetricsAdapter.java
index af010aa..8ca04e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeMetricsAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientNodeMetricsAdapter.java
@@ -132,9 +132,6 @@ public class GridClientNodeMetricsAdapter implements GridClientNodeMetrics
{
     private long nonHeapUsed = -1;
 
     /** */
-    private long nonHeapCommitted = -1;
-
-    /** */
     private long nonHeapMax = -1;
 
     /** */
@@ -598,11 +595,6 @@ public class GridClientNodeMetricsAdapter implements GridClientNodeMetrics
{
     }
 
     /** {@inheritDoc} */
-    @Override public long getNonHeapMemoryCommitted() {
-        return nonHeapCommitted;
-    }
-
-    /** {@inheritDoc} */
     @Override public long getNonHeapMemoryMaximum() {
         return nonHeapMax;
     }
@@ -753,15 +745,6 @@ public class GridClientNodeMetricsAdapter implements GridClientNodeMetrics
{
     }
 
     /**
-     * Sets committed non-heap memory.
-     *
-     * @param nonHeapCommitted Committed non-heap memory.
-     */
-    public void setNonHeapMemoryCommitted(long nonHeapCommitted) {
-        this.nonHeapCommitted = nonHeapCommitted;
-    }
-
-    /**
      * Sets maximum possible non-heap memory.
      *
      * @param nonHeapMax Maximum possible non-heap memory.
@@ -966,7 +949,6 @@ public class GridClientNodeMetricsAdapter implements GridClientNodeMetrics
{
             append(", heapMax=").append(heapMax).
             append(", nonHeapInit=").append(nonHeapInit).
             append(", nonHeapUsed=").append(nonHeapUsed).
-            append(", nonHeapCommitted=").append(nonHeapCommitted).
             append(", nonHeapMax=").append(nonHeapMax).
             append(", upTime=").append(upTime).
             append(", startTime=").append(startTime).

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f73a9d3/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
index 75fa315..fc8d80c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
@@ -1009,7 +1009,6 @@ public class GridClientNioTcpConnection extends GridClientConnection
{
             metrics.setMaximumThreadCount(metricsBean.getMaximumThreadCount());
             metrics.setMaximumWaitingJobs(metricsBean.getMaximumWaitingJobs());
             metrics.setNodeStartTime(metricsBean.getNodeStartTime());
-            metrics.setNonHeapMemoryCommitted(metricsBean.getNonHeapMemoryCommitted());
             metrics.setNonHeapMemoryInitialized(metricsBean.getNonHeapMemoryInitialized());
             metrics.setNonHeapMemoryMaximum(metricsBean.getNonHeapMemoryMaximum());
             metrics.setNonHeapMemoryUsed(metricsBean.getNonHeapMemoryUsed());

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f73a9d3/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index e5f2278..6bd7657 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -819,10 +819,6 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi>
{
                 return nonHeapMemoryUsage().getUsed();
             }
 
-            @Override public long getNonHeapMemoryCommitted() {
-                return nonHeapMemoryUsage().getCommitted();
-            }
-
             @Override public long getNonHeapMemoryMaximum() {
                 return nonHeapMemoryUsage().getMax();
             }
@@ -909,9 +905,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi>
{
                 nm.setHeapMemoryTotal(metrics.getHeapMemoryMaximum());
                 nm.setNonHeapMemoryInitialized(metrics.getNonHeapMemoryInitialized());
                 nonHeapMemoryUsed(nm);
-                nm.setNonHeapMemoryCommitted(metrics.getNonHeapMemoryCommitted());
                 nm.setNonHeapMemoryMaximum(metrics.getNonHeapMemoryMaximum());
-                nm.setNonHeapMemoryTotal(metrics.getNonHeapMemoryMaximum());
                 nm.setUpTime(metrics.getUptime());
                 nm.setStartTime(metrics.getStartTime());
                 nm.setNodeStartTime(startTime);

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f73a9d3/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridLocalMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridLocalMetrics.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridLocalMetrics.java
index 8f7f15e..b26774f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridLocalMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridLocalMetrics.java
@@ -139,17 +139,6 @@ public interface GridLocalMetrics extends Serializable {
     public long getNonHeapMemoryUsed();
 
     /**
-     * Returns the amount of non-heap memory in bytes that is committed for
-     * the Java virtual machine to use. This amount of memory is
-     * guaranteed for the Java virtual machine to use.
-     * The non-heap memory consists of one or more memory pools. This value is
-     * the sum of {@code committed} non-heap memory values of all non-heap memory pools.
-     *
-     * @return The amount of committed memory in bytes.
-     */
-    public long getNonHeapMemoryCommitted();
-
-    /**
      * Returns the maximum amount of non-heap memory in bytes that can be
      * used for memory management. This method returns {@code -1}
      * if the maximum memory size is undefined.

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f73a9d3/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
index 090f382..4eb908b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
@@ -325,9 +325,7 @@ public class PlatformContextImpl implements PlatformContext {
             writer.writeLong(metrics.getNonHeapMemoryInitialized());
 
             writer.writeLong(metrics.getNonHeapMemoryUsed());
-            writer.writeLong(metrics.getNonHeapMemoryCommitted());
             writer.writeLong(metrics.getNonHeapMemoryMaximum());
-            writer.writeLong(metrics.getNonHeapMemoryTotal());
             writer.writeLong(metrics.getUpTime());
 
             writer.writeTimestamp(new Timestamp(metrics.getStartTime()));

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f73a9d3/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeMetricsBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeMetricsBean.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeMetricsBean.java
index 4138c24..9ceb96f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeMetricsBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientNodeMetricsBean.java
@@ -135,9 +135,6 @@ public class GridClientNodeMetricsBean implements Externalizable {
     private long nonHeapUsed = -1;
 
     /** */
-    private long nonHeapCommitted = -1;
-
-    /** */
     private long nonHeapMax = -1;
 
     /** */
@@ -801,22 +798,6 @@ public class GridClientNodeMetricsBean implements Externalizable {
     }
 
     /**
-     * Returns the amount of non-heap memory in bytes that is committed for
-     * the Java virtual machine to use. This amount of memory is
-     * guaranteed for the Java virtual machine to use.
-     * The non-heap memory consists of one or more memory pools. This value is
-     * the sum of {@code committed} non-heap memory values of all non-heap memory pools.
-     * <p>
-     * <b>Note:</b> this is <b>not</b> an aggregated metric and it's
calculated
-     * from the time of the node's startup.
-     *
-     * @return The amount of committed memory in bytes.
-     */
-    public long getNonHeapMemoryCommitted() {
-        return nonHeapCommitted;
-    }
-
-    /**
      * Returns the maximum amount of non-heap memory in bytes that can be
      * used for memory management. This method returns {@code -1}
      * if the maximum memory size is undefined.
@@ -1043,15 +1024,6 @@ public class GridClientNodeMetricsBean implements Externalizable {
     }
 
     /**
-     * Sets committed non-heap memory.
-     *
-     * @param nonHeapCommitted Committed non-heap memory.
-     */
-    public void setNonHeapMemoryCommitted(long nonHeapCommitted) {
-        this.nonHeapCommitted = nonHeapCommitted;
-    }
-
-    /**
      * Sets maximum possible non-heap memory.
      *
      * @param nonHeapMax Maximum possible non-heap memory.
@@ -1264,7 +1236,6 @@ public class GridClientNodeMetricsBean implements Externalizable {
             maxJobWaitTime == other.maxJobWaitTime &&
             maxRejectedJobs == other.maxRejectedJobs &&
             maxWaitingJobs == other.maxWaitingJobs &&
-            nonHeapCommitted == other.nonHeapCommitted &&
             nonHeapInit == other.nonHeapInit &&
             nonHeapMax == other.nonHeapMax &&
             nonHeapUsed == other.nonHeapUsed &&
@@ -1328,7 +1299,6 @@ public class GridClientNodeMetricsBean implements Externalizable {
             append(", heapMax=").append(heapMax).
             append(", nonHeapInit=").append(nonHeapInit).
             append(", nonHeapUsed=").append(nonHeapUsed).
-            append(", nonHeapCommitted=").append(nonHeapCommitted).
             append(", nonHeapMax=").append(nonHeapMax).
             append(", upTime=").append(upTime).
             append(", startTime=").append(startTime).
@@ -1386,7 +1356,6 @@ public class GridClientNodeMetricsBean implements Externalizable {
         out.writeLong(heapMax);
         out.writeLong(nonHeapInit);
         out.writeLong(nonHeapUsed);
-        out.writeLong(nonHeapCommitted);
         out.writeLong(nonHeapMax);
         out.writeLong(upTime);
         out.writeLong(startTime);
@@ -1442,7 +1411,6 @@ public class GridClientNodeMetricsBean implements Externalizable {
         heapMax = in.readLong();
         nonHeapInit = in.readLong();
         nonHeapUsed = in.readLong();
-        nonHeapCommitted = in.readLong();
         nonHeapMax = in.readLong();
         upTime = in.readLong();
         startTime = in.readLong();

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f73a9d3/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
index 536ec88..097194b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java
@@ -265,7 +265,6 @@ public class GridTopologyCommandHandler extends GridRestCommandHandlerAdapter
{
             metricsBean.setMaximumThreadCount(metrics.getMaximumThreadCount());
             metricsBean.setMaximumWaitingJobs(metrics.getMaximumWaitingJobs());
             metricsBean.setNodeStartTime(metrics.getNodeStartTime());
-            metricsBean.setNonHeapMemoryCommitted(metrics.getNonHeapMemoryCommitted());
             metricsBean.setNonHeapMemoryInitialized(metrics.getNonHeapMemoryInitialized());
             metricsBean.setNonHeapMemoryMaximum(metrics.getNonHeapMemoryMaximum());
             metricsBean.setNonHeapMemoryUsed(metrics.getNonHeapMemoryUsed());

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f73a9d3/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java
b/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java
index ea3a57a..0374ce0 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java
@@ -182,20 +182,11 @@ public interface ClusterLocalNodeMetricsMXBean extends ClusterMetrics
{
     public long getNonHeapMemoryUsed();
 
     /** {@inheritDoc} */
-    @MXBeanDescription("Amount of non-heap memory in bytes that is committed for the JVM
to use.")
-    public long getNonHeapMemoryCommitted();
-
-    /** {@inheritDoc} */
     @MXBeanDescription("Maximum amount of non-heap memory in bytes that can " +
         "be used for memory management. -1 if undefined.")
     public long getNonHeapMemoryMaximum();
 
     /** {@inheritDoc} */
-    @MXBeanDescription("Total amount of non-heap memory in bytes that can " +
-        "be used for memory management. -1 if undefined.")
-    public long getNonHeapMemoryTotal();
-
-    /** {@inheritDoc} */
     @MXBeanDescription("Uptime of the JVM in milliseconds.")
     public long getUpTime();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f73a9d3/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSnapshotSerializeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSnapshotSerializeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSnapshotSerializeSelfTest.java
index a1e36a3..09ff19c 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSnapshotSerializeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSnapshotSerializeSelfTest.java
@@ -122,7 +122,6 @@ public class ClusterMetricsSnapshotSerializeSelfTest extends GridCommonAbstractT
         metrics.setMaximumJobWaitTime(25);
         metrics.setMaximumRejectedJobs(26);
         metrics.setMaximumWaitingJobs(27);
-        metrics.setNonHeapMemoryCommitted(28);
         metrics.setNonHeapMemoryInitialized(29);
         metrics.setNonHeapMemoryMaximum(30);
         metrics.setNonHeapMemoryUsed(31);
@@ -141,7 +140,6 @@ public class ClusterMetricsSnapshotSerializeSelfTest extends GridCommonAbstractT
         metrics.setReceivedMessagesCount(44);
         metrics.setReceivedBytesCount(45);
         metrics.setOutboundMessagesQueueSize(46);
-        metrics.setNonHeapMemoryTotal(47);
         metrics.setHeapMemoryTotal(48);
 
         return metrics;
@@ -178,7 +176,6 @@ public class ClusterMetricsSnapshotSerializeSelfTest extends GridCommonAbstractT
             obj.getMaximumJobWaitTime() == obj1.getMaximumJobWaitTime() &&
             obj.getMaximumRejectedJobs() == obj1.getMaximumRejectedJobs() &&
             obj.getMaximumWaitingJobs() == obj1.getMaximumWaitingJobs() &&
-            obj.getNonHeapMemoryCommitted() == obj1.getNonHeapMemoryCommitted() &&
             obj.getNonHeapMemoryInitialized() == obj1.getNonHeapMemoryInitialized() &&
             obj.getNonHeapMemoryMaximum() == obj1.getNonHeapMemoryMaximum() &&
             obj.getNonHeapMemoryUsed() == obj1.getNonHeapMemoryUsed() &&
@@ -197,7 +194,6 @@ public class ClusterMetricsSnapshotSerializeSelfTest extends GridCommonAbstractT
             obj.getReceivedMessagesCount() == obj1.getReceivedMessagesCount() &&
             obj.getReceivedBytesCount() == obj1.getReceivedBytesCount() &&
             obj.getOutboundMessagesQueueSize() == obj1.getOutboundMessagesQueueSize() &&
-            obj.getNonHeapMemoryTotal() == obj1.getNonHeapMemoryTotal() &&
             obj.getHeapMemoryTotal() == obj1.getHeapMemoryTotal();
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f73a9d3/modules/platforms/dotnet/Apache.Ignite.Core/Cluster/IClusterMetrics.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cluster/IClusterMetrics.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cluster/IClusterMetrics.cs
index f0889d9..f536d10 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cluster/IClusterMetrics.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cluster/IClusterMetrics.cs
@@ -259,21 +259,11 @@ namespace Apache.Ignite.Core.Cluster
         long NonHeapMemoryUsed { get; }
 
         /// <summary>
-        /// Amount of non-heap memory in bytes that is committed for the JVM to use. 
-        /// </summary>
-        long NonHeapMemoryCommitted { get; }
-
-        /// <summary>
         /// Maximum amount of non-heap memory in bytes that can be used for memory management.
         /// </summary>
         long NonHeapMemoryMaximum { get; }
 
         /// <summary>
-        /// Total amount of non-heap memory in bytes that can be used for memory management.

-        /// </summary>
-        long NonHeapMemoryTotal { get; }
-
-        /// <summary>
         /// Uptime of the JVM in milliseconds.
         /// </summary>
         long Uptime { get; }

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f73a9d3/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cluster/ClusterMetricsImpl.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cluster/ClusterMetricsImpl.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cluster/ClusterMetricsImpl.cs
index 3844d04..d2e215e 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cluster/ClusterMetricsImpl.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cluster/ClusterMetricsImpl.cs
@@ -81,9 +81,7 @@ namespace Apache.Ignite.Core.Impl.Cluster
             NonHeapMemoryInitialized = reader.ReadLong();
 
             NonHeapMemoryUsed = reader.ReadLong();
-            NonHeapMemoryCommitted = reader.ReadLong();
             NonHeapMemoryMaximum = reader.ReadLong();
-            NonHeapMemoryTotal = reader.ReadLong();
             Uptime = reader.ReadLong();
 
             var startTime = reader.ReadTimestamp();
@@ -241,15 +239,9 @@ namespace Apache.Ignite.Core.Impl.Cluster
         public long NonHeapMemoryUsed { get; private set; }
 
         /** <inheritDoc /> */
-        public long NonHeapMemoryCommitted { get; private set; }
-
-        /** <inheritDoc /> */
         public long NonHeapMemoryMaximum { get; private set; }
 
         /** <inheritDoc /> */
-        public long NonHeapMemoryTotal { get; private set; }
-
-        /** <inheritDoc /> */
         public long Uptime { get; private set; }
 
         /** <inheritDoc /> */

http://git-wip-us.apache.org/repos/asf/ignite/blob/8f73a9d3/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
index 93cf233..64b4c57 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
@@ -224,7 +224,6 @@ class VisorNodeCommand extends VisorConsoleCommand {
                             t += ("Heap memory maximum", formatMemory(m.getHeapMemoryMaximum))
                             t += ("Non-heap memory initialized", formatMemory(m.getNonHeapMemoryInitialized))
                             t += ("Non-heap memory used", formatMemory(m.getNonHeapMemoryUsed))
-                            t += ("Non-heap memory committed", formatMemory(m.getNonHeapMemoryCommitted))
                             t += ("Non-heap memory maximum", formatMemory(m.getNonHeapMemoryMaximum))
                             t += ("Current thread count", formatNumber(m.getCurrentThreadCount))
                             t += ("Maximum thread count", formatNumber(m.getMaximumThreadCount))


Mime
View raw message