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 67a0327e7ea IGNITE-19780 move Consistency Task classes into
"org.apache.ignite.internal.management.consistency" package (#10792)
67a0327e7ea is described below
commit 67a0327e7eaaeef70b94a7c98dcc78f055acb8a2
Author: Valery Shorin <[email protected]>
AuthorDate: Tue Jun 20 16:53:12 2023 +0300
IGNITE-19780 move Consistency Task classes into
"org.apache.ignite.internal.management.consistency" package (#10792)
---
.../GridCommandHandlerConsistencyCountersTest.java | 4 ++--
.../ignite/util/GridCommandHandlerConsistencyTest.java | 8 ++++----
.../apache/ignite/util/KillCommandsControlShTest.java | 12 ++++++------
.../consistency/AbstractConsistencyTask.java | 8 ++++----
.../ConsistencyCountersFinalizationTask.java} | 10 +++++-----
.../consistency/ConsistencyFinalizeCommand.java | 5 ++---
.../consistency/ConsistencyRepairCommand.java | 6 ++----
.../consistency/ConsistencyRepairTask.java} | 17 ++++++++---------
.../consistency/ConsistencyStatusCommand.java | 10 ++++------
.../consistency/ConsistencyStatusTask.java} | 14 +++++++-------
.../consistency/ConsistencyTaskResult.java} | 4 ++--
.../management/kill/ConsistencyCancelTask.java | 4 ++--
.../src/main/resources/META-INF/classnames.properties | 18 +++++++++---------
.../incremental/IncrementalSnapshotRestoreTest.java | 9 +++++----
14 files changed, 62 insertions(+), 67 deletions(-)
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerConsistencyCountersTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerConsistencyCountersTest.java
index ac583ea271e..4a23ec62762 100644
---
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerConsistencyCountersTest.java
+++
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerConsistencyCountersTest.java
@@ -71,9 +71,9 @@ import static
org.apache.ignite.cache.ReadRepairStrategy.PRIMARY;
import static org.apache.ignite.cache.ReadRepairStrategy.RELATIVE_MAJORITY;
import static org.apache.ignite.cache.ReadRepairStrategy.REMOVE;
import static
org.apache.ignite.internal.commandline.CommandHandler.EXIT_CODE_OK;
+import static
org.apache.ignite.internal.management.consistency.ConsistencyRepairTask.CONSISTENCY_VIOLATIONS_FOUND;
+import static
org.apache.ignite.internal.management.consistency.ConsistencyRepairTask.NOTHING_FOUND;
import static
org.apache.ignite.internal.processors.cache.persistence.GridCacheOffheapManager.DFLT_WAL_MARGIN_FOR_ATOMIC_CACHE_HISTORICAL_REBALANCE;
-import static
org.apache.ignite.internal.visor.consistency.VisorConsistencyRepairTask.CONSISTENCY_VIOLATIONS_FOUND;
-import static
org.apache.ignite.internal.visor.consistency.VisorConsistencyRepairTask.NOTHING_FOUND;
import static org.apache.ignite.testframework.GridTestUtils.assertContains;
import static org.apache.ignite.testframework.GridTestUtils.assertNotContains;
import static org.apache.ignite.testframework.LogListener.matches;
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerConsistencyTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerConsistencyTest.java
index 703c1e777fb..5bff5c85fd9 100644
---
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerConsistencyTest.java
+++
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerConsistencyTest.java
@@ -31,6 +31,7 @@ import
org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.management.consistency.ConsistencyStatusTask;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
@@ -41,7 +42,6 @@ import org.apache.ignite.internal.processors.dr.GridDrType;
import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.consistency.VisorConsistencyStatusTask;
import org.apache.ignite.testframework.ListeningTestLogger;
import org.apache.ignite.testframework.LogListener;
import org.junit.Test;
@@ -52,7 +52,7 @@ import static
org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static
org.apache.ignite.internal.commandline.CommandHandler.EXIT_CODE_OK;
import static
org.apache.ignite.internal.commandline.CommandHandler.EXIT_CODE_UNEXPECTED_ERROR;
-import static
org.apache.ignite.internal.visor.consistency.VisorConsistencyRepairTask.CONSISTENCY_VIOLATIONS_FOUND;
+import static
org.apache.ignite.internal.management.consistency.ConsistencyRepairTask.CONSISTENCY_VIOLATIONS_FOUND;
import static org.apache.ignite.testframework.GridTestUtils.assertContains;
import static org.apache.ignite.testframework.LogListener.matches;
@@ -309,7 +309,7 @@ public class GridCommandHandlerConsistencyTest extends
GridCommandHandlerCluster
PARTITIONS_ARG, String.valueOf(i),
STRATEGY, strategy.toString()));
- assertTrue(VisorConsistencyStatusTask.MAP.isEmpty());
+ assertTrue(ConsistencyStatusTask.MAP.isEmpty());
assertContains(log, testOut.toString(), "Cache (or cache group)
not found");
}
@@ -332,7 +332,7 @@ public class GridCommandHandlerConsistencyTest extends
GridCommandHandlerCluster
IntStream.range(from,
i).mapToObj(Integer::toString).collect(Collectors.joining(",")),
STRATEGY, strategy.toString()));
- assertTrue(VisorConsistencyStatusTask.MAP.isEmpty());
+ assertTrue(ConsistencyStatusTask.MAP.isEmpty());
assertContains(log, testOut.toString(),
CONSISTENCY_VIOLATIONS_FOUND);
assertContains(log, testOut.toString(), "[found=1, repaired=" +
repairsPerEntry.toString());
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/util/KillCommandsControlShTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/util/KillCommandsControlShTest.java
index e454c539e5f..ef4bcde0bcb 100644
---
a/modules/control-utility/src/test/java/org/apache/ignite/util/KillCommandsControlShTest.java
+++
b/modules/control-utility/src/test/java/org/apache/ignite/util/KillCommandsControlShTest.java
@@ -30,10 +30,10 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.TestRecordingCommunicationSpi;
+import org.apache.ignite.internal.management.consistency.ConsistencyRepairTask;
+import org.apache.ignite.internal.management.consistency.ConsistencyStatusTask;
import
org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetRequest;
import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.visor.consistency.VisorConsistencyRepairTask;
-import org.apache.ignite.internal.visor.consistency.VisorConsistencyStatusTask;
import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.spi.systemview.view.ComputeJobView;
@@ -301,7 +301,7 @@ public class KillCommandsControlShTest extends
GridCommandHandlerClusterByClassA
Thread th = new Thread(() -> {
IgnitePredicate<ComputeJobView> repairJobFilter =
- job ->
job.taskClassName().equals(VisorConsistencyRepairTask.class.getName());
+ job ->
job.taskClassName().equals(ConsistencyRepairTask.class.getName());
boolean foundOnce = false;
@@ -327,7 +327,7 @@ public class KillCommandsControlShTest extends
GridCommandHandlerClusterByClassA
assertEquals(EXIT_CODE_OK, res);
assertContains(log, testOut.toString(), "Status: 128/" + entries);
- assertNotContains(log, testOut.toString(),
VisorConsistencyStatusTask.NOTHING_FOUND);
+ assertNotContains(log, testOut.toString(),
ConsistencyStatusTask.NOTHING_FOUND);
testOut.reset();
@@ -395,7 +395,7 @@ public class KillCommandsControlShTest extends
GridCommandHandlerClusterByClassA
assertContains(log, testOut.toString(), "Operation execution
cancelled.");
assertContains(log, testOut.toString(), "Consistency task was
interrupted.");
- assertNotContains(log, testOut.toString(),
VisorConsistencyRepairTask.CONSISTENCY_VIOLATIONS_FOUND);
+ assertNotContains(log, testOut.toString(),
ConsistencyRepairTask.CONSISTENCY_VIOLATIONS_FOUND);
thLatch.await();
@@ -412,7 +412,7 @@ public class KillCommandsControlShTest extends
GridCommandHandlerClusterByClassA
assertEquals(EXIT_CODE_OK, res);
- assertContains(log, testOut.toString(),
VisorConsistencyStatusTask.NOTHING_FOUND);
+ assertContains(log, testOut.toString(),
ConsistencyStatusTask.NOTHING_FOUND);
assertNotContains(log, testOut.toString(), "Status");
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/AbstractConsistencyTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/AbstractConsistencyTask.java
similarity index 87%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/AbstractConsistencyTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/consistency/AbstractConsistencyTask.java
index 20dc406544b..e57ef87d5fe 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/AbstractConsistencyTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/AbstractConsistencyTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.consistency;
+package org.apache.ignite.internal.management.consistency;
import java.util.List;
import org.apache.ignite.IgniteException;
@@ -29,10 +29,10 @@ import org.apache.ignite.internal.visor.VisorMultiNodeTask;
* @param <A> Task argument type.
* @param <J> Job result type
*/
-public abstract class AbstractConsistencyTask<A, J> extends
VisorMultiNodeTask<A, VisorConsistencyTaskResult, J> {
+public abstract class AbstractConsistencyTask<A, J> extends
VisorMultiNodeTask<A, ConsistencyTaskResult, J> {
/** {@inheritDoc} */
- @Override protected VisorConsistencyTaskResult
reduce0(List<ComputeJobResult> results) throws IgniteException {
- VisorConsistencyTaskResult taskRes = new VisorConsistencyTaskResult();
+ @Override protected ConsistencyTaskResult reduce0(List<ComputeJobResult>
results) throws IgniteException {
+ ConsistencyTaskResult taskRes = new ConsistencyTaskResult();
StringBuilder sb = new StringBuilder();
for (ComputeJobResult res : results) {
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/VisorConsistencyCountersFinalizationTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyCountersFinalizationTask.java
similarity index 82%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/VisorConsistencyCountersFinalizationTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyCountersFinalizationTask.java
index 6f9547cc206..1f2a9563a6f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/VisorConsistencyCountersFinalizationTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyCountersFinalizationTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.consistency;
+package org.apache.ignite.internal.management.consistency;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
@@ -26,19 +26,19 @@ import org.apache.ignite.internal.visor.VisorOneNodeTask;
/**
*
*/
-public class VisorConsistencyCountersFinalizationTask extends
VisorOneNodeTask<NoArg, String> {
+public class ConsistencyCountersFinalizationTask extends
VisorOneNodeTask<NoArg, String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
@Override protected VisorJob<NoArg, String> job(NoArg arg) {
- return new VisorConsistencyCountersFinalizationJob(arg, debug);
+ return new ConsistencyCountersFinalizationJob(arg, debug);
}
/**
*
*/
- private static class VisorConsistencyCountersFinalizationJob extends
VisorJob<NoArg, String> {
+ private static class ConsistencyCountersFinalizationJob extends
VisorJob<NoArg, String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -46,7 +46,7 @@ public class VisorConsistencyCountersFinalizationTask extends
VisorOneNodeTask<N
* @param arg Arguments.
* @param debug Debug.
*/
- protected VisorConsistencyCountersFinalizationJob(NoArg arg, boolean
debug) {
+ protected ConsistencyCountersFinalizationJob(NoArg arg, boolean debug)
{
super(arg, debug);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyFinalizeCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyFinalizeCommand.java
index 2341a552269..c3a31e621e0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyFinalizeCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyFinalizeCommand.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.management.consistency;
import org.apache.ignite.internal.management.api.ComputeCommand;
import org.apache.ignite.internal.management.api.NoArg;
-import
org.apache.ignite.internal.visor.consistency.VisorConsistencyCountersFinalizationTask;
import org.apache.ignite.lang.IgniteExperimental;
/** */
@@ -36,7 +35,7 @@ public class ConsistencyFinalizeCommand implements
ComputeCommand<NoArg, String>
}
/** {@inheritDoc} */
- @Override public Class<VisorConsistencyCountersFinalizationTask>
taskClass() {
- return VisorConsistencyCountersFinalizationTask.class;
+ @Override public Class<ConsistencyCountersFinalizationTask> taskClass() {
+ return ConsistencyCountersFinalizationTask.class;
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyRepairCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyRepairCommand.java
index 797ca54ce0b..02ea7a2f1b7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyRepairCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyRepairCommand.java
@@ -28,8 +28,6 @@ import org.apache.ignite.internal.client.GridClientException;
import org.apache.ignite.internal.client.GridClientNode;
import org.apache.ignite.internal.management.api.LocalCommand;
import org.apache.ignite.internal.visor.VisorTaskArgument;
-import org.apache.ignite.internal.visor.consistency.VisorConsistencyRepairTask;
-import org.apache.ignite.internal.visor.consistency.VisorConsistencyTaskResult;
import org.apache.ignite.lang.IgniteExperimental;
import static java.util.stream.Collectors.toSet;
@@ -90,8 +88,8 @@ public class ConsistencyRepairCommand implements
LocalCommand<ConsistencyRepairC
) throws GridClientException {
boolean failed = false;
- VisorConsistencyTaskResult res =
cli.compute().projection(nodes).execute(
- VisorConsistencyRepairTask.class.getName(),
+ ConsistencyTaskResult res = cli.compute().projection(nodes).execute(
+ ConsistencyRepairTask.class.getName(),
new
VisorTaskArgument<>(nodes.stream().map(GridClientNode::nodeId).collect(Collectors.toList()),
arg, false)
);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/VisorConsistencyRepairTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyRepairTask.java
similarity index 95%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/VisorConsistencyRepairTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyRepairTask.java
index 7f73db12c94..7495ba4217c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/VisorConsistencyRepairTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyRepairTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.consistency;
+package org.apache.ignite.internal.management.consistency;
import java.util.Arrays;
import java.util.HashMap;
@@ -35,7 +35,6 @@ import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cache.ReadRepairStrategy;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.events.CacheConsistencyViolationEvent;
-import
org.apache.ignite.internal.management.consistency.ConsistencyRepairCommandArg;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import
org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtLocalPartition;
@@ -54,7 +53,7 @@ import static
org.apache.ignite.events.EventType.EVT_CONSISTENCY_VIOLATION;
/**
*
*/
-public class VisorConsistencyRepairTask extends
AbstractConsistencyTask<ConsistencyRepairCommandArg, String> {
+public class ConsistencyRepairTask extends
AbstractConsistencyTask<ConsistencyRepairCommandArg, String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -72,13 +71,13 @@ public class VisorConsistencyRepairTask extends
AbstractConsistencyTask<Consiste
/** {@inheritDoc} */
@Override protected VisorJob<ConsistencyRepairCommandArg, String>
job(ConsistencyRepairCommandArg arg) {
- return new VisorConsistencyRepairJob(arg, debug);
+ return new ConsistencyRepairJob(arg, debug);
}
/**
*
*/
- private static class VisorConsistencyRepairJob extends
VisorJob<ConsistencyRepairCommandArg, String> {
+ private static class ConsistencyRepairJob extends
VisorJob<ConsistencyRepairCommandArg, String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -93,7 +92,7 @@ public class VisorConsistencyRepairTask extends
AbstractConsistencyTask<Consiste
* @param arg Arguments.
* @param debug Debug.
*/
- protected VisorConsistencyRepairJob(ConsistencyRepairCommandArg arg,
boolean debug) {
+ protected ConsistencyRepairJob(ConsistencyRepairCommandArg arg,
boolean debug) {
super(arg, debug);
}
@@ -171,7 +170,7 @@ public class VisorConsistencyRepairTask extends
AbstractConsistencyTask<Consiste
String statusKey = "[node=" + ignite.localNode() + ", cacheGroup="
+ grpCtx.cacheOrGroupName() + ", part=" + p + "]";
- if (VisorConsistencyStatusTask.MAP.putIfAbsent(statusKey, "0/" +
part.fullSize()) != null) {
+ if (ConsistencyStatusTask.MAP.putIfAbsent(statusKey, "0/" +
part.fullSize()) != null) {
throw new IllegalStateException("Consistency check already
started " +
"[grp=" + grpCtx.cacheOrGroupName() + ", part=" + p + "]");
}
@@ -215,7 +214,7 @@ public class VisorConsistencyRepairTask extends
AbstractConsistencyTask<Consiste
batch.keys.clear();
- VisorConsistencyStatusTask.MAP.put(statusKey,
checked + "/" + part.fullSize());
+ ConsistencyStatusTask.MAP.put(statusKey, checked +
"/" + part.fullSize());
}
assert batch.keys.size() < batchSize;
@@ -258,7 +257,7 @@ public class VisorConsistencyRepairTask extends
AbstractConsistencyTask<Consiste
finally {
part.release();
- VisorConsistencyStatusTask.MAP.remove(statusKey);
+ ConsistencyStatusTask.MAP.remove(statusKey);
}
if (!evts.isEmpty())
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyStatusCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyStatusCommand.java
index ca924e60940..a8834c016f1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyStatusCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyStatusCommand.java
@@ -24,15 +24,13 @@ import java.util.function.Consumer;
import org.apache.ignite.internal.client.GridClientNode;
import org.apache.ignite.internal.management.api.ComputeCommand;
import org.apache.ignite.internal.management.api.NoArg;
-import org.apache.ignite.internal.visor.consistency.VisorConsistencyStatusTask;
-import org.apache.ignite.internal.visor.consistency.VisorConsistencyTaskResult;
import org.apache.ignite.lang.IgniteExperimental;
import static org.apache.ignite.internal.management.api.CommandUtils.servers;
/** */
@IgniteExperimental
-public class ConsistencyStatusCommand implements ComputeCommand<NoArg,
VisorConsistencyTaskResult> {
+public class ConsistencyStatusCommand implements ComputeCommand<NoArg,
ConsistencyTaskResult> {
/** {@inheritDoc} */
@Override public String description() {
return "Cache consistency check/repair operations status";
@@ -44,8 +42,8 @@ public class ConsistencyStatusCommand implements
ComputeCommand<NoArg, VisorCons
}
/** {@inheritDoc} */
- @Override public Class<VisorConsistencyStatusTask> taskClass() {
- return VisorConsistencyStatusTask.class;
+ @Override public Class<ConsistencyStatusTask> taskClass() {
+ return ConsistencyStatusTask.class;
}
/** {@inheritDoc} */
@@ -54,7 +52,7 @@ public class ConsistencyStatusCommand implements
ComputeCommand<NoArg, VisorCons
}
/** {@inheritDoc} */
- @Override public void printResult(NoArg arg, VisorConsistencyTaskResult
res, Consumer<String> printer) {
+ @Override public void printResult(NoArg arg, ConsistencyTaskResult res,
Consumer<String> printer) {
if (res.cancelled())
printer.accept("Operation execution cancelled.\n\n");
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/VisorConsistencyStatusTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyStatusTask.java
similarity index 82%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/VisorConsistencyStatusTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyStatusTask.java
index bbc26f059a5..62c7dc8acae 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/VisorConsistencyStatusTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyStatusTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.consistency;
+package org.apache.ignite.internal.management.consistency;
import java.util.List;
import java.util.Map;
@@ -30,7 +30,7 @@ import org.apache.ignite.resources.LoggerResource;
/**
*
*/
-public class VisorConsistencyStatusTask extends AbstractConsistencyTask<NoArg,
String> {
+public class ConsistencyStatusTask extends AbstractConsistencyTask<NoArg,
String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -42,12 +42,12 @@ public class VisorConsistencyStatusTask extends
AbstractConsistencyTask<NoArg, S
/** {@inheritDoc} */
@Override protected VisorJob<NoArg, String> job(NoArg arg) {
- return new VisorConsistencyStatusJob(arg, debug);
+ return new ConsistencyStatusJob(arg, debug);
}
/** {@inheritDoc} */
- @Override protected VisorConsistencyTaskResult
reduce0(List<ComputeJobResult> results) throws IgniteException {
- VisorConsistencyTaskResult taskRes = super.reduce0(results);
+ @Override protected ConsistencyTaskResult reduce0(List<ComputeJobResult>
results) throws IgniteException {
+ ConsistencyTaskResult taskRes = super.reduce0(results);
if (taskRes.message() == null)
taskRes.message(NOTHING_FOUND);
@@ -58,7 +58,7 @@ public class VisorConsistencyStatusTask extends
AbstractConsistencyTask<NoArg, S
/**
*
*/
- private static class VisorConsistencyStatusJob extends VisorJob<NoArg,
String> {
+ private static class ConsistencyStatusJob extends VisorJob<NoArg, String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -70,7 +70,7 @@ public class VisorConsistencyStatusTask extends
AbstractConsistencyTask<NoArg, S
* @param arg Arguments.
* @param debug Debug.
*/
- protected VisorConsistencyStatusJob(NoArg arg, boolean debug) {
+ protected ConsistencyStatusJob(NoArg arg, boolean debug) {
super(arg, debug);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/VisorConsistencyTaskResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyTaskResult.java
similarity index 94%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/VisorConsistencyTaskResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyTaskResult.java
index 6c0eb21eb69..b8db6c4683e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/consistency/VisorConsistencyTaskResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyTaskResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.consistency;
+package org.apache.ignite.internal.management.consistency;
import java.io.IOException;
import java.io.ObjectInput;
@@ -26,7 +26,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
/**
*
*/
-public class VisorConsistencyTaskResult extends IgniteDataTransferObject {
+public class ConsistencyTaskResult extends IgniteDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/ConsistencyCancelTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/ConsistencyCancelTask.java
index 509b2a6af88..ab2ff6fdb29 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/ConsistencyCancelTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/ConsistencyCancelTask.java
@@ -22,10 +22,10 @@ import org.apache.ignite.IgniteException;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.management.api.NoArg;
+import org.apache.ignite.internal.management.consistency.ConsistencyRepairTask;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.visor.VisorJob;
import org.apache.ignite.internal.visor.VisorMultiNodeTask;
-import org.apache.ignite.internal.visor.consistency.VisorConsistencyRepairTask;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.spi.systemview.view.ComputeJobView;
@@ -74,7 +74,7 @@ public class ConsistencyCancelTask extends
VisorMultiNodeTask<NoArg, Void, Void>
F.iterator(ignite.context().systemView().view(JOBS_VIEW),
ComputeJobView::sessionId,
true,
- job ->
job.taskClassName().equals(VisorConsistencyRepairTask.class.getName())
+ job ->
job.taskClassName().equals(ConsistencyRepairTask.class.getName())
).forEach(sesId -> ignite.context().job().cancelJob(sesId, null,
false));
return null;
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties
b/modules/core/src/main/resources/META-INF/classnames.properties
index b5bf9893273..aa0829ae146 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -2187,17 +2187,17 @@
org.apache.ignite.internal.management.kill.ComputeCancelSessionTask$ComputeCance
org.apache.ignite.internal.visor.compute.VisorComputeCancelSessionsTask
org.apache.ignite.internal.visor.compute.VisorComputeCancelSessionsTask$VisorComputeCancelSessionsJob
org.apache.ignite.internal.visor.compute.VisorComputeCancelSessionsTaskArg
-org.apache.ignite.internal.visor.consistency.AbstractConsistencyTask
+org.apache.ignite.internal.management.consistency.AbstractConsistencyTask
org.apache.ignite.internal.management.kill.ConsistencyCancelTask
org.apache.ignite.internal.management.kill.ConsistencyCancelTask$ConsistencyCancelJob
-org.apache.ignite.internal.visor.consistency.VisorConsistencyCountersFinalizationTask
-org.apache.ignite.internal.visor.consistency.VisorConsistencyCountersFinalizationTask$VisorConsistencyCountersFinalizationJob
-org.apache.ignite.internal.visor.consistency.VisorConsistencyRepairTask
-org.apache.ignite.internal.visor.consistency.VisorConsistencyRepairTask$VisorConsistencyRepairJob
-org.apache.ignite.internal.visor.consistency.VisorConsistencyRepairTask$VisorConsistencyRepairJob$CacheConsistencyViolationEventListener
-org.apache.ignite.internal.visor.consistency.VisorConsistencyStatusTask
-org.apache.ignite.internal.visor.consistency.VisorConsistencyStatusTask$VisorConsistencyStatusJob
-org.apache.ignite.internal.visor.consistency.VisorConsistencyTaskResult
+org.apache.ignite.internal.management.consistency.ConsistencyCountersFinalizationTask
+org.apache.ignite.internal.management.consistency.ConsistencyCountersFinalizationTask$ConsistencyCountersFinalizationJob
+org.apache.ignite.internal.management.consistency.ConsistencyRepairTask
+org.apache.ignite.internal.management.consistency.ConsistencyRepairTask$ConsistencyRepairJob
+org.apache.ignite.internal.management.consistency.ConsistencyRepairTask$ConsistencyRepairJob$CacheConsistencyViolationEventListener
+org.apache.ignite.internal.management.consistency.ConsistencyStatusTask
+org.apache.ignite.internal.management.consistency.ConsistencyStatusTask$ConsistencyStatusJob
+org.apache.ignite.internal.management.consistency.ConsistencyTaskResult
org.apache.ignite.internal.visor.defragmentation.VisorDefragmentationOperation
org.apache.ignite.internal.management.defragmentation.DefragmentationTask
org.apache.ignite.internal.management.defragmentation.DefragmentationTask$VisorDefragmentationJob
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotRestoreTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotRestoreTest.java
index d5d2d9680e8..d1ac0e93b5a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotRestoreTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotRestoreTest.java
@@ -54,6 +54,8 @@ import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.TestRecordingCommunicationSpi;
import org.apache.ignite.internal.binary.BinaryContext;
import
org.apache.ignite.internal.management.consistency.ConsistencyRepairCommandArg;
+import org.apache.ignite.internal.management.consistency.ConsistencyRepairTask;
+import org.apache.ignite.internal.management.consistency.ConsistencyTaskResult;
import org.apache.ignite.internal.pagemem.wal.WALIterator;
import
org.apache.ignite.internal.pagemem.wal.record.IncrementalSnapshotFinishRecord;
import org.apache.ignite.internal.pagemem.wal.record.WALRecord;
@@ -74,8 +76,6 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorTaskArgument;
-import org.apache.ignite.internal.visor.consistency.VisorConsistencyRepairTask;
-import org.apache.ignite.internal.visor.consistency.VisorConsistencyTaskResult;
import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.lang.IgniteUuid;
@@ -85,6 +85,7 @@ import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.transactions.Transaction;
import org.jetbrains.annotations.Nullable;
import org.junit.Test;
+
import static org.apache.ignite.events.EventType.EVT_CONSISTENCY_VIOLATION;
import static
org.apache.ignite.internal.processors.cache.persistence.snapshot.AbstractSnapshotSelfTest.snp;
import static
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManager.incrementalSnapshotWalsDir;
@@ -856,8 +857,8 @@ public class IncrementalSnapshotRestoreTest extends
AbstractIncrementalSnapshotT
arg.partitions(IntStream.range(0, PARTS).toArray());
arg.strategy(ReadRepairStrategy.CHECK_ONLY);
- VisorConsistencyTaskResult res = grid(0).compute().execute(
- VisorConsistencyRepairTask.class,
+ ConsistencyTaskResult res = grid(0).compute().execute(
+ ConsistencyRepairTask.class,
new VisorTaskArgument<>(
G.allGrids().stream().map(ign ->
ign.cluster().localNode().id()).collect(Collectors.toList()),
arg,
