This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch IGNITE-19753
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/IGNITE-19753 by this push:
new 577d554256e IGNITE-19781 move Diagnostic and Meta task classes into
"org.apache.ignite.internal.management" package (#10793)
577d554256e is described below
commit 577d554256e6085bef67b248e66acfea0213a58f
Author: Valery Shorin <[email protected]>
AuthorDate: Tue Jun 20 17:37:18 2023 +0300
IGNITE-19781 move Diagnostic and Meta task classes into
"org.apache.ignite.internal.management" package (#10793)
---
.../diagnostic/ConnectivityResult.java} | 8 +++---
.../diagnostic/ConnectivityTask.java} | 27 +++++++++---------
.../diagnostic/DiagnosticConnectivityCommand.java | 14 ++++------
.../diagnostic/DiagnosticPagelocksCommand.java | 10 +++----
.../diagnostic/DiagnosticPagelocksCommandArg.java | 4 +--
.../diagnostic/Operation.java | 4 +--
.../diagnostic/PageLocksResult.java} | 8 +++---
.../diagnostic/PageLocksTask.java} | 27 +++++++++---------
.../management/meta/MetaDetailsCommand.java | 2 --
.../internal/management/meta/MetaListCommand.java | 2 --
.../management/meta/MetaRemoveCommand.java | 2 --
.../management/meta/MetaUpdateCommand.java | 2 --
.../meta}/MetadataInfoTask.java | 3 +-
.../meta}/MetadataListResult.java | 2 +-
.../meta}/MetadataMarshalled.java | 2 +-
.../meta}/MetadataRemoveTask.java | 5 ++--
.../meta}/MetadataUpdateTask.java | 3 +-
.../main/resources/META-INF/classnames.properties | 32 +++++++++++-----------
18 files changed, 70 insertions(+), 87 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/availability/VisorConnectivityResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/ConnectivityResult.java
similarity index 88%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/availability/VisorConnectivityResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/ConnectivityResult.java
index 7f83d90bf50..3a910585920 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/availability/VisorConnectivityResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/ConnectivityResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.diagnostic.availability;
+package org.apache.ignite.internal.management.diagnostic;
import java.io.IOException;
import java.io.ObjectInput;
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable;
/**
* Connectivity task result
*/
-public class VisorConnectivityResult extends IgniteDataTransferObject {
+public class ConnectivityResult extends IgniteDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -39,13 +39,13 @@ public class VisorConnectivityResult extends
IgniteDataTransferObject {
/**
* Default constructor.
*/
- public VisorConnectivityResult() {
+ public ConnectivityResult() {
}
/**
* @param nodeStatuses Node statuses.
*/
- public VisorConnectivityResult(@Nullable Map<ClusterNode, Boolean>
nodeStatuses) {
+ public ConnectivityResult(@Nullable Map<ClusterNode, Boolean>
nodeStatuses) {
this.nodeStatuses = nodeStatuses;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/availability/VisorConnectivityTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/ConnectivityTask.java
similarity index 78%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/availability/VisorConnectivityTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/ConnectivityTask.java
index 4326fde106a..053868e84a2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/availability/VisorConnectivityTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/ConnectivityTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.diagnostic.availability;
+package org.apache.ignite.internal.management.diagnostic;
import java.util.ArrayList;
import java.util.Arrays;
@@ -30,7 +30,6 @@ import java.util.stream.Collectors;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.compute.ComputeJobResult;
-import
org.apache.ignite.internal.management.diagnostic.DiagnosticConnectivityCommandArg;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.visor.VisorJob;
@@ -44,27 +43,27 @@ import org.jetbrains.annotations.Nullable;
* Visor task that checks connectivity status between nodes.
*/
@GridInternal
-public class VisorConnectivityTask
- extends VisorMultiNodeTask<DiagnosticConnectivityCommandArg,
Map<ClusterNode, VisorConnectivityResult>, VisorConnectivityResult> {
+public class ConnectivityTask
+ extends VisorMultiNodeTask<DiagnosticConnectivityCommandArg,
Map<ClusterNode, ConnectivityResult>, ConnectivityResult> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Override protected VisorJob<DiagnosticConnectivityCommandArg,
VisorConnectivityResult> job(DiagnosticConnectivityCommandArg arg) {
- return new VisorConnectivityJob(arg, debug);
+ @Override protected VisorJob<DiagnosticConnectivityCommandArg,
ConnectivityResult> job(DiagnosticConnectivityCommandArg arg) {
+ return new ConnectivityJob(arg, debug);
}
/** {@inheritDoc} */
- @Nullable @Override protected Map<ClusterNode, VisorConnectivityResult>
reduce0(
+ @Nullable @Override protected Map<ClusterNode, ConnectivityResult> reduce0(
List<ComputeJobResult> results) throws IgniteException {
- Map<ClusterNode, VisorConnectivityResult> map = new HashMap<>();
+ Map<ClusterNode, ConnectivityResult> map = new HashMap<>();
results.forEach(result -> {
if (result.getException() != null)
return;
final ClusterNode node = result.getNode();
- final VisorConnectivityResult data = result.getData();
+ final ConnectivityResult data = result.getData();
map.put(node, data);
});
@@ -80,7 +79,7 @@ public class VisorConnectivityTask
* This job is sent to every node in cluster. It then use compute on every
other node just to check
* that there is a connection between nodes.
*/
- private static class VisorConnectivityJob extends
VisorJob<DiagnosticConnectivityCommandArg, VisorConnectivityResult> {
+ private static class ConnectivityJob extends
VisorJob<DiagnosticConnectivityCommandArg, ConnectivityResult> {
/** */
private static final long serialVersionUID = 0L;
@@ -88,12 +87,12 @@ public class VisorConnectivityTask
* @param arg Formal job argument.
* @param debug Debug flag.
*/
- private VisorConnectivityJob(DiagnosticConnectivityCommandArg arg,
boolean debug) {
+ private ConnectivityJob(DiagnosticConnectivityCommandArg arg, boolean
debug) {
super(arg, debug);
}
/** {@inheritDoc} */
- @Override protected VisorConnectivityResult
run(DiagnosticConnectivityCommandArg arg) {
+ @Override protected ConnectivityResult
run(DiagnosticConnectivityCommandArg arg) {
List<UUID> ids = ignite.cluster().nodes().stream()
.map(ClusterNode::id)
.filter(uuid -> !Objects.equals(ignite.localNode().id(), uuid))
@@ -116,12 +115,12 @@ public class VisorConnectivityTask
}
}
- return new VisorConnectivityResult(statuses);
+ return new ConnectivityResult(statuses);
}
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorConnectivityJob.class, this);
+ return S.toString(ConnectivityJob.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticConnectivityCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticConnectivityCommand.java
index 4c87d19594d..d6f1ecf5713 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticConnectivityCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticConnectivityCommand.java
@@ -29,14 +29,12 @@ import java.util.stream.Collectors;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.internal.client.GridClientNode;
import org.apache.ignite.internal.management.api.ComputeCommand;
-import
org.apache.ignite.internal.visor.diagnostic.availability.VisorConnectivityResult;
-import
org.apache.ignite.internal.visor.diagnostic.availability.VisorConnectivityTask;
import static org.apache.ignite.internal.util.IgniteUtils.EMPTY_UUIDS;
/** */
public class DiagnosticConnectivityCommand
- implements ComputeCommand<DiagnosticConnectivityCommandArg,
Map<ClusterNode, VisorConnectivityResult>> {
+ implements ComputeCommand<DiagnosticConnectivityCommandArg,
Map<ClusterNode, ConnectivityResult>> {
/**
* Header of output table.
*/
@@ -71,8 +69,8 @@ public class DiagnosticConnectivityCommand
}
/** {@inheritDoc} */
- @Override public Class<VisorConnectivityTask> taskClass() {
- return VisorConnectivityTask.class;
+ @Override public Class<ConnectivityTask> taskClass() {
+ return ConnectivityTask.class;
}
/** {@inheritDoc} */
@@ -86,7 +84,7 @@ public class DiagnosticConnectivityCommand
/** {@inheritDoc} */
@Override public void printResult(
DiagnosticConnectivityCommandArg arg,
- Map<ClusterNode, VisorConnectivityResult> res,
+ Map<ClusterNode, ConnectivityResult> res,
Consumer<String> printer
) {
final boolean[] hasFailed = {false};
@@ -95,14 +93,14 @@ public class DiagnosticConnectivityCommand
table.add(TABLE_HEADER);
- for (Map.Entry<ClusterNode, VisorConnectivityResult> entry :
res.entrySet()) {
+ for (Map.Entry<ClusterNode, ConnectivityResult> entry :
res.entrySet()) {
ClusterNode key = entry.getKey();
String id = key.id().toString();
String consId = key.consistentId().toString();
String isClient = key.isClient() ? NODE_TYPE_CLIENT :
NODE_TYPE_SERVER;
- VisorConnectivityResult value = entry.getValue();
+ ConnectivityResult value = entry.getValue();
Map<ClusterNode, Boolean> statuses = value.getNodeIds();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticPagelocksCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticPagelocksCommand.java
index c5b2c00c0f7..0907b0ef361 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticPagelocksCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticPagelocksCommand.java
@@ -29,11 +29,9 @@ import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.internal.client.GridClientNode;
import org.apache.ignite.internal.management.api.ComputeCommand;
import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.visor.diagnostic.VisorPageLocksResult;
-import org.apache.ignite.internal.visor.diagnostic.VisorPageLocksTask;
/** */
-public class DiagnosticPagelocksCommand implements
ComputeCommand<DiagnosticPagelocksCommandArg, Map<ClusterNode,
VisorPageLocksResult>> {
+public class DiagnosticPagelocksCommand implements
ComputeCommand<DiagnosticPagelocksCommandArg, Map<ClusterNode,
PageLocksResult>> {
/** {@inheritDoc} */
@Override public String description() {
return "View pages locks state information on the node or nodes";
@@ -45,8 +43,8 @@ public class DiagnosticPagelocksCommand implements
ComputeCommand<DiagnosticPage
}
/** {@inheritDoc} */
- @Override public Class<VisorPageLocksTask> taskClass() {
- return VisorPageLocksTask.class;
+ @Override public Class<PageLocksTask> taskClass() {
+ return PageLocksTask.class;
}
/** {@inheritDoc} */
@@ -69,7 +67,7 @@ public class DiagnosticPagelocksCommand implements
ComputeCommand<DiagnosticPage
/** {@inheritDoc} */
@Override public void printResult(
DiagnosticPagelocksCommandArg arg,
- Map<ClusterNode, VisorPageLocksResult> res,
+ Map<ClusterNode, PageLocksResult> res,
Consumer<String> printer
) {
res.forEach((n, res0) -> printer.accept(n.id() + " (" +
n.consistentId() + ") " + res0.result()));
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticPagelocksCommandArg.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticPagelocksCommandArg.java
index 04d1476cfdd..eb0e7d7def6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticPagelocksCommandArg.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticPagelocksCommandArg.java
@@ -26,8 +26,8 @@ import
org.apache.ignite.internal.management.api.ArgumentGroup;
import org.apache.ignite.internal.management.api.EnumDescription;
import org.apache.ignite.internal.management.api.Positional;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.diagnostic.Operation;
-import static org.apache.ignite.internal.visor.diagnostic.Operation.DUMP_LOG;
+
+import static
org.apache.ignite.internal.management.diagnostic.Operation.DUMP_LOG;
/** */
@ArgumentGroup(value = {"all", "nodes"}, onlyOneOf = true, optional = true)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/Operation.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/Operation.java
similarity index 90%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/Operation.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/Operation.java
index 5fbdde48c24..35aa56a801c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/Operation.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/Operation.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.diagnostic;
+package org.apache.ignite.internal.management.diagnostic;
/**
- * Operation type for {@link VisorPageLocksTask}
+ * Operation type for {@link PageLocksTask}
*/
public enum Operation {
/** Dump page locks to file operation. */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/VisorPageLocksResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/PageLocksResult.java
similarity index 89%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/VisorPageLocksResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/PageLocksResult.java
index 8a6253cf4e5..abc04da1a7c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/VisorPageLocksResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/PageLocksResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.diagnostic;
+package org.apache.ignite.internal.management.diagnostic;
import java.io.IOException;
import java.io.ObjectInput;
@@ -26,7 +26,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
/**
*
*/
-public class VisorPageLocksResult extends IgniteDataTransferObject {
+public class PageLocksResult extends IgniteDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -36,14 +36,14 @@ public class VisorPageLocksResult extends
IgniteDataTransferObject {
/**
*
*/
- public VisorPageLocksResult() {
+ public PageLocksResult() {
//No-op.
}
/**
* @param payload Result payload as string.
*/
- public VisorPageLocksResult(String payload) {
+ public PageLocksResult(String payload) {
this.payload = payload;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/VisorPageLocksTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/PageLocksTask.java
similarity index 77%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/VisorPageLocksTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/PageLocksTask.java
index 118b64332f8..2e21326983c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/diagnostic/VisorPageLocksTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/PageLocksTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.diagnostic;
+package org.apache.ignite.internal.management.diagnostic;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -27,7 +27,6 @@ import org.apache.ignite.IgniteException;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.internal.cluster.NodeOrderComparator;
-import
org.apache.ignite.internal.management.diagnostic.DiagnosticPagelocksCommandArg;
import
org.apache.ignite.internal.processors.cache.persistence.diagnostic.pagelocktracker.PageLockTrackerManager;
import
org.apache.ignite.internal.processors.cache.persistence.diagnostic.pagelocktracker.dumpprocessors.ToStringDumpHelper;
import org.apache.ignite.internal.processors.task.GridInternal;
@@ -38,23 +37,23 @@ import org.jetbrains.annotations.Nullable;
/** */
@GridInternal
-public class VisorPageLocksTask
- extends VisorMultiNodeTask<DiagnosticPagelocksCommandArg, Map<ClusterNode,
VisorPageLocksResult>, VisorPageLocksResult> {
+public class PageLocksTask
+ extends VisorMultiNodeTask<DiagnosticPagelocksCommandArg, Map<ClusterNode,
PageLocksResult>, PageLocksResult> {
/**
*
*/
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Override protected VisorJob<DiagnosticPagelocksCommandArg,
VisorPageLocksResult> job(DiagnosticPagelocksCommandArg arg) {
- return new VisorPageLocksTrackerJob(arg, debug);
+ @Override protected VisorJob<DiagnosticPagelocksCommandArg,
PageLocksResult> job(DiagnosticPagelocksCommandArg arg) {
+ return new PageLocksTrackerJob(arg, debug);
}
/** {@inheritDoc} */
- @Nullable @Override protected Map<ClusterNode, VisorPageLocksResult>
reduce0(
+ @Nullable @Override protected Map<ClusterNode, PageLocksResult> reduce0(
List<ComputeJobResult> results
) throws IgniteException {
- Map<ClusterNode, VisorPageLocksResult> mapRes = new
TreeMap<>(NodeOrderComparator.getInstance());
+ Map<ClusterNode, PageLocksResult> mapRes = new
TreeMap<>(NodeOrderComparator.getInstance());
results.forEach(j -> {
if (j.getException() == null)
@@ -65,7 +64,7 @@ public class VisorPageLocksTask
j.getException().printStackTrace(pw);
- mapRes.put(j.getNode(), new
VisorPageLocksResult(sw.toString()));
+ mapRes.put(j.getNode(), new PageLocksResult(sw.toString()));
}
});
@@ -75,7 +74,7 @@ public class VisorPageLocksTask
/**
*
*/
- private static class VisorPageLocksTrackerJob extends
VisorJob<DiagnosticPagelocksCommandArg, VisorPageLocksResult> {
+ private static class PageLocksTrackerJob extends
VisorJob<DiagnosticPagelocksCommandArg, PageLocksResult> {
/** */
private static final long serialVersionUID = 0L;
@@ -83,12 +82,12 @@ public class VisorPageLocksTask
* @param arg Formal job argument.
* @param debug Debug flag.
*/
- private VisorPageLocksTrackerJob(DiagnosticPagelocksCommandArg arg,
boolean debug) {
+ private PageLocksTrackerJob(DiagnosticPagelocksCommandArg arg, boolean
debug) {
super(arg, debug);
}
/** {@inheritDoc} */
- @Override protected VisorPageLocksResult
run(DiagnosticPagelocksCommandArg arg) {
+ @Override protected PageLocksResult run(DiagnosticPagelocksCommandArg
arg) {
PageLockTrackerManager lockTrackerMgr =
ignite.context().cache().context().diagnostic().pageLockTracker();
String result;
@@ -113,12 +112,12 @@ public class VisorPageLocksTask
result = "Unsupported operation: " + arg.operation();
}
- return new VisorPageLocksResult(result);
+ return new PageLocksResult(result);
}
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorPageLocksTrackerJob.class, this);
+ return S.toString(PageLocksTrackerJob.class, this);
}
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaDetailsCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaDetailsCommand.java
index 29c7279d5ed..d42486fc6cb 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaDetailsCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaDetailsCommand.java
@@ -24,8 +24,6 @@ import java.util.function.Consumer;
import java.util.stream.Collectors;
import org.apache.ignite.internal.binary.BinaryMetadata;
import org.apache.ignite.internal.binary.BinaryUtils;
-import org.apache.ignite.internal.commandline.meta.tasks.MetadataInfoTask;
-import org.apache.ignite.internal.commandline.meta.tasks.MetadataListResult;
import org.apache.ignite.internal.dto.IgniteDataTransferObject;
import org.apache.ignite.internal.management.api.ComputeCommand;
import org.apache.ignite.internal.util.typedef.F;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaListCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaListCommand.java
index 48d7a4ce762..061650996e2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaListCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaListCommand.java
@@ -19,8 +19,6 @@ package org.apache.ignite.internal.management.meta;
import java.util.function.Consumer;
import org.apache.ignite.internal.binary.BinaryMetadata;
-import org.apache.ignite.internal.commandline.meta.tasks.MetadataInfoTask;
-import org.apache.ignite.internal.commandline.meta.tasks.MetadataListResult;
import org.apache.ignite.internal.dto.IgniteDataTransferObject;
import org.apache.ignite.internal.management.api.ComputeCommand;
import org.apache.ignite.internal.management.api.NoArg;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaRemoveCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaRemoveCommand.java
index 9beebb645ff..9040ca76283 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaRemoveCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaRemoveCommand.java
@@ -25,8 +25,6 @@ import java.nio.file.Path;
import java.util.function.Consumer;
import org.apache.ignite.internal.binary.BinaryMetadata;
import org.apache.ignite.internal.binary.BinaryUtils;
-import org.apache.ignite.internal.commandline.meta.tasks.MetadataMarshalled;
-import org.apache.ignite.internal.commandline.meta.tasks.MetadataRemoveTask;
import org.apache.ignite.internal.management.api.ComputeCommand;
import org.apache.ignite.lang.IgniteExperimental;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaUpdateCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaUpdateCommand.java
index 8a23ef0e1b5..082421d4281 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaUpdateCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaUpdateCommand.java
@@ -19,8 +19,6 @@ package org.apache.ignite.internal.management.meta;
import java.util.function.Consumer;
import org.apache.ignite.internal.binary.BinaryMetadata;
-import org.apache.ignite.internal.commandline.meta.tasks.MetadataMarshalled;
-import org.apache.ignite.internal.commandline.meta.tasks.MetadataUpdateTask;
import org.apache.ignite.internal.management.api.ComputeCommand;
import org.apache.ignite.lang.IgniteExperimental;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/meta/tasks/MetadataInfoTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataInfoTask.java
similarity index 96%
rename from
modules/core/src/main/java/org/apache/ignite/internal/commandline/meta/tasks/MetadataInfoTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataInfoTask.java
index eb959e8a7ee..b244a810720 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/meta/tasks/MetadataInfoTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataInfoTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.commandline.meta.tasks;
+package org.apache.ignite.internal.management.meta;
import java.util.Collections;
import java.util.List;
@@ -25,7 +25,6 @@ import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.binary.BinaryMetadata;
import org.apache.ignite.internal.dto.IgniteDataTransferObject;
import org.apache.ignite.internal.management.api.NoArg;
-import org.apache.ignite.internal.management.meta.MetaDetailsCommandArg;
import
org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.visor.VisorJob;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/meta/tasks/MetadataListResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataListResult.java
similarity index 97%
rename from
modules/core/src/main/java/org/apache/ignite/internal/commandline/meta/tasks/MetadataListResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataListResult.java
index 7bcf6af806b..894cac76199 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/meta/tasks/MetadataListResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataListResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.commandline.meta.tasks;
+package org.apache.ignite.internal.management.meta;
import java.io.IOException;
import java.io.ObjectInput;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/meta/tasks/MetadataMarshalled.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataMarshalled.java
similarity index 97%
rename from
modules/core/src/main/java/org/apache/ignite/internal/commandline/meta/tasks/MetadataMarshalled.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataMarshalled.java
index fbe7c676d92..59322af8f57 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/meta/tasks/MetadataMarshalled.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataMarshalled.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.commandline.meta.tasks;
+package org.apache.ignite.internal.management.meta;
import java.io.IOException;
import java.io.ObjectInput;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/meta/tasks/MetadataRemoveTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataRemoveTask.java
similarity index 96%
rename from
modules/core/src/main/java/org/apache/ignite/internal/commandline/meta/tasks/MetadataRemoveTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataRemoveTask.java
index 2aad57cac21..e27e701d33b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/meta/tasks/MetadataRemoveTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataRemoveTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.commandline.meta.tasks;
+package org.apache.ignite.internal.management.meta;
import java.util.List;
import java.util.Objects;
@@ -26,7 +26,6 @@ import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.binary.BinaryMetadata;
-import org.apache.ignite.internal.management.meta.MetaRemoveCommandArg;
import
org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -39,7 +38,7 @@ import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.resources.JobContextResource;
import org.jetbrains.annotations.Nullable;
import static org.apache.ignite.internal.GridClosureCallMode.BROADCAST;
-import static
org.apache.ignite.internal.commandline.meta.tasks.MetadataInfoTask.typeId;
+import static
org.apache.ignite.internal.management.meta.MetadataInfoTask.typeId;
import static
org.apache.ignite.internal.processors.task.TaskExecutionOptions.options;
import static
org.apache.ignite.plugin.security.SecurityPermission.ADMIN_METADATA_OPS;
import static
org.apache.ignite.plugin.security.SecurityPermissionSetBuilder.systemPermissions;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/meta/tasks/MetadataUpdateTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataUpdateTask.java
similarity index 96%
rename from
modules/core/src/main/java/org/apache/ignite/internal/commandline/meta/tasks/MetadataUpdateTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataUpdateTask.java
index bb0bf25bd42..4f3964c18b6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/meta/tasks/MetadataUpdateTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataUpdateTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.commandline.meta.tasks;
+package org.apache.ignite.internal.management.meta;
import java.util.List;
import java.util.Objects;
@@ -23,7 +23,6 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.internal.binary.BinaryMetadata;
-import org.apache.ignite.internal.management.meta.MetaUpdateCommandArg;
import
org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.typedef.internal.U;
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties
b/modules/core/src/main/resources/META-INF/classnames.properties
index aa0829ae146..85ca7d984ba 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -368,15 +368,15 @@
org.apache.ignite.internal.commandline.cache.reset_lost_partitions.CacheResetLos
org.apache.ignite.internal.commandline.cache.reset_lost_partitions.CacheResetLostPartitionsTask$CacheResetLostPartitionsJob
org.apache.ignite.internal.commandline.cache.reset_lost_partitions.CacheResetLostPartitionsTaskResult
org.apache.ignite.internal.commandline.meta.subcommands.VoidDto
-org.apache.ignite.internal.commandline.meta.tasks.MetadataInfoTask
-org.apache.ignite.internal.commandline.meta.tasks.MetadataInfoTask$MetadataListJob
-org.apache.ignite.internal.commandline.meta.tasks.MetadataListResult
-org.apache.ignite.internal.commandline.meta.tasks.MetadataMarshalled
-org.apache.ignite.internal.commandline.meta.tasks.MetadataRemoveTask
-org.apache.ignite.internal.commandline.meta.tasks.MetadataRemoveTask$DropAllThinSessionsJob
-org.apache.ignite.internal.commandline.meta.tasks.MetadataRemoveTask$MetadataRemoveJob
-org.apache.ignite.internal.commandline.meta.tasks.MetadataUpdateTask
-org.apache.ignite.internal.commandline.meta.tasks.MetadataUpdateTask$MetadataUpdateJob
+org.apache.ignite.internal.management.meta.MetadataInfoTask
+org.apache.ignite.internal.management.meta.MetadataInfoTask$MetadataListJob
+org.apache.ignite.internal.management.meta.MetadataListResult
+org.apache.ignite.internal.management.meta.MetadataMarshalled
+org.apache.ignite.internal.management.meta.MetadataRemoveTask
+org.apache.ignite.internal.management.meta.MetadataRemoveTask$DropAllThinSessionsJob
+org.apache.ignite.internal.management.meta.MetadataRemoveTask$MetadataRemoveJob
+org.apache.ignite.internal.management.meta.MetadataUpdateTask
+org.apache.ignite.internal.management.meta.MetadataUpdateTask$MetadataUpdateJob
org.apache.ignite.internal.commandline.property.tasks.PropertiesListResult
org.apache.ignite.internal.commandline.property.tasks.PropertiesListTask
org.apache.ignite.internal.commandline.property.tasks.PropertiesListTask$PropertiesListJob
@@ -2202,13 +2202,13 @@
org.apache.ignite.internal.visor.defragmentation.VisorDefragmentationOperation
org.apache.ignite.internal.management.defragmentation.DefragmentationTask
org.apache.ignite.internal.management.defragmentation.DefragmentationTask$VisorDefragmentationJob
org.apache.ignite.internal.management.defragmentation.DefragmentationTaskResult
-org.apache.ignite.internal.visor.diagnostic.Operation
-org.apache.ignite.internal.visor.diagnostic.VisorPageLocksResult
-org.apache.ignite.internal.visor.diagnostic.VisorPageLocksTask
-org.apache.ignite.internal.visor.diagnostic.VisorPageLocksTask$VisorPageLocksTrackerJob
-org.apache.ignite.internal.visor.diagnostic.availability.VisorConnectivityResult
-org.apache.ignite.internal.visor.diagnostic.availability.VisorConnectivityTask
-org.apache.ignite.internal.visor.diagnostic.availability.VisorConnectivityTask$VisorConnectivityJob
+org.apache.ignite.internal.management.diagnostic.Operation
+org.apache.ignite.internal.management.diagnostic.PageLocksResult
+org.apache.ignite.internal.management.diagnostic.PageLocksTask
+org.apache.ignite.internal.management.diagnostic.PageLocksTask$PageLocksTrackerJob
+org.apache.ignite.internal.management.diagnostic.ConnectivityResult
+org.apache.ignite.internal.management.diagnostic.ConnectivityTask
+org.apache.ignite.internal.management.diagnostic.ConnectivityTask$ConnectivityJob
org.apache.ignite.internal.management.encryption.CacheGroupEncryptionTask
org.apache.ignite.internal.management.encryption.CacheGroupEncryptionTask$ReencryptionBaseJob
org.apache.ignite.internal.management.encryption.CacheGroupEncryptionTask$SingleFieldDto
