IGNITE-13743 Defragmentation JMX bean.

gridgain · Nov 25, 2020 · 4e66dbe · 4e66dbe
1 parent 386142d
commit 4e66dbe
Show file tree

Hide file tree

Showing 13 changed files with 1,222 additions and 185 deletions.
diff --git a/...-utility/src/main/java/org/apache/ignite/internal/commandline/DefragmentationCommand.java b/...-utility/src/main/java/org/apache/ignite/internal/commandline/DefragmentationCommand.java
@@ -226,7 +226,6 @@ private void printResult(VisorDefragmentationTaskResult res, Logger log) {
     private VisorDefragmentationTaskArg convertArguments() {
         return new VisorDefragmentationTaskArg(
             convertSubcommand(args.subcommand()),
-            args.nodeIds(),
             args.cacheNames()
         );
     }

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -22,6 +22,7 @@
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 
+import org.apache.ignite.internal.processors.cache.persistence.defragmentation.IgniteDefragmentation;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager;
@@ -452,6 +453,13 @@ public interface GridKernalContext extends Iterable<GridComponent> {
      */
     public GridEncryptionManager encryption();
 
+    /**
+     * Gets defragmentation manager.
+     *
+     * @return Defragmentation manager.
+     */
+    public IgniteDefragmentation defragmentation();
+
     /**
      * Gets workers registry.
      *

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -58,6 +58,8 @@
 import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
 import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
 import org.apache.ignite.internal.processors.cache.mvcc.MvccProcessor;
+import org.apache.ignite.internal.processors.cache.persistence.defragmentation.IgniteDefragmentation;
+import org.apache.ignite.internal.processors.cache.persistence.defragmentation.IgniteDefragmentationImpl;
 import org.apache.ignite.internal.processors.cache.persistence.filename.PdsFoldersResolver;
 import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
 import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
@@ -174,6 +176,10 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
     @GridToStringExclude
     private GridEncryptionManager encryptionMgr;
 
+    /** */
+    @GridToStringExclude
+    private IgniteDefragmentation defragMgr;
+
     /** */
     @GridToStringExclude
     private GridTracingManager tracingMgr;
@@ -557,6 +563,8 @@ protected GridKernalContextImpl(
 
         marshCtx = new MarshallerContextImpl(plugins, clsFilter);
 
+        defragMgr = new IgniteDefragmentationImpl(this);
+
         try {
             spring = SPRING.create(false);
         }
@@ -906,6 +914,11 @@ public void addHelper(Object helper) {
         return encryptionMgr;
     }
 
+    /** {@inheritDoc} */
+    @Override public IgniteDefragmentation defragmentation() {
+        return defragMgr;
+    }
+
     /** {@inheritDoc} */
     @Override public WorkersRegistry workersRegistry() {
         return workersRegistry;

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/IgniteMBeansManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/IgniteMBeansManager.java
@@ -38,6 +38,7 @@
 import org.apache.ignite.internal.TransactionsMXBeanImpl;
 import org.apache.ignite.internal.managers.encryption.EncryptionMXBeanImpl;
 import org.apache.ignite.internal.processors.cache.persistence.DataStorageMXBeanImpl;
+import org.apache.ignite.internal.processors.cache.persistence.defragmentation.DefragmentationMXBeanImpl;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotMXBeanImpl;
 import org.apache.ignite.internal.processors.cache.warmup.WarmUpMXBeanImpl;
 import org.apache.ignite.internal.processors.cluster.BaselineAutoAdjustMXBeanImpl;
@@ -51,6 +52,7 @@
 import org.apache.ignite.mxbean.ClusterMetricsMXBean;
 import org.apache.ignite.mxbean.ComputeMXBean;
 import org.apache.ignite.mxbean.DataStorageMXBean;
+import org.apache.ignite.mxbean.DefragmentationMXBean;
 import org.apache.ignite.mxbean.EncryptionMXBean;
 import org.apache.ignite.mxbean.FailureHandlingMxBean;
 import org.apache.ignite.mxbean.IgniteMXBean;
@@ -185,6 +187,10 @@ public void registerMBeansAfterNodeStarted(
         SnapshotMXBean snpMXBean = new SnapshotMXBeanImpl(ctx);
         registerMBean("Snapshot", snpMXBean.getClass().getSimpleName(), snpMXBean, SnapshotMXBean.class);
 
+        // Defragmentation.
+        DefragmentationMXBean defragMXBean = new DefragmentationMXBeanImpl(ctx);
+        registerMBean("Defragmentation", defragMXBean.getClass().getSimpleName(), defragMXBean, DefragmentationMXBean.class);
+
         // Metrics configuration
         MetricsMxBean metricsMxBean = new MetricsMxBeanImpl(ctx.metric(), log);
         registerMBean("Metrics", metricsMxBean.getClass().getSimpleName(), metricsMxBean, MetricsMxBean.class);