This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new b477843dd1b IGNITE-18234 Remove of PersistenceMetricsMXBean (#10392)
b477843dd1b is described below
commit b477843dd1be9b81b0eaeae9e7b6d82f2a4b0ad9
Author: Nikolay <[email protected]>
AuthorDate: Wed Nov 23 11:14:44 2022 +0300
IGNITE-18234 Remove of PersistenceMetricsMXBean (#10392)
---
.../apache/ignite/DataStorageMetricsAdapter.java | 114 -------------------
.../src/main/java/org/apache/ignite/Ignite.java | 7 --
.../java/org/apache/ignite/PersistenceMetrics.java | 124 ---------------------
.../org/apache/ignite/internal/IgniteKernal.java | 7 --
.../platform/cluster/PlatformClusterGroup.java | 37 ------
.../ignite/mxbean/PersistenceMetricsMXBean.java | 116 -------------------
.../ignite/testframework/junits/IgniteMock.java | 7 --
.../junits/multijvm/IgniteProcessProxy.java | 7 --
.../Cache/PersistentStoreTestObsolete.cs | 2 +-
.../platforms/dotnet/Apache.Ignite.Core/IIgnite.cs | 9 --
.../Impl/Cluster/ClusterGroupImpl.cs | 16 ---
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 8 --
.../Impl/PersistentStore/PersistentStoreMetrics.cs | 90 ---------------
.../PersistentStore/IPersistentStoreMetrics.cs | 89 ---------------
.../PersistentStoreConfiguration.cs | 2 +-
.../java/org/apache/ignite/IgniteSpringBean.java | 5 -
16 files changed, 2 insertions(+), 638 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/DataStorageMetricsAdapter.java
b/modules/core/src/main/java/org/apache/ignite/DataStorageMetricsAdapter.java
deleted file mode 100644
index a70d2754ffa..00000000000
---
a/modules/core/src/main/java/org/apache/ignite/DataStorageMetricsAdapter.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package org.apache.ignite;
-
-import org.apache.ignite.spi.metric.MetricExporterSpi;
-import org.apache.ignite.spi.metric.ReadOnlyMetricManager;
-import org.apache.ignite.spi.metric.ReadOnlyMetricRegistry;
-import org.apache.ignite.spi.metric.jmx.JmxMetricExporterSpi;
-
-/**
- * Converter class from {@link DataStorageMetrics} to legacy {@link
PersistenceMetrics}.
- *
- * @deprecated Check the {@link ReadOnlyMetricRegistry} with
"name=io.datastorage" instead.
- *
- * @see ReadOnlyMetricManager
- * @see ReadOnlyMetricRegistry
- * @see JmxMetricExporterSpi
- * @see MetricExporterSpi
- */
-@Deprecated
-public class DataStorageMetricsAdapter implements PersistenceMetrics {
- /** Delegate. */
- private final DataStorageMetrics delegate;
-
- /**
- * @param delegate Delegate.
- */
- private DataStorageMetricsAdapter(DataStorageMetrics delegate) {
- this.delegate = delegate;
- }
-
- /**
- * @param delegate DataStorageMetrics.
- * @return Wrapped {@link DataStorageMetrics} that implements {@link
PersistenceMetrics}.
- * Null value is not wrapped and returned as is.
- */
- public static DataStorageMetricsAdapter valueOf(DataStorageMetrics
delegate) {
- return delegate == null ? null : new
DataStorageMetricsAdapter(delegate);
- }
-
- /** {@inheritDoc} */
- @Override public float getWalLoggingRate() {
- return delegate.getWalLoggingRate();
- }
-
- /** {@inheritDoc} */
- @Override public float getWalWritingRate() {
- return delegate.getWalWritingRate();
- }
-
- /** {@inheritDoc} */
- @Override public int getWalArchiveSegments() {
- return delegate.getWalArchiveSegments();
- }
-
- /** {@inheritDoc} */
- @Override public float getWalFsyncTimeAverage() {
- return delegate.getWalFsyncTimeAverage();
- }
-
- /** {@inheritDoc} */
- @Override public long getLastCheckpointingDuration() {
- return delegate.getLastCheckpointDuration();
- }
-
- /** {@inheritDoc} */
- @Override public long getLastCheckpointLockWaitDuration() {
- return delegate.getLastCheckpointLockWaitDuration();
- }
-
- /** {@inheritDoc} */
- @Override public long getLastCheckpointMarkDuration() {
- return delegate.getLastCheckpointMarkDuration();
- }
-
- /** {@inheritDoc} */
- @Override public long getLastCheckpointPagesWriteDuration() {
- return delegate.getLastCheckpointPagesWriteDuration();
- }
-
- /** {@inheritDoc} */
- @Override public long getLastCheckpointFsyncDuration() {
- return delegate.getLastCheckpointFsyncDuration();
- }
-
- /** {@inheritDoc} */
- @Override public long getLastCheckpointTotalPagesNumber() {
- return delegate.getLastCheckpointTotalPagesNumber();
- }
-
- /** {@inheritDoc} */
- @Override public long getLastCheckpointDataPagesNumber() {
- return delegate.getLastCheckpointDataPagesNumber();
- }
-
- /** {@inheritDoc} */
- @Override public long getLastCheckpointCopiedOnWritePagesNumber() {
- return delegate.getLastCheckpointCopiedOnWritePagesNumber();
- }
-}
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java
b/modules/core/src/main/java/org/apache/ignite/Ignite.java
index d5e5642ee7b..6698adc18c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -730,13 +730,6 @@ public interface Ignite extends AutoCloseable {
@Deprecated
@Nullable public MemoryMetrics memoryMetrics(String dataRegionName);
- /**
- * @return {@link PersistenceMetrics} snapshot.
- * @deprecated Check the {@link ReadOnlyMetricRegistry} with
"name=io.dataregion.{data_region_name}" instead.
- */
- @Deprecated
- public PersistenceMetrics persistentStoreMetrics();
-
/**
* Returns a collection of {@link DataRegionMetrics} that reflects page
memory usage on this Apache Ignite node
* instance.
diff --git
a/modules/core/src/main/java/org/apache/ignite/PersistenceMetrics.java
b/modules/core/src/main/java/org/apache/ignite/PersistenceMetrics.java
deleted file mode 100644
index e7b85faf39b..00000000000
--- a/modules/core/src/main/java/org/apache/ignite/PersistenceMetrics.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.ignite;
-
-import org.apache.ignite.configuration.PersistentStoreConfiguration;
-import org.apache.ignite.spi.metric.ReadOnlyMetricRegistry;
-
-/**
- * Persistence metrics used to obtain statistics on persistence.
- *
- * @deprecated Check the {@link ReadOnlyMetricRegistry} with
"name=io.datastorage" instead.
- */
-@Deprecated
-public interface PersistenceMetrics {
- /**
- * Gets the average number of WAL records per second written during the
last time interval.
- * <p>
- * The length of time interval is configured via {@link
PersistentStoreConfiguration#setRateTimeInterval(long)}
- * configurartion property.
- * The number of subintervals is configured via {@link
PersistentStoreConfiguration#setSubIntervals(int)}
- * configuration property.
- *
- * @return The average number of WAL records per second written during the
last time interval.
- */
- public float getWalLoggingRate();
-
- /**
- * Gets the average number of bytes per second written during the last
time interval.
- * The length of time interval is configured via {@link
PersistentStoreConfiguration#setRateTimeInterval(long)}
- * configurartion property.
- * The number of subintervals is configured via {@link
PersistentStoreConfiguration#setSubIntervals(int)}
- * configuration property.
- *
- * @return The average number of bytes per second written during the last
time interval.
- */
- public float getWalWritingRate();
-
- /**
- * @return The current number of WAL segments in the WAL archive.
- */
- public int getWalArchiveSegments();
-
- /**
- * Gets the average WAL fsync duration in microseconds over the last time
interval.
- * <p>
- * The length of time interval is configured via {@link
PersistentStoreConfiguration#setRateTimeInterval(long)}
- * configurartion property.
- * The number of subintervals is configured via {@link
PersistentStoreConfiguration#setSubIntervals(int)}
- * configuration property.
- *
- * @return The average WAL fsync duration in microseconds over the last
time interval.
- */
- public float getWalFsyncTimeAverage();
-
- /**
- * Gets the duration of the last checkpoint in milliseconds.
- *
- * @return Total checkpoint duration in milliseconds.
- */
- public long getLastCheckpointingDuration();
-
- /**
- * Gets the duration of last checkpoint lock wait in milliseconds.
- *
- * @return Checkpoint lock wait time in milliseconds.
- */
- public long getLastCheckpointLockWaitDuration();
-
- /**
- * Gets the duration of last checkpoint mark phase in milliseconds.
- *
- * @return Checkpoint mark duration in milliseconds.
- */
- public long getLastCheckpointMarkDuration();
-
- /**
- * Gets the duration of last checkpoint pages write phase in milliseconds.
- *
- * @return Checkpoint pages write phase in milliseconds.
- */
- public long getLastCheckpointPagesWriteDuration();
-
- /**
- * Gets the duration of the sync phase of the last checkpoint in
milliseconds.
- *
- * @return Checkpoint fsync time in milliseconds.
- */
- public long getLastCheckpointFsyncDuration();
-
- /**
- * Gets the total number of pages written during the last checkpoint.
- *
- * @return Total number of pages written during the last checkpoint.
- */
- public long getLastCheckpointTotalPagesNumber();
-
- /**
- * Gets the number of data pages written during the last checkpoint.
- *
- * @return Total number of data pages written during the last checkpoint.
- */
- public long getLastCheckpointDataPagesNumber();
-
- /**
- * Gets the number of pages copied to a temporary checkpoint buffer during
the last checkpoint.
- *
- * @return Total number of pages copied to a temporary checkpoint buffer
during the last checkpoint.
- */
- public long getLastCheckpointCopiedOnWritePagesNumber();
-}
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 d24a2049463..035e5b8f439 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
@@ -46,7 +46,6 @@ import javax.cache.CacheException;
import org.apache.ignite.DataRegionMetrics;
import org.apache.ignite.DataRegionMetricsAdapter;
import org.apache.ignite.DataStorageMetrics;
-import org.apache.ignite.DataStorageMetricsAdapter;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteAtomicLong;
import org.apache.ignite.IgniteAtomicReference;
@@ -75,7 +74,6 @@ import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.IgniteTransactions;
import org.apache.ignite.Ignition;
import org.apache.ignite.MemoryMetrics;
-import org.apache.ignite.PersistenceMetrics;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cluster.BaselineNode;
import org.apache.ignite.cluster.ClusterGroup;
@@ -2903,11 +2901,6 @@ public class IgniteKernal implements IgniteEx,
Externalizable {
return DataRegionMetricsAdapter.valueOf(dataRegionMetrics(memPlcName));
}
- /** {@inheritDoc} */
- @Override public PersistenceMetrics persistentStoreMetrics() {
- return DataStorageMetricsAdapter.valueOf(dataStorageMetrics());
- }
-
/** {@inheritDoc} */
@Nullable @Override public IgniteAtomicSequence atomicSequence(String
name, long initVal, boolean create) {
return atomicSequence(name, null, initVal, create);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java
index 10457a66b71..33937c4f288 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java
@@ -25,7 +25,6 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteCluster;
import org.apache.ignite.MemoryMetrics;
-import org.apache.ignite.PersistenceMetrics;
import org.apache.ignite.binary.BinaryRawWriter;
import org.apache.ignite.cluster.ClusterMetrics;
import org.apache.ignite.cluster.ClusterNode;
@@ -126,9 +125,6 @@ public class PlatformClusterGroup extends
PlatformAbstractTarget {
/** */
private static final int OP_IS_ACTIVE = 29;
- /** */
- private static final int OP_PERSISTENT_STORE_METRICS = 30;
-
/** */
private static final int OP_GET_COMPUTE = 31;
@@ -192,14 +188,6 @@ public class PlatformClusterGroup extends
PlatformAbstractTarget {
break;
}
- case OP_PERSISTENT_STORE_METRICS: {
- PersistenceMetrics metrics =
prj.ignite().persistentStoreMetrics();
-
- writePersistentStoreMetrics(writer, metrics);
-
- break;
- }
-
case OP_DATA_STORAGE_METRICS: {
DataStorageMetrics metrics = prj.ignite().dataStorageMetrics();
@@ -588,31 +576,6 @@ public class PlatformClusterGroup extends
PlatformAbstractTarget {
writer.writeLong(metrics.getOffheapUsedSize());
}
- /**
- * Writes persistent store metrics.
- *
- * @param writer Writer.
- * @param metrics Metrics
- */
- @SuppressWarnings("deprecation")
- private void writePersistentStoreMetrics(BinaryRawWriter writer,
PersistenceMetrics metrics) {
- assert writer != null;
- assert metrics != null;
-
- writer.writeFloat(metrics.getWalLoggingRate());
- writer.writeFloat(metrics.getWalWritingRate());
- writer.writeInt(metrics.getWalArchiveSegments());
- writer.writeFloat(metrics.getWalFsyncTimeAverage());
- writer.writeLong(metrics.getLastCheckpointingDuration());
- writer.writeLong(metrics.getLastCheckpointLockWaitDuration());
- writer.writeLong(metrics.getLastCheckpointMarkDuration());
- writer.writeLong(metrics.getLastCheckpointPagesWriteDuration());
- writer.writeLong(metrics.getLastCheckpointFsyncDuration());
- writer.writeLong(metrics.getLastCheckpointTotalPagesNumber());
- writer.writeLong(metrics.getLastCheckpointDataPagesNumber());
- writer.writeLong(metrics.getLastCheckpointCopiedOnWritePagesNumber());
- }
-
/**
* Writes data storage metrics.
*
diff --git
a/modules/core/src/main/java/org/apache/ignite/mxbean/PersistenceMetricsMXBean.java
b/modules/core/src/main/java/org/apache/ignite/mxbean/PersistenceMetricsMXBean.java
deleted file mode 100644
index 634494bd8ac..00000000000
---
a/modules/core/src/main/java/org/apache/ignite/mxbean/PersistenceMetricsMXBean.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.mxbean;
-
-import org.apache.ignite.PersistenceMetrics;
-import org.apache.ignite.configuration.PersistentStoreConfiguration;
-
-/**
- * An MX bean allowing to monitor and tune persistence metrics.
- * @deprecated Part of old API. Metrics are accessible through {@link
DataStorageMetricsMXBean}.
- */
-@Deprecated
-public interface PersistenceMetricsMXBean extends PersistenceMetrics {
- /** {@inheritDoc} */
- @MXBeanDescription("Average number of WAL records per second written
during the last time interval.")
- @Override float getWalLoggingRate();
-
- /** {@inheritDoc} */
- @MXBeanDescription("Average number of bytes per second written during the
last time interval.")
- @Override float getWalWritingRate();
-
- /** {@inheritDoc} */
- @MXBeanDescription("Current number of WAL segments in the WAL archive.")
- @Override int getWalArchiveSegments();
-
- /** {@inheritDoc} */
- @MXBeanDescription("Average WAL fsync duration in microseconds over the
last time interval.")
- @Override float getWalFsyncTimeAverage();
-
- /** {@inheritDoc} */
- @MXBeanDescription("Duration of the last checkpoint in milliseconds.")
- @Override long getLastCheckpointingDuration();
-
- /** {@inheritDoc} */
- @MXBeanDescription("Duration of the checkpoint lock wait in milliseconds.")
- @Override long getLastCheckpointLockWaitDuration();
-
- /** {@inheritDoc} */
- @MXBeanDescription("Duration of the checkpoint mark in milliseconds.")
- @Override long getLastCheckpointMarkDuration();
-
- /** {@inheritDoc} */
- @MXBeanDescription("Duration of the checkpoint pages write in
milliseconds.")
- @Override long getLastCheckpointPagesWriteDuration();
-
- /** {@inheritDoc} */
- @MXBeanDescription("Duration of the sync phase of the last checkpoint in
milliseconds.")
- @Override long getLastCheckpointFsyncDuration();
-
- /** {@inheritDoc} */
- @MXBeanDescription("Total number of pages written during the last
checkpoint.")
- @Override long getLastCheckpointTotalPagesNumber();
-
- /** {@inheritDoc} */
- @MXBeanDescription("Total number of data pages written during the last
checkpoint.")
- @Override long getLastCheckpointDataPagesNumber();
-
- /** {@inheritDoc} */
- @MXBeanDescription("Number of pages copied to a temporary checkpoint
buffer during the last checkpoint.")
- @Override long getLastCheckpointCopiedOnWritePagesNumber();
-
- /**
- * Enables persistence metrics collection on an Apache Ignite node.
- */
- @MXBeanDescription("Enables persistence metrics collection on an Apache
Ignite node.")
- public void enableMetrics();
-
- /**
- * Disables persistence metrics collection on an Apache Ignite node.
- */
- @MXBeanDescription("Disables persistence metrics collection on an Apache
Ignite node.")
- public void disableMetrics();
-
- /**
- * Sets time interval for rate-based metrics. Identical to setting
- * {@link PersistentStoreConfiguration#setRateTimeInterval(long)}
configuration property.
- *
- * @param rateTimeInterval Time interval (in milliseconds) used for
allocation and eviction rates calculations.
- */
- @MXBeanDescription(
- "Sets time interval for pages allocation and eviction monitoring
purposes."
- )
- public void rateTimeInterval(
- @MXBeanParameter(name = "rateTimeInterval", description = "Time
interval (in milliseconds) to set.")
- long rateTimeInterval
- );
-
- /**
- * Sets a number of sub-intervals the whole {@link
#rateTimeInterval(long)} will be split into to calculate
- * rate-based metrics. Identical to setting {@link
PersistentStoreConfiguration#setSubIntervals(int)} configuration
- * property.
- *
- * @param subInts A number of sub-intervals.
- */
- @MXBeanDescription(
- "Sets a number of sub-intervals to calculate allocation and eviction
rates metrics."
- )
- public void subIntervals(
- @MXBeanParameter(name = "subInts", description = "Number of
subintervals to set.") int subInts
- );
-}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
index b0ec812a4d3..ffce687cbf6 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
@@ -24,7 +24,6 @@ import javax.management.MBeanServer;
import org.apache.ignite.DataRegionMetrics;
import org.apache.ignite.DataRegionMetricsAdapter;
import org.apache.ignite.DataStorageMetrics;
-import org.apache.ignite.DataStorageMetricsAdapter;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteAtomicLong;
import org.apache.ignite.IgniteAtomicReference;
@@ -51,7 +50,6 @@ import org.apache.ignite.IgniteSet;
import org.apache.ignite.IgniteSnapshot;
import org.apache.ignite.IgniteTransactions;
import org.apache.ignite.MemoryMetrics;
-import org.apache.ignite.PersistenceMetrics;
import org.apache.ignite.binary.BinaryObjectBuilder;
import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.cache.affinity.Affinity;
@@ -506,11 +504,6 @@ public class IgniteMock implements Ignite {
return DataRegionMetricsAdapter.valueOf(dataRegionMetrics(memPlcName));
}
- /** {@inheritDoc} */
- @Override public PersistenceMetrics persistentStoreMetrics() {
- return DataStorageMetricsAdapter.valueOf(dataStorageMetrics());
- }
-
/**
* @param staticCfg Configuration.
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
index 7080a59e817..49364f1a3e6 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
@@ -34,7 +34,6 @@ import javax.cache.CacheException;
import org.apache.ignite.DataRegionMetrics;
import org.apache.ignite.DataRegionMetricsAdapter;
import org.apache.ignite.DataStorageMetrics;
-import org.apache.ignite.DataStorageMetricsAdapter;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteAtomicLong;
import org.apache.ignite.IgniteAtomicReference;
@@ -62,7 +61,6 @@ import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.IgniteTransactions;
import org.apache.ignite.Ignition;
import org.apache.ignite.MemoryMetrics;
-import org.apache.ignite.PersistenceMetrics;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cluster.ClusterGroup;
import org.apache.ignite.cluster.ClusterNode;
@@ -848,11 +846,6 @@ public class IgniteProcessProxy implements IgniteEx {
return DataRegionMetricsAdapter.valueOf(dataRegionMetrics(memPlcName));
}
- /** {@inheritDoc} */
- @Override public PersistenceMetrics persistentStoreMetrics() {
- return DataStorageMetricsAdapter.valueOf(dataStorageMetrics());
- }
-
/** {@inheritDoc} */
@Override public @NotNull TracingConfigurationManager
tracingConfiguration() {
throw new UnsupportedOperationException("Operation isn't supported
yet.");
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/PersistentStoreTestObsolete.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/PersistentStoreTestObsolete.cs
index a58216522e8..4cc31a8b3a8 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/PersistentStoreTestObsolete.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/PersistentStoreTestObsolete.cs
@@ -76,7 +76,7 @@ namespace Apache.Ignite.Core.Tests.Cache
cache[1] = 1;
// Check some metrics.
- var metrics = ignite.GetPersistentStoreMetrics();
+ var metrics = ignite.GetDataStorageMetrics();
Assert.Greater(metrics.WalLoggingRate, 0);
Assert.Greater(metrics.WalFsyncTimeAverage, 0);
}
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/IIgnite.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/IIgnite.cs
index 478bc7bcac5..b2a7a4b6393 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/IIgnite.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/IIgnite.cs
@@ -431,15 +431,6 @@ namespace Apache.Ignite.Core
[Obsolete("Use GetCluster().IsActive instead.")]
bool IsActive();
- /// <summary>
- /// Gets the persistent store metrics.
- /// <para />
- /// To enable metrics set <see
cref="PersistentStoreConfiguration.MetricsEnabled"/> property
- /// in <see cref="IgniteConfiguration.PersistentStoreConfiguration"/>.
- /// </summary>
- [Obsolete("Use GetDataStorageMetrics.")]
- IPersistentStoreMetrics GetPersistentStoreMetrics();
-
/// <summary>
/// Gets a collection of memory metrics, one for each
/// <see cref="DataStorageConfiguration.DataRegionConfigurations"/>.
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cluster/ClusterGroupImpl.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cluster/ClusterGroupImpl.cs
index 09c5b94a763..c99e35fecd8 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cluster/ClusterGroupImpl.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cluster/ClusterGroupImpl.cs
@@ -35,10 +35,8 @@ namespace Apache.Ignite.Core.Impl.Cluster
using Apache.Ignite.Core.Impl.Compute;
using Apache.Ignite.Core.Impl.Events;
using Apache.Ignite.Core.Impl.Messaging;
- using Apache.Ignite.Core.Impl.PersistentStore;
using Apache.Ignite.Core.Impl.Services;
using Apache.Ignite.Core.Messaging;
- using Apache.Ignite.Core.PersistentStore;
using Apache.Ignite.Core.Services;
/// <summary>
@@ -130,9 +128,6 @@ namespace Apache.Ignite.Core.Impl.Cluster
/** */
private const int OpIsActive = 29;
- /** */
- private const int OpGetPersistentStoreMetrics = 30;
-
/** */
private const int OpGetCompute = 31;
@@ -709,17 +704,6 @@ namespace Apache.Ignite.Core.Impl.Cluster
return DoOutInOp(OpIsActive) == True;
}
- /// <summary>
- /// Gets the persistent store metrics.
- /// </summary>
-#pragma warning disable 618
- public IPersistentStoreMetrics GetPersistentStoreMetrics()
- {
- return DoInOp(OpGetPersistentStoreMetrics, stream =>
- new PersistentStoreMetrics(Marshaller.StartUnmarshal(stream,
false)));
- }
-#pragma warning restore 618
-
/// <summary>
/// Clears cached node data.
/// </summary>
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Ignite.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Ignite.cs
index 640f47219c3..1438b4688e9 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Ignite.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Ignite.cs
@@ -974,14 +974,6 @@ namespace Apache.Ignite.Core.Impl
DoOutInOp((int) Op.SetBaselineAutoAdjustTimeout,
baselineAutoAdjustTimeout);
}
- /** <inheritdoc /> */
-#pragma warning disable 618
- public IPersistentStoreMetrics GetPersistentStoreMetrics()
- {
- return _prj.GetPersistentStoreMetrics();
- }
-#pragma warning restore 618
-
/** <inheritdoc /> */
public ICollection<IDataRegionMetrics> GetDataRegionMetrics()
{
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PersistentStore/PersistentStoreMetrics.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PersistentStore/PersistentStoreMetrics.cs
deleted file mode 100644
index 7eeabb210b7..00000000000
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PersistentStore/PersistentStoreMetrics.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-namespace Apache.Ignite.Core.Impl.PersistentStore
-{
- using System;
- using System.Diagnostics;
- using Apache.Ignite.Core.Binary;
- using Apache.Ignite.Core.Impl.Binary;
- using Apache.Ignite.Core.PersistentStore;
-
- /// <summary>
- /// Persistent store metrics.
- /// </summary>
-#pragma warning disable 618
- internal class PersistentStoreMetrics : IPersistentStoreMetrics
-#pragma warning restore 618
- {
- /// <summary>
- /// Initializes a new instance of the <see
cref="PersistentStoreMetrics"/> class.
- /// </summary>
- public PersistentStoreMetrics(IBinaryRawReader reader)
- {
- Debug.Assert(reader != null);
-
- WalLoggingRate = reader.ReadFloat();
- WalWritingRate = reader.ReadFloat();
- WalArchiveSegments = reader.ReadInt();
- WalFsyncTimeAverage = reader.ReadFloat();
- LastCheckpointingDuration = reader.ReadLongAsTimespan();
- LastCheckpointLockWaitDuration = reader.ReadLongAsTimespan();
- LastCheckpointMarkDuration = reader.ReadLongAsTimespan();
- LastCheckpointPagesWriteDuration = reader.ReadLongAsTimespan();
- LastCheckpointFsyncDuration = reader.ReadLongAsTimespan();
- LastCheckpointTotalPagesNumber = reader.ReadLong();
- LastCheckpointDataPagesNumber = reader.ReadLong();
- LastCheckpointCopiedOnWritePagesNumber = reader.ReadLong();
- }
-
- /** <inheritdoc /> */
- public float WalLoggingRate { get; private set; }
-
- /** <inheritdoc /> */
- public float WalWritingRate { get; private set; }
-
- /** <inheritdoc /> */
- public int WalArchiveSegments { get; private set; }
-
- /** <inheritdoc /> */
- public float WalFsyncTimeAverage { get; private set; }
-
- /** <inheritdoc /> */
- public TimeSpan LastCheckpointingDuration { get; private set; }
-
- /** <inheritdoc /> */
- public TimeSpan LastCheckpointLockWaitDuration { get; private set; }
-
- /** <inheritdoc /> */
- public TimeSpan LastCheckpointMarkDuration { get; private set; }
-
- /** <inheritdoc /> */
- public TimeSpan LastCheckpointPagesWriteDuration { get; private set; }
-
- /** <inheritdoc /> */
- public TimeSpan LastCheckpointFsyncDuration { get; private set; }
-
- /** <inheritdoc /> */
- public long LastCheckpointTotalPagesNumber { get; private set; }
-
- /** <inheritdoc /> */
- public long LastCheckpointDataPagesNumber { get; private set; }
-
- /** <inheritdoc /> */
- public long LastCheckpointCopiedOnWritePagesNumber { get; private set;
}
- }
-}
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/PersistentStore/IPersistentStoreMetrics.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/PersistentStore/IPersistentStoreMetrics.cs
deleted file mode 100644
index 989dbd805ee..00000000000
---
a/modules/platforms/dotnet/Apache.Ignite.Core/PersistentStore/IPersistentStoreMetrics.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-namespace Apache.Ignite.Core.PersistentStore
-{
- using System;
-
- /// <summary>
- /// Persistent store metrics.
- /// Obsolete, see <see cref="IDataStorageMetrics"/>.
- /// </summary>
- [Obsolete("Use IDataStorageMetrics")]
- public interface IPersistentStoreMetrics
- {
- /// <summary>
- /// Gets the average number of WAL records per second written during
the last time interval.
- /// </summary>
- float WalLoggingRate { get; }
-
- /// <summary>
- /// Gets the average number of bytes per second written during the
last time interval.
- /// </summary>
- float WalWritingRate { get; }
-
- /// <summary>
- /// Gets the current number of WAL segments in the WAL archive.
- /// </summary>
- int WalArchiveSegments { get; }
-
- /// <summary>
- /// Gets the average WAL fsync duration in microseconds over the last
time interval.
- /// </summary>
- float WalFsyncTimeAverage { get; }
-
- /// <summary>
- /// Gets the duration of the last checkpoint.
- /// </summary>
- TimeSpan LastCheckpointingDuration { get; }
-
- /// <summary>
- /// Gets the duration of last checkpoint lock wait.
- /// </summary>
- TimeSpan LastCheckpointLockWaitDuration { get; }
-
- /// <summary>
- /// Gets the duration of last checkpoint mark phase.
- /// </summary>
- TimeSpan LastCheckpointMarkDuration { get; }
-
- /// <summary>
- /// Gets the duration of last checkpoint pages write phase.
- /// </summary>
- TimeSpan LastCheckpointPagesWriteDuration { get; }
-
- /// <summary>
- /// Gets the duration of the sync phase of the last checkpoint.
- /// </summary>
- TimeSpan LastCheckpointFsyncDuration { get; }
-
- /// <summary>
- /// Gets the total number of pages written during the last checkpoint.
- /// </summary>
- long LastCheckpointTotalPagesNumber { get; }
-
- /// <summary>
- /// Gets the number of data pages written during the last checkpoint.
- /// </summary>
- long LastCheckpointDataPagesNumber { get; }
-
- /// <summary>
- /// Gets the number of pages copied to a temporary checkpoint buffer
during the last checkpoint.
- /// </summary>
- long LastCheckpointCopiedOnWritePagesNumber { get; }
- }
-}
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/PersistentStore/PersistentStoreConfiguration.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/PersistentStore/PersistentStoreConfiguration.cs
index e211126b9dc..9ae0a0bb882 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/PersistentStore/PersistentStoreConfiguration.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/PersistentStore/PersistentStoreConfiguration.cs
@@ -300,7 +300,7 @@ namespace Apache.Ignite.Core.PersistentStore
/// <summary>
/// Gets or sets a value indicating whether to enable persistent store
metrics.
- /// See <see cref="IIgnite.GetPersistentStoreMetrics"/>.
+ /// See <see cref="IIgnite.GetDataStorageMetrics"/>.
/// </summary>
public bool MetricsEnabled { get; set; }
diff --git
a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
index 40bea2346cf..c10af90d36a 100644
--- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
+++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
@@ -340,11 +340,6 @@ public class IgniteSpringBean implements Ignite,
DisposableBean, SmartInitializi
return DataRegionMetricsAdapter.valueOf(dataRegionMetrics(memPlcName));
}
- /** {@inheritDoc} */
- @Override public PersistenceMetrics persistentStoreMetrics() {
- return DataStorageMetricsAdapter.valueOf(dataStorageMetrics());
- }
-
/** {@inheritDoc} */
@Override public <K, V> IgniteCache<K, V> cache(@Nullable String name) {
checkIgnite();
