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 f4e791a9745 IGNITE-19787 Move Snapshot and Wal task classes to command
class packages (#10795)
f4e791a9745 is described below
commit f4e791a974558ee53e44fc643adc9aea5d919871
Author: Valery Shorin <valery.a.sho...@gmail.com>
AuthorDate: Wed Jun 21 11:51:07 2023 +0300
IGNITE-19787 Move Snapshot and Wal task classes to command class packages
(#10795)
---
.../apache/ignite/util/GridCommandHandlerTest.java | 6 ++--
.../management/kill/KillSnapshotCommand.java | 4 +--
.../management/kill/SnapshotCancelTask.java | 8 ++---
.../snapshot/AbstractSnapshotCommand.java | 5 ++-
.../management/snapshot/SnapshotCheckCommand.java | 8 ++---
.../snapshot/SnapshotCheckTask.java} | 13 ++++----
.../management/snapshot/SnapshotCreateCommand.java | 6 ++--
.../snapshot/SnapshotCreateTask.java} | 11 +++----
.../snapshot/SnapshotJob.java} | 6 ++--
.../snapshot/SnapshotOneNodeTask.java} | 8 ++---
.../snapshot/SnapshotRestoreCommand.java | 5 ++-
.../snapshot/SnapshotRestoreTask.java} | 25 +++++++-------
.../management/snapshot/SnapshotStatusCommand.java | 12 +++----
.../snapshot/SnapshotStatusTask.java} | 22 ++++++-------
.../snapshot/SnapshotTaskResult.java} | 8 ++---
.../wal/ClusterNode.java} | 13 ++++----
.../internal/management/wal/WalDeleteCommand.java | 17 ++++------
.../internal/management/wal/WalPrintCommand.java | 17 ++++------
.../wal/WalTask.java} | 30 ++++++++---------
.../wal/WalTaskResult.java} | 20 ++++++------
.../snapshot/SnapshotRestoreStatusTask.java | 4 +--
.../main/resources/META-INF/classnames.properties | 38 +++++++++++-----------
.../GridInternalTaskUnusedWalSegmentsTest.java | 11 ++++---
23 files changed, 139 insertions(+), 158 deletions(-)
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
index 62ce4c72fb2..36189dda5f7 100644
---
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
+++
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
@@ -79,6 +79,7 @@ import org.apache.ignite.internal.client.GridClientFactory;
import org.apache.ignite.internal.client.impl.GridClientImpl;
import org.apache.ignite.internal.client.util.GridConcurrentHashSet;
import org.apache.ignite.internal.commandline.CommandHandler;
+import org.apache.ignite.internal.management.snapshot.SnapshotTaskResult;
import org.apache.ignite.internal.management.tx.TxInfo;
import org.apache.ignite.internal.management.tx.TxTaskResult;
import org.apache.ignite.internal.managers.communication.GridIoMessage;
@@ -120,7 +121,6 @@ import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
import
org.apache.ignite.internal.visor.cache.VisorFindAndDeleteGarbageInPersistenceTaskResult;
-import org.apache.ignite.internal.visor.snapshot.VisorSnapshotTaskResult;
import org.apache.ignite.lang.IgniteBiPredicate;
import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.lang.IgniteInClosure;
@@ -3198,7 +3198,7 @@ public class GridCommandHandlerTest extends
GridCommandHandlerClusterPerMethodAb
waitForCondition(endTimeMetricPredicate::getAsBoolean,
getTestTimeout()));
}
- assertContains(log,
(String)((VisorSnapshotTaskResult)h.getLastOperationResult()).result(),
snpName);
+ assertContains(log,
(String)((SnapshotTaskResult)h.getLastOperationResult()).result(), snpName);
stopAllGrids();
@@ -3273,7 +3273,7 @@ public class GridCommandHandlerTest extends
GridCommandHandlerClusterPerMethodAb
StringBuilder sb = new StringBuilder();
-
((SnapshotPartitionsVerifyTaskResult)((VisorSnapshotTaskResult)h.getLastOperationResult()).result()).print(sb::append);
+
((SnapshotPartitionsVerifyTaskResult)((SnapshotTaskResult)h.getLastOperationResult()).result()).print(sb::append);
assertContains(log, sb.toString(), "The check procedure has finished,
no conflicts have been found");
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSnapshotCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSnapshotCommand.java
index 2b3b3d3a1ff..9eda58ff183 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSnapshotCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSnapshotCommand.java
@@ -19,10 +19,10 @@ package org.apache.ignite.internal.management.kill;
import org.apache.ignite.internal.management.api.ComputeCommand;
import
org.apache.ignite.internal.management.kill.SnapshotCancelTask.CancelSnapshotArg;
-import org.apache.ignite.internal.visor.snapshot.VisorSnapshotTaskResult;
+import org.apache.ignite.internal.management.snapshot.SnapshotTaskResult;
/** */
-public class KillSnapshotCommand implements ComputeCommand<CancelSnapshotArg,
VisorSnapshotTaskResult> {
+public class KillSnapshotCommand implements ComputeCommand<CancelSnapshotArg,
SnapshotTaskResult> {
/** {@inheritDoc} */
@Override public String description() {
return "Kill running snapshot by snapshot name";
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/SnapshotCancelTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/SnapshotCancelTask.java
index e2853d65a04..93116489de1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/SnapshotCancelTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/SnapshotCancelTask.java
@@ -21,18 +21,18 @@ import java.util.UUID;
import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.dto.IgniteDataTransferObject;
import
org.apache.ignite.internal.management.kill.SnapshotCancelTask.CancelSnapshotArg;
+import org.apache.ignite.internal.management.snapshot.SnapshotJob;
+import org.apache.ignite.internal.management.snapshot.SnapshotOneNodeTask;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManager;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotMXBeanImpl;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.visor.VisorJob;
-import org.apache.ignite.internal.visor.snapshot.VisorSnapshotJob;
-import org.apache.ignite.internal.visor.snapshot.VisorSnapshotOneNodeTask;
/**
* @see IgniteSnapshotManager#cancelSnapshotOperation(UUID)
*/
@GridInternal
-public class SnapshotCancelTask extends
VisorSnapshotOneNodeTask<CancelSnapshotArg, String> {
+public class SnapshotCancelTask extends SnapshotOneNodeTask<CancelSnapshotArg,
String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -42,7 +42,7 @@ public class SnapshotCancelTask extends
VisorSnapshotOneNodeTask<CancelSnapshotA
}
/** */
- private static class SnapshotCancelJob extends
VisorSnapshotJob<CancelSnapshotArg, String> {
+ private static class SnapshotCancelJob extends
SnapshotJob<CancelSnapshotArg, String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/AbstractSnapshotCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/AbstractSnapshotCommand.java
index 2bbb1bcd39d..3a27d0fedff 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/AbstractSnapshotCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/AbstractSnapshotCommand.java
@@ -21,13 +21,12 @@ import java.util.function.Consumer;
import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.dto.IgniteDataTransferObject;
import org.apache.ignite.internal.management.api.ComputeCommand;
-import org.apache.ignite.internal.visor.snapshot.VisorSnapshotTaskResult;
/** */
public abstract class AbstractSnapshotCommand<A extends
IgniteDataTransferObject>
- implements ComputeCommand<A, VisorSnapshotTaskResult> {
+ implements ComputeCommand<A, SnapshotTaskResult> {
/** {@inheritDoc} */
- @Override public void printResult(A arg, VisorSnapshotTaskResult res,
Consumer<String> printer) {
+ @Override public void printResult(A arg, SnapshotTaskResult res,
Consumer<String> printer) {
try {
printer.accept(String.valueOf(res.result()));
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCheckCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCheckCommand.java
index 4d767b2070b..22336e3c002 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCheckCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCheckCommand.java
@@ -20,8 +20,6 @@ package org.apache.ignite.internal.management.snapshot;
import java.util.function.Consumer;
import org.apache.ignite.IgniteException;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotPartitionsVerifyTaskResult;
-import org.apache.ignite.internal.visor.snapshot.VisorSnapshotCheckTask;
-import org.apache.ignite.internal.visor.snapshot.VisorSnapshotTaskResult;
/** */
public class SnapshotCheckCommand extends
AbstractSnapshotCommand<SnapshotCheckCommandArg> {
@@ -36,12 +34,12 @@ public class SnapshotCheckCommand extends
AbstractSnapshotCommand<SnapshotCheckC
}
/** {@inheritDoc} */
- @Override public Class<VisorSnapshotCheckTask> taskClass() {
- return VisorSnapshotCheckTask.class;
+ @Override public Class<SnapshotCheckTask> taskClass() {
+ return SnapshotCheckTask.class;
}
/** {@inheritDoc} */
- @Override public void printResult(SnapshotCheckCommandArg arg,
VisorSnapshotTaskResult res0, Consumer<String> printer) {
+ @Override public void printResult(SnapshotCheckCommandArg arg,
SnapshotTaskResult res0, Consumer<String> printer) {
try {
((SnapshotPartitionsVerifyTaskResult)res0.result()).print(printer);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotCheckTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCheckTask.java
similarity index 81%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotCheckTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCheckTask.java
index 13552ad6f11..c467585d862 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotCheckTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCheckTask.java
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.snapshot;
+package org.apache.ignite.internal.management.snapshot;
import org.apache.ignite.IgniteException;
-import org.apache.ignite.internal.management.snapshot.SnapshotCheckCommandArg;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManager;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotPartitionsVerifyTaskResult;
import org.apache.ignite.internal.processors.task.GridInternal;
@@ -29,19 +28,19 @@ import org.apache.ignite.internal.visor.VisorJob;
* @see IgniteSnapshotManager#checkSnapshot(String, String)
*/
@GridInternal
-public class VisorSnapshotCheckTask extends
VisorSnapshotOneNodeTask<SnapshotCheckCommandArg,
+public class SnapshotCheckTask extends
SnapshotOneNodeTask<SnapshotCheckCommandArg,
SnapshotPartitionsVerifyTaskResult> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
@Override protected VisorJob<SnapshotCheckCommandArg,
SnapshotPartitionsVerifyTaskResult> job(SnapshotCheckCommandArg arg) {
- return new VisorSnapshotCheckJob(arg, debug);
+ return new SnapshotCheckJob(arg, debug);
}
/** */
- private static class VisorSnapshotCheckJob extends
VisorSnapshotJob<SnapshotCheckCommandArg,
- SnapshotPartitionsVerifyTaskResult> {
+ private static class SnapshotCheckJob extends
SnapshotJob<SnapshotCheckCommandArg,
+ SnapshotPartitionsVerifyTaskResult> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -49,7 +48,7 @@ public class VisorSnapshotCheckTask extends
VisorSnapshotOneNodeTask<SnapshotChe
* @param arg Snapshot check task argument.
* @param debug Flag indicating whether debug information should be
printed into node log.
*/
- protected VisorSnapshotCheckJob(SnapshotCheckCommandArg arg, boolean
debug) {
+ protected SnapshotCheckJob(SnapshotCheckCommandArg arg, boolean debug)
{
super(arg, debug);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCreateCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCreateCommand.java
index dc24047e24e..c8c82d1a206 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCreateCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCreateCommand.java
@@ -17,8 +17,6 @@
package org.apache.ignite.internal.management.snapshot;
-import org.apache.ignite.internal.visor.snapshot.VisorSnapshotCreateTask;
-
/** */
public class SnapshotCreateCommand extends
AbstractSnapshotCommand<SnapshotCreateCommandArg> {
/** {@inheritDoc} */
@@ -32,7 +30,7 @@ public class SnapshotCreateCommand extends
AbstractSnapshotCommand<SnapshotCreat
}
/** {@inheritDoc} */
- @Override public Class<VisorSnapshotCreateTask> taskClass() {
- return VisorSnapshotCreateTask.class;
+ @Override public Class<SnapshotCreateTask> taskClass() {
+ return SnapshotCreateTask.class;
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotCreateTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCreateTask.java
similarity index 84%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotCreateTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCreateTask.java
index 9021e20c30b..e236ad6fc7c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotCreateTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCreateTask.java
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.snapshot;
+package org.apache.ignite.internal.management.snapshot;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteSnapshot;
-import org.apache.ignite.internal.management.snapshot.SnapshotCreateCommandArg;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManager;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.future.IgniteFutureImpl;
@@ -29,17 +28,17 @@ import org.apache.ignite.internal.visor.VisorJob;
* @see IgniteSnapshot#createSnapshot(String)
*/
@GridInternal
-public class VisorSnapshotCreateTask extends
VisorSnapshotOneNodeTask<SnapshotCreateCommandArg, String> {
+public class SnapshotCreateTask extends
SnapshotOneNodeTask<SnapshotCreateCommandArg, String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
@Override protected VisorJob<SnapshotCreateCommandArg, String>
job(SnapshotCreateCommandArg arg) {
- return new VisorSnapshotCreateJob(arg, debug);
+ return new SnapshotCreateJob(arg, debug);
}
/** */
- private static class VisorSnapshotCreateJob extends
VisorSnapshotJob<SnapshotCreateCommandArg, String> {
+ private static class SnapshotCreateJob extends
SnapshotJob<SnapshotCreateCommandArg, String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -47,7 +46,7 @@ public class VisorSnapshotCreateTask extends
VisorSnapshotOneNodeTask<SnapshotCr
* @param arg Snapshot create task argument.
* @param debug Flag indicating whether debug information should be
printed into node log.
*/
- protected VisorSnapshotCreateJob(SnapshotCreateCommandArg arg, boolean
debug) {
+ protected SnapshotCreateJob(SnapshotCreateCommandArg arg, boolean
debug) {
super(arg, debug);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotJob.java
similarity index 87%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotJob.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotJob.java
index af0e8c9eacc..154ca88e6f9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotJob.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotJob.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.snapshot;
+package org.apache.ignite.internal.management.snapshot;
import org.apache.ignite.internal.visor.VisorJob;
import org.apache.ignite.plugin.security.SecurityPermissionSet;
@@ -25,9 +25,9 @@ import static
org.apache.ignite.plugin.security.SecurityPermission.ADMIN_SNAPSHO
import static
org.apache.ignite.plugin.security.SecurityPermissionSetBuilder.systemPermissions;
/** */
-public abstract class VisorSnapshotJob<A, R> extends VisorJob<A, R> {
+public abstract class SnapshotJob<A, R> extends VisorJob<A, R> {
/** */
- protected VisorSnapshotJob(@Nullable A arg, boolean debug) {
+ protected SnapshotJob(@Nullable A arg, boolean debug) {
super(arg, debug);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotOneNodeTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotOneNodeTask.java
similarity index 78%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotOneNodeTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotOneNodeTask.java
index fd2438b8947..d2b9fec8d1b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotOneNodeTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotOneNodeTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.snapshot;
+package org.apache.ignite.internal.management.snapshot;
import java.util.List;
import org.apache.ignite.compute.ComputeJobResult;
@@ -26,13 +26,13 @@ import org.jetbrains.annotations.Nullable;
/**
* Base class for single node visor snapshot task.
*/
-public abstract class VisorSnapshotOneNodeTask<A, R> extends
VisorMultiNodeTask<A, VisorSnapshotTaskResult, R> {
+public abstract class SnapshotOneNodeTask<A, R> extends VisorMultiNodeTask<A,
SnapshotTaskResult, R> {
/** {@inheritDoc} */
- @Nullable @Override protected VisorSnapshotTaskResult
reduce0(List<ComputeJobResult> results) {
+ @Nullable @Override protected SnapshotTaskResult
reduce0(List<ComputeJobResult> results) {
assert results.size() == 1 : results.size();
ComputeJobResult res = F.first(results);
- return new VisorSnapshotTaskResult(res.getData(), res.getException());
+ return new SnapshotTaskResult(res.getData(), res.getException());
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotRestoreCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotRestoreCommand.java
index 3d750835ceb..b904513f9f9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotRestoreCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotRestoreCommand.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.management.snapshot;
-import org.apache.ignite.internal.visor.snapshot.VisorSnapshotRestoreTask;
import org.jetbrains.annotations.Nullable;
/** */
@@ -45,8 +44,8 @@ public class SnapshotRestoreCommand extends
AbstractSnapshotCommand<SnapshotRest
}
/** {@inheritDoc} */
- @Override public Class<VisorSnapshotRestoreTask> taskClass() {
- return VisorSnapshotRestoreTask.class;
+ @Override public Class<SnapshotRestoreTask> taskClass() {
+ return SnapshotRestoreTask.class;
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotRestoreTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotRestoreTask.java
similarity index 80%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotRestoreTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotRestoreTask.java
index 9975f5db456..d238c7bc69d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotRestoreTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotRestoreTask.java
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.snapshot;
+package org.apache.ignite.internal.management.snapshot;
import java.util.Arrays;
import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.management.kill.SnapshotCancelTask;
-import
org.apache.ignite.internal.management.snapshot.SnapshotRestoreCommandArg;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManager;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.future.IgniteFutureImpl;
@@ -30,22 +29,22 @@ import org.apache.ignite.internal.visor.VisorJob;
* Visor snapshot restore task.
*/
@GridInternal
-public class VisorSnapshotRestoreTask extends
VisorSnapshotOneNodeTask<SnapshotRestoreCommandArg, String> {
+public class SnapshotRestoreTask extends
SnapshotOneNodeTask<SnapshotRestoreCommandArg, String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
@Override protected VisorJob<SnapshotRestoreCommandArg, String>
job(SnapshotRestoreCommandArg arg) {
if (arg.cancel())
- return new VisorSnapshotRestoreCancelJob(arg, debug);
+ return new SnapshotRestoreCancelJob(arg, debug);
else if (arg.status())
- return new VisorSnapshotRestoreStatusJob(arg, debug);
+ return new SnapshotRestoreStatusJob(arg, debug);
- return new VisorSnapshotStartRestoreJob(arg, debug);
+ return new SnapshotStartRestoreJob(arg, debug);
}
/** */
- private static class VisorSnapshotStartRestoreJob extends
VisorSnapshotJob<SnapshotRestoreCommandArg, String> {
+ private static class SnapshotStartRestoreJob extends
SnapshotJob<SnapshotRestoreCommandArg, String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -53,7 +52,7 @@ public class VisorSnapshotRestoreTask extends
VisorSnapshotOneNodeTask<SnapshotR
* @param arg Restore task argument.
* @param debug Flag indicating whether debug information should be
printed into node log.
*/
- protected VisorSnapshotStartRestoreJob(SnapshotRestoreCommandArg arg,
boolean debug) {
+ protected SnapshotStartRestoreJob(SnapshotRestoreCommandArg arg,
boolean debug) {
super(arg, debug);
}
@@ -87,7 +86,7 @@ public class VisorSnapshotRestoreTask extends
VisorSnapshotOneNodeTask<SnapshotR
* @deprecated Use {@link SnapshotCancelTask} instead.
*/
@Deprecated
- private static class VisorSnapshotRestoreCancelJob extends
VisorSnapshotJob<SnapshotRestoreCommandArg, String> {
+ private static class SnapshotRestoreCancelJob extends
SnapshotJob<SnapshotRestoreCommandArg, String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -95,7 +94,7 @@ public class VisorSnapshotRestoreTask extends
VisorSnapshotOneNodeTask<SnapshotR
* @param arg Restore task argument.
* @param debug Flag indicating whether debug information should be
printed into node log.
*/
- protected VisorSnapshotRestoreCancelJob(SnapshotRestoreCommandArg arg,
boolean debug) {
+ protected SnapshotRestoreCancelJob(SnapshotRestoreCommandArg arg,
boolean debug) {
super(arg, debug);
}
@@ -109,10 +108,10 @@ public class VisorSnapshotRestoreTask extends
VisorSnapshotOneNodeTask<SnapshotR
}
/**
- * @deprecated Use {@link VisorSnapshotStatusTask} instead.
+ * @deprecated Use {@link SnapshotStatusTask} instead.
*/
@Deprecated
- private static class VisorSnapshotRestoreStatusJob extends
VisorSnapshotJob<SnapshotRestoreCommandArg, String> {
+ private static class SnapshotRestoreStatusJob extends
SnapshotJob<SnapshotRestoreCommandArg, String> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -120,7 +119,7 @@ public class VisorSnapshotRestoreTask extends
VisorSnapshotOneNodeTask<SnapshotR
* @param arg Restore task argument.
* @param debug Flag indicating whether debug information should be
printed into node log.
*/
- protected VisorSnapshotRestoreStatusJob(SnapshotRestoreCommandArg arg,
boolean debug) {
+ protected SnapshotRestoreStatusJob(SnapshotRestoreCommandArg arg,
boolean debug) {
super(arg, debug);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotStatusCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotStatusCommand.java
index b16b981d7e1..7a063f800fe 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotStatusCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotStatusCommand.java
@@ -35,8 +35,6 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.T5;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.snapshot.VisorSnapshotStatusTask;
-import org.apache.ignite.internal.visor.snapshot.VisorSnapshotTaskResult;
import static
org.apache.ignite.internal.management.SystemViewTask.SimpleType.NUMBER;
import static
org.apache.ignite.internal.management.SystemViewTask.SimpleType.STRING;
@@ -54,12 +52,12 @@ public class SnapshotStatusCommand extends
AbstractSnapshotCommand<NoArg> {
}
/** {@inheritDoc} */
- @Override public Class<VisorSnapshotStatusTask> taskClass() {
- return VisorSnapshotStatusTask.class;
+ @Override public Class<SnapshotStatusTask> taskClass() {
+ return SnapshotStatusTask.class;
}
/** {@inheritDoc} */
- @Override public void printResult(NoArg arg, VisorSnapshotTaskResult res0,
Consumer<String> printer) {
+ @Override public void printResult(NoArg arg, SnapshotTaskResult res0,
Consumer<String> printer) {
Object res;
try {
@@ -75,9 +73,9 @@ public class SnapshotStatusCommand extends
AbstractSnapshotCommand<NoArg> {
return;
}
- VisorSnapshotStatusTask.SnapshotStatus status =
(VisorSnapshotStatusTask.SnapshotStatus)res;
+ SnapshotStatusTask.SnapshotStatus status =
(SnapshotStatusTask.SnapshotStatus)res;
- boolean isCreating = status.operation() ==
VisorSnapshotStatusTask.SnapshotOperation.CREATE;
+ boolean isCreating = status.operation() ==
SnapshotStatusTask.SnapshotOperation.CREATE;
boolean isIncremental = status.incrementIndex() > 0;
GridStringBuilder s = new GridStringBuilder();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotStatusTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotStatusTask.java
similarity index 89%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotStatusTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotStatusTask.java
index 82454889b3d..88fea0f7eab 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotStatusTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotStatusTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.snapshot;
+package org.apache.ignite.internal.management.snapshot;
import java.io.Serializable;
import java.util.Collection;
@@ -41,21 +41,21 @@ import org.apache.ignite.spi.metric.IntMetric;
import org.apache.ignite.spi.metric.LongMetric;
import org.jetbrains.annotations.Nullable;
+import static
org.apache.ignite.internal.management.snapshot.SnapshotStatusTask.SnapshotStatus;
import static
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManager.SNAPSHOT_METRICS;
import static
org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotRestoreProcess.SNAPSHOT_RESTORE_METRICS;
-import static
org.apache.ignite.internal.visor.snapshot.VisorSnapshotStatusTask.SnapshotStatus;
/**
* Task to get the status of the current snapshot operation in the cluster.
*/
@GridInternal
-public class VisorSnapshotStatusTask extends VisorMultiNodeTask<NoArg,
VisorSnapshotTaskResult, SnapshotStatus> {
+public class SnapshotStatusTask extends VisorMultiNodeTask<NoArg,
SnapshotTaskResult, SnapshotStatus> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
@Override protected VisorJob<NoArg, SnapshotStatus> job(NoArg arg) {
- return new VisorSnapshotStatusJob(arg, debug);
+ return new SnapshotStatusJob(arg, debug);
}
/** {@inheritDoc} */
@@ -64,21 +64,21 @@ public class VisorSnapshotStatusTask extends
VisorMultiNodeTask<NoArg, VisorSnap
}
/** {@inheritDoc} */
- @Nullable @Override protected VisorSnapshotTaskResult
reduce0(List<ComputeJobResult> results) {
+ @Nullable @Override protected SnapshotTaskResult
reduce0(List<ComputeJobResult> results) {
if (results.isEmpty())
- return new VisorSnapshotTaskResult(null, new
IgniteException("Failed to get the snapshot status. Topology is empty."));
+ return new SnapshotTaskResult(null, new IgniteException("Failed to
get the snapshot status. Topology is empty."));
IgniteException error = F.find(F.viewReadOnly(results,
ComputeJobResult::getException,
r -> r.getException() != null), null, F.notNull());
if (error != null)
- return new VisorSnapshotTaskResult(null, new
IgniteException("Failed to get the snapshot status.", error));
+ return new SnapshotTaskResult(null, new IgniteException("Failed to
get the snapshot status.", error));
Collection<SnapshotStatus> res = F.viewReadOnly(results,
ComputeJobResult::getData, r -> r.getData() != null);
// There is no snapshot operation.
if (res.isEmpty())
- return new VisorSnapshotTaskResult(null, null);
+ return new SnapshotTaskResult(null, null);
SnapshotStatus s0 = F.first(res);
@@ -90,11 +90,11 @@ public class VisorSnapshotStatusTask extends
VisorMultiNodeTask<NoArg, VisorSnap
res.forEach(s -> progress.putAll(s.progress));
- return new VisorSnapshotTaskResult(new SnapshotStatus(s0.op, s0.name,
s0.incIdx, s0.requestId, s0.startTime, progress), null);
+ return new SnapshotTaskResult(new SnapshotStatus(s0.op, s0.name,
s0.incIdx, s0.requestId, s0.startTime, progress), null);
}
/** */
- private static class VisorSnapshotStatusJob extends
VisorSnapshotJob<NoArg, SnapshotStatus> {
+ private static class SnapshotStatusJob extends SnapshotJob<NoArg,
SnapshotStatus> {
/** */
private static final long serialVersionUID = 0L;
@@ -102,7 +102,7 @@ public class VisorSnapshotStatusTask extends
VisorMultiNodeTask<NoArg, VisorSnap
* @param arg Job argument.
* @param debug Flag indicating whether debug information should be
printed into node log.
*/
- protected VisorSnapshotStatusJob(@Nullable NoArg arg, boolean debug) {
+ protected SnapshotStatusJob(@Nullable NoArg arg, boolean debug) {
super(arg, debug);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotTaskResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotTaskResult.java
similarity index 89%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotTaskResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotTaskResult.java
index aa0237c8ee3..a9dd29e5f1f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/snapshot/VisorSnapshotTaskResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotTaskResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.snapshot;
+package org.apache.ignite.internal.management.snapshot;
import java.io.IOException;
import java.io.ObjectInput;
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
/**
* Snapshot task result wrapper.
*/
-public class VisorSnapshotTaskResult extends IgniteDataTransferObject {
+public class SnapshotTaskResult extends IgniteDataTransferObject {
/** Serial version UID. */
private static final long serialVersionUID = 0L;
@@ -37,7 +37,7 @@ public class VisorSnapshotTaskResult extends
IgniteDataTransferObject {
private @Nullable Exception err;
/** Default constructor. */
- public VisorSnapshotTaskResult() {
+ public SnapshotTaskResult() {
// No-op.
}
@@ -45,7 +45,7 @@ public class VisorSnapshotTaskResult extends
IgniteDataTransferObject {
* @param res Task result.
* @param err Error.
*/
- public VisorSnapshotTaskResult(@Nullable Object res, @Nullable Exception
err) {
+ public SnapshotTaskResult(@Nullable Object res, @Nullable Exception err) {
this.err = err;
this.res = res;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorClusterNode.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/ClusterNode.java
similarity index 90%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorClusterNode.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/wal/ClusterNode.java
index 5706444e086..245e1824f01 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorClusterNode.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/ClusterNode.java
@@ -15,23 +15,22 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.misc;
+package org.apache.ignite.internal.management.wal;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.Collection;
import java.util.Map;
-import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorDataTransferObject;
/**
- * Data transfer object for {@link ClusterNode}.
+ * Data transfer object for {@link org.apache.ignite.cluster.ClusterNode}.
*/
-public class VisorClusterNode extends VisorDataTransferObject {
+public class ClusterNode extends VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -53,7 +52,7 @@ public class VisorClusterNode extends VisorDataTransferObject
{
/**
* Default constructor.
*/
- public VisorClusterNode() {
+ public ClusterNode() {
// No-op.
}
@@ -62,7 +61,7 @@ public class VisorClusterNode extends VisorDataTransferObject
{
*
* @param node Baseline node.
*/
- public VisorClusterNode(ClusterNode node) {
+ public ClusterNode(org.apache.ignite.cluster.ClusterNode node) {
consistentId = String.valueOf(node.consistentId());
addrs = node.addresses();
hostNames = node.hostNames();
@@ -124,6 +123,6 @@ public class VisorClusterNode extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorClusterNode.class, this);
+ return S.toString(ClusterNode.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalDeleteCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalDeleteCommand.java
index 834cc68b159..186c46800d6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalDeleteCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalDeleteCommand.java
@@ -22,9 +22,6 @@ import java.util.Map;
import java.util.function.Consumer;
import org.apache.ignite.internal.management.api.ComputeCommand;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.misc.VisorClusterNode;
-import org.apache.ignite.internal.visor.misc.VisorWalTask;
-import org.apache.ignite.internal.visor.misc.VisorWalTaskResult;
import org.apache.ignite.lang.IgniteExperimental;
import static
org.apache.ignite.internal.management.api.CommandUtils.DOUBLE_INDENT;
@@ -32,7 +29,7 @@ import static
org.apache.ignite.internal.management.api.CommandUtils.INDENT;
/** */
@IgniteExperimental
-public class WalDeleteCommand implements ComputeCommand<WalDeleteCommandArg,
VisorWalTaskResult> {
+public class WalDeleteCommand implements ComputeCommand<WalDeleteCommandArg,
WalTaskResult> {
/** {@inheritDoc} */
@Override public String description() {
return "Delete unused archived wal segments on each node";
@@ -44,8 +41,8 @@ public class WalDeleteCommand implements
ComputeCommand<WalDeleteCommandArg, Vis
}
/** {@inheritDoc} */
- @Override public Class<VisorWalTask> taskClass() {
- return VisorWalTask.class;
+ @Override public Class<WalTask> taskClass() {
+ return WalTask.class;
}
/** {@inheritDoc} */
@@ -54,16 +51,16 @@ public class WalDeleteCommand implements
ComputeCommand<WalDeleteCommandArg, Vis
}
/** {@inheritDoc} */
- @Override public void printResult(WalDeleteCommandArg arg,
VisorWalTaskResult taskRes, Consumer<String> printer) {
+ @Override public void printResult(WalDeleteCommandArg arg, WalTaskResult
taskRes, Consumer<String> printer) {
printer.accept("WAL segments deleted for nodes:");
printer.accept("");
Map<String, Collection<String>> res = taskRes.results();
Map<String, Exception> errors = taskRes.exceptions();
- Map<String, VisorClusterNode> nodesInfo = taskRes.getNodesInfo();
+ Map<String, ClusterNode> nodesInfo = taskRes.getNodesInfo();
for (Map.Entry<String, Collection<String>> entry : res.entrySet()) {
- VisorClusterNode node = nodesInfo.get(entry.getKey());
+ ClusterNode node = nodesInfo.get(entry.getKey());
printer.accept("Node=" + node.getConsistentId());
printer.accept(DOUBLE_INDENT + "addresses " +
U.addressesAsString(node.getAddresses(), node.getHostNames()));
@@ -71,7 +68,7 @@ public class WalDeleteCommand implements
ComputeCommand<WalDeleteCommandArg, Vis
}
for (Map.Entry<String, Exception> entry : errors.entrySet()) {
- VisorClusterNode node = nodesInfo.get(entry.getKey());
+ ClusterNode node = nodesInfo.get(entry.getKey());
printer.accept("Node=" + node.getConsistentId());
printer.accept(DOUBLE_INDENT + "addresses " +
U.addressesAsString(node.getAddresses(), node.getHostNames()));
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalPrintCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalPrintCommand.java
index 86746168447..85aacff3ba0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalPrintCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalPrintCommand.java
@@ -22,9 +22,6 @@ import java.util.Map;
import java.util.function.Consumer;
import org.apache.ignite.internal.management.api.ComputeCommand;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.misc.VisorClusterNode;
-import org.apache.ignite.internal.visor.misc.VisorWalTask;
-import org.apache.ignite.internal.visor.misc.VisorWalTaskResult;
import org.apache.ignite.lang.IgniteExperimental;
import static
org.apache.ignite.internal.management.api.CommandUtils.DOUBLE_INDENT;
@@ -32,7 +29,7 @@ import static
org.apache.ignite.internal.management.api.CommandUtils.INDENT;
/** */
@IgniteExperimental
-public class WalPrintCommand implements ComputeCommand<WalDeleteCommandArg,
VisorWalTaskResult> {
+public class WalPrintCommand implements ComputeCommand<WalDeleteCommandArg,
WalTaskResult> {
/** {@inheritDoc} */
@Override public String description() {
return "Print absolute paths of unused archived wal segments on each
node";
@@ -44,21 +41,21 @@ public class WalPrintCommand implements
ComputeCommand<WalDeleteCommandArg, Viso
}
/** {@inheritDoc} */
- @Override public Class<VisorWalTask> taskClass() {
- return VisorWalTask.class;
+ @Override public Class<WalTask> taskClass() {
+ return WalTask.class;
}
/** {@inheritDoc} */
- @Override public void printResult(WalDeleteCommandArg arg,
VisorWalTaskResult taskRes, Consumer<String> printer) {
+ @Override public void printResult(WalDeleteCommandArg arg, WalTaskResult
taskRes, Consumer<String> printer) {
printer.accept("Unused wal segments per node:");
printer.accept("");
Map<String, Collection<String>> res = taskRes.results();
Map<String, Exception> failRes = taskRes.exceptions();
- Map<String, VisorClusterNode> nodesInfo = taskRes.getNodesInfo();
+ Map<String, ClusterNode> nodesInfo = taskRes.getNodesInfo();
for (Map.Entry<String, Collection<String>> entry : res.entrySet()) {
- VisorClusterNode node = nodesInfo.get(entry.getKey());
+ ClusterNode node = nodesInfo.get(entry.getKey());
printer.accept("Node=" + node.getConsistentId());
printer.accept(DOUBLE_INDENT + "addresses " +
U.addressesAsString(node.getAddresses(), node.getHostNames()));
@@ -70,7 +67,7 @@ public class WalPrintCommand implements
ComputeCommand<WalDeleteCommandArg, Viso
}
for (Map.Entry<String, Exception> entry : failRes.entrySet()) {
- VisorClusterNode node = nodesInfo.get(entry.getKey());
+ ClusterNode node = nodesInfo.get(entry.getKey());
printer.accept("Node=" + node.getConsistentId());
printer.accept(DOUBLE_INDENT + "addresses " +
U.addressesAsString(node.getAddresses(), node.getHostNames()));
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorWalTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalTask.java
similarity index 90%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorWalTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalTask.java
index 8faf0caaf0b..4c4330a7493 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorWalTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.misc;
+package org.apache.ignite.internal.management.wal;
import java.io.File;
import java.io.FileFilter;
@@ -33,12 +33,10 @@ import java.util.regex.Pattern;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.management.wal.WalDeleteCommandArg;
import
org.apache.ignite.internal.management.wal.WalPrintCommand.WalPrintCommandArg;
import
org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager;
import
org.apache.ignite.internal.processors.cache.persistence.filename.PdsFolderSettings;
@@ -56,7 +54,7 @@ import org.jetbrains.annotations.Nullable;
* Performs WAL cleanup clusterwide.
*/
@GridInternal
-public class VisorWalTask extends VisorMultiNodeTask<WalDeleteCommandArg,
VisorWalTaskResult, Collection<String>> {
+public class WalTask extends VisorMultiNodeTask<WalDeleteCommandArg,
WalTaskResult, Collection<String>> {
/** */
private static final long serialVersionUID = 0L;
@@ -75,13 +73,13 @@ public class VisorWalTask extends
VisorMultiNodeTask<WalDeleteCommandArg, VisorW
};
/** {@inheritDoc} */
- @Override protected VisorWalJob job(WalDeleteCommandArg arg) {
- return new VisorWalJob(arg, debug);
+ @Override protected WalJob job(WalDeleteCommandArg arg) {
+ return new WalJob(arg, debug);
}
/** {@inheritDoc} */
@Override protected Collection<UUID>
jobNodes(VisorTaskArgument<WalDeleteCommandArg> arg) {
- Collection<ClusterNode> srvNodes =
ignite.cluster().forServers().nodes();
+ Collection<org.apache.ignite.cluster.ClusterNode> srvNodes =
ignite.cluster().forServers().nodes();
Collection<UUID> ret = new ArrayList<>(srvNodes.size());
WalDeleteCommandArg taskArg = arg.getArgument();
@@ -91,11 +89,11 @@ public class VisorWalTask extends
VisorMultiNodeTask<WalDeleteCommandArg, VisorW
: null;
if (nodeIds == null) {
- for (ClusterNode node : srvNodes)
+ for (org.apache.ignite.cluster.ClusterNode node : srvNodes)
ret.add(node.id());
}
else {
- for (ClusterNode node : srvNodes) {
+ for (org.apache.ignite.cluster.ClusterNode node : srvNodes) {
if (nodeIds.contains(node.consistentId().toString()))
ret.add(node.id());
}
@@ -105,13 +103,13 @@ public class VisorWalTask extends
VisorMultiNodeTask<WalDeleteCommandArg, VisorW
}
/** {@inheritDoc} */
- @Nullable @Override protected VisorWalTaskResult
reduce0(List<ComputeJobResult> results) throws IgniteException {
+ @Nullable @Override protected WalTaskResult reduce0(List<ComputeJobResult>
results) throws IgniteException {
Map<String, Exception> exRes = U.newHashMap(0);
Map<String, Collection<String>> res = U.newHashMap(results.size());
- Map<String, VisorClusterNode> nodesInfo = U.newHashMap(results.size());
+ Map<String, ClusterNode> nodesInfo = U.newHashMap(results.size());
for (ComputeJobResult result: results) {
- ClusterNode node = result.getNode();
+ org.apache.ignite.cluster.ClusterNode node = result.getNode();
String nodeId = node.consistentId().toString();
@@ -124,16 +122,16 @@ public class VisorWalTask extends
VisorMultiNodeTask<WalDeleteCommandArg, VisorW
res.put(nodeId, data);
}
- nodesInfo.put(nodeId, new VisorClusterNode(node));
+ nodesInfo.put(nodeId, new ClusterNode(node));
}
- return new VisorWalTaskResult(res, exRes, nodesInfo);
+ return new WalTaskResult(res, exRes, nodesInfo);
}
/**
* Performs WAL cleanup per node.
*/
- private static class VisorWalJob extends VisorJob<WalDeleteCommandArg,
Collection<String>> {
+ private static class WalJob extends VisorJob<WalDeleteCommandArg,
Collection<String>> {
/** */
private static final long serialVersionUID = 0L;
@@ -145,7 +143,7 @@ public class VisorWalTask extends
VisorMultiNodeTask<WalDeleteCommandArg, VisorW
* @param arg WAL task argument.
* @param debug Debug flag.
*/
- public VisorWalJob(WalDeleteCommandArg arg, boolean debug) {
+ public WalJob(WalDeleteCommandArg arg, boolean debug) {
super(arg, debug);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorWalTaskResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalTaskResult.java
similarity index 83%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorWalTaskResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalTaskResult.java
index 104c2f30595..3a1987aa156 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorWalTaskResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalTaskResult.java
@@ -15,7 +15,7 @@
* * limitations under the License.
*/
-package org.apache.ignite.internal.visor.misc;
+package org.apache.ignite.internal.management.wal;
import java.io.IOException;
import java.io.ObjectInput;
@@ -28,9 +28,9 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorDataTransferObject;
/**
- * Result of {@link VisorWalTask}.
+ * Result of {@link WalTask}.
*/
-public class VisorWalTaskResult extends VisorDataTransferObject {
+public class WalTaskResult extends VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -44,24 +44,24 @@ public class VisorWalTaskResult extends
VisorDataTransferObject {
/** Nodes info by node consistent id. */
@GridToStringInclude
- private Map<String, VisorClusterNode> nodesInfo;
+ private Map<String, ClusterNode> nodesInfo;
/**
* Default constructor.
*/
- public VisorWalTaskResult() {
+ public WalTaskResult() {
// No-op.
}
/**
- * Create {@link VisorWalTask } result with given parameters.
+ * Create {@link WalTask } result with given parameters.
*
* @param results List of log search results.
* @param exceptions List of exceptions by node id.
* @param nodesInfo Nodes info.
*/
- public VisorWalTaskResult(Map<String, Collection<String>> results,
Map<String, Exception> exceptions,
- Map<String, VisorClusterNode> nodesInfo) {
+ public WalTaskResult(Map<String, Collection<String>> results, Map<String,
Exception> exceptions,
+ Map<String, ClusterNode> nodesInfo) {
this.exceptions = exceptions;
this.results = results;
this.nodesInfo = nodesInfo;
@@ -88,7 +88,7 @@ public class VisorWalTaskResult extends
VisorDataTransferObject {
*
* @return Nodes info.
*/
- public Map<String, VisorClusterNode> getNodesInfo() {
+ public Map<String, ClusterNode> getNodesInfo() {
return nodesInfo;
}
@@ -108,6 +108,6 @@ public class VisorWalTaskResult extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorWalTaskResult.class, this);
+ return S.toString(WalTaskResult.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreStatusTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreStatusTask.java
index 0c596d1cdb8..14a395779c9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreStatusTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreStatusTask.java
@@ -27,16 +27,16 @@ import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.compute.ComputeJobResultPolicy;
import org.apache.ignite.compute.ComputeTaskAdapter;
import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.management.snapshot.SnapshotStatusTask;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.snapshot.VisorSnapshotStatusTask;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.jetbrains.annotations.NotNull;
/**
* Snapshot restore status task.
*
- * @deprecated Use {@link VisorSnapshotStatusTask} instead.
+ * @deprecated Use {@link SnapshotStatusTask} instead.
*/
@GridInternal
@Deprecated
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties
b/modules/core/src/main/resources/META-INF/classnames.properties
index 77ddbb372f6..42103ad2254 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -2238,13 +2238,13 @@
org.apache.ignite.internal.management.metric.MetricTask$MetricJob
org.apache.ignite.internal.management.ClusterChangeTagTask
org.apache.ignite.internal.management.ClusterChangeTagTask$VisorClusterChangeTagJob
org.apache.ignite.internal.management.ClusterChangeTagTaskResult
-org.apache.ignite.internal.visor.misc.VisorClusterNode
+org.apache.ignite.internal.management.wal.ClusterNode
org.apache.ignite.internal.visor.misc.VisorIdAndTagViewTask
org.apache.ignite.internal.visor.misc.VisorIdAndTagViewTask$IdAndTagViewJob
org.apache.ignite.internal.visor.misc.VisorIdAndTagViewTaskResult
-org.apache.ignite.internal.visor.misc.VisorWalTask
-org.apache.ignite.internal.visor.misc.VisorWalTask$VisorWalJob
-org.apache.ignite.internal.visor.misc.VisorWalTaskResult
+org.apache.ignite.internal.management.wal.WalTask
+org.apache.ignite.internal.management.wal.WalTask$WalJob
+org.apache.ignite.internal.management.wal.WalTaskResult
org.apache.ignite.internal.visor.performancestatistics.VisorPerformanceStatisticsOperation
org.apache.ignite.internal.management.performancestatistics.PerformanceStatisticsTask
org.apache.ignite.internal.management.performancestatistics.PerformanceStatisticsTask$VisorPerformanceStatisticsJob
@@ -2269,21 +2269,21 @@
org.apache.ignite.internal.management.ShutdownPolicyTaskResult
org.apache.ignite.internal.management.kill.SnapshotCancelTask
org.apache.ignite.internal.management.kill.SnapshotCancelTask$CancelSnapshotArg
org.apache.ignite.internal.management.kill.SnapshotCancelTask$SnapshotCancelJob
-org.apache.ignite.internal.visor.snapshot.VisorSnapshotCheckTask
-org.apache.ignite.internal.visor.snapshot.VisorSnapshotCheckTask$VisorSnapshotCheckJob
-org.apache.ignite.internal.visor.snapshot.VisorSnapshotCreateTask
-org.apache.ignite.internal.visor.snapshot.VisorSnapshotCreateTask$VisorSnapshotCreateJob
-org.apache.ignite.internal.visor.snapshot.VisorSnapshotJob
-org.apache.ignite.internal.visor.snapshot.VisorSnapshotOneNodeTask
-org.apache.ignite.internal.visor.snapshot.VisorSnapshotRestoreTask
-org.apache.ignite.internal.visor.snapshot.VisorSnapshotRestoreTask$VisorSnapshotRestoreCancelJob
-org.apache.ignite.internal.visor.snapshot.VisorSnapshotRestoreTask$VisorSnapshotRestoreStatusJob
-org.apache.ignite.internal.visor.snapshot.VisorSnapshotRestoreTask$VisorSnapshotStartRestoreJob
-org.apache.ignite.internal.visor.snapshot.VisorSnapshotStatusTask
-org.apache.ignite.internal.visor.snapshot.VisorSnapshotStatusTask$SnapshotOperation
-org.apache.ignite.internal.visor.snapshot.VisorSnapshotStatusTask$SnapshotStatus
-org.apache.ignite.internal.visor.snapshot.VisorSnapshotStatusTask$VisorSnapshotStatusJob
-org.apache.ignite.internal.visor.snapshot.VisorSnapshotTaskResult
+org.apache.ignite.internal.management.snapshot.SnapshotCheckTask
+org.apache.ignite.internal.management.snapshot.SnapshotCheckTask$SnapshotCheckJob
+org.apache.ignite.internal.management.snapshot.SnapshotCreateTask
+org.apache.ignite.internal.management.snapshot.SnapshotCreateTask$SnapshotCreateJob
+org.apache.ignite.internal.management.snapshot.SnapshotJob
+org.apache.ignite.internal.management.snapshot.SnapshotOneNodeTask
+org.apache.ignite.internal.management.snapshot.SnapshotRestoreTask
+org.apache.ignite.internal.management.snapshot.SnapshotRestoreTask$SnapshotRestoreCancelJob
+org.apache.ignite.internal.management.snapshot.SnapshotRestoreTask$SnapshotRestoreStatusJob
+org.apache.ignite.internal.management.snapshot.SnapshotRestoreTask$SnapshotStartRestoreJob
+org.apache.ignite.internal.management.snapshot.SnapshotStatusTask
+org.apache.ignite.internal.management.snapshot.SnapshotStatusTask$SnapshotOperation
+org.apache.ignite.internal.management.snapshot.SnapshotStatusTask$SnapshotStatus
+org.apache.ignite.internal.management.snapshot.SnapshotStatusTask$SnapshotStatusJob
+org.apache.ignite.internal.management.snapshot.SnapshotTaskResult
org.apache.ignite.internal.management.SystemViewTask
org.apache.ignite.internal.management.SystemViewTask$SimpleType
org.apache.ignite.internal.management.SystemViewTask$SystemViewJob
diff --git
a/modules/core/src/test/java/org/apache/ignite/util/GridInternalTaskUnusedWalSegmentsTest.java
b/modules/core/src/test/java/org/apache/ignite/util/GridInternalTaskUnusedWalSegmentsTest.java
index 4ab791b5e02..f6d33a47515 100644
---
a/modules/core/src/test/java/org/apache/ignite/util/GridInternalTaskUnusedWalSegmentsTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/util/GridInternalTaskUnusedWalSegmentsTest.java
@@ -34,16 +34,17 @@ import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.management.wal.WalCommand;
import org.apache.ignite.internal.management.wal.WalDeleteCommandArg;
import
org.apache.ignite.internal.management.wal.WalPrintCommand.WalPrintCommandArg;
+import org.apache.ignite.internal.management.wal.WalTask;
+import org.apache.ignite.internal.management.wal.WalTaskResult;
import org.apache.ignite.internal.visor.VisorTaskArgument;
-import org.apache.ignite.internal.visor.misc.VisorWalTask;
-import org.apache.ignite.internal.visor.misc.VisorWalTaskResult;
import org.apache.ignite.testframework.junits.WithSystemProperty;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
+
import static
org.apache.ignite.IgniteSystemProperties.IGNITE_PDS_MAX_CHECKPOINT_MEMORY_HISTORY_SIZE;
/**
- * Test correctness of VisorWalTask.
+ * Test correctness of WalTask.
*/
public class GridInternalTaskUnusedWalSegmentsTest extends
GridCommonAbstractTest {
/** {@inheritDoc} */
@@ -110,7 +111,7 @@ public class GridInternalTaskUnusedWalSegmentsTest extends
GridCommonAbstractTes
forceCheckpoint();
- VisorWalTaskResult printRes =
ig0.compute().execute(VisorWalTask.class,
+ WalTaskResult printRes = ig0.compute().execute(WalTask.class,
new VisorTaskArgument<>(ig0.cluster().node().id(),
new WalPrintCommandArg(), false));
@@ -123,7 +124,7 @@ public class GridInternalTaskUnusedWalSegmentsTest extends
GridCommonAbstractTes
walArchives.add(Paths.get(path).toFile());
}
- VisorWalTaskResult delRes =
ig0.compute().execute(VisorWalTask.class,
+ WalTaskResult delRes = ig0.compute().execute(WalTask.class,
new VisorTaskArgument<>(ig0.cluster().node().id(),
new WalDeleteCommandArg(), false));
