This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 1d95f67e8d HDDS-12055. Move ozone debug container to ozone debug
datanode container (#7675)
1d95f67e8d is described below
commit 1d95f67e8d50967db06b42033bd94dc4b249698f
Author: Sarveksha Yeshavantha Raju
<[email protected]>
AuthorDate: Sat Jan 11 21:34:41 2025 +0530
HDDS-12055. Move ozone debug container to ozone debug datanode container
(#7675)
---
.../smoketest/compatibility/dn-one-rocksdb.robot | 2 +-
.../DatanodeDebug.java} | 38 ++++++++--------------
.../container/ContainerCommands.java | 19 +++--------
.../{ => datanode}/container/ExportSubcommand.java | 4 +--
.../{ => datanode}/container/InfoSubcommand.java | 6 ++--
.../container/InspectSubcommand.java | 4 +--
.../{ => datanode}/container/ListSubcommand.java | 6 ++--
.../{ => datanode}/container/package-info.java | 2 +-
.../hadoop/ozone/debug/datanode/package-info.java | 22 +++++++++++++
9 files changed, 51 insertions(+), 52 deletions(-)
diff --git
a/hadoop-ozone/dist/src/main/smoketest/compatibility/dn-one-rocksdb.robot
b/hadoop-ozone/dist/src/main/smoketest/compatibility/dn-one-rocksdb.robot
index 9599e31984..282aa8f168 100644
--- a/hadoop-ozone/dist/src/main/smoketest/compatibility/dn-one-rocksdb.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/dn-one-rocksdb.robot
@@ -25,5 +25,5 @@ Test Timeout 5 minutes
Create a container and check container schema version
${output} = Execute ozone admin container create
Should not contain ${output} Failed
- ${output} = Execute ozone debug container list
+ ${output} = Execute ozone debug datanode container list
Should contain ${output} \"schemaVersion\" : \"3\"
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/ListSubcommand.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/DatanodeDebug.java
similarity index 51%
copy from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/ListSubcommand.java
copy to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/DatanodeDebug.java
index 037d61327b..a83765fea9 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/ListSubcommand.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/DatanodeDebug.java
@@ -16,35 +16,23 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.debug.container;
+package org.apache.hadoop.ozone.debug.datanode;
-import org.apache.hadoop.ozone.container.common.interfaces.Container;
+import org.apache.hadoop.hdds.cli.DebugSubcommand;
+import org.apache.hadoop.ozone.debug.datanode.container.ContainerCommands;
+import org.kohsuke.MetaInfServices;
import picocli.CommandLine;
-import picocli.CommandLine.Command;
-
-import java.util.concurrent.Callable;
-
-import static
org.apache.hadoop.ozone.debug.container.ContainerCommands.outputContainer;
/**
- * Handles {@code ozone debug container list} command.
+ * Datanode debug related commands.
*/
-@Command(
- name = "list",
- description = "Show container info of all container replicas on datanode")
-public class ListSubcommand implements Callable<Void> {
-
- @CommandLine.ParentCommand
- private ContainerCommands parent;
-
- @Override
- public Void call() throws Exception {
- parent.loadContainersFromVolumes();
-
- for (Container<?> container : parent.getController().getContainers()) {
- outputContainer(container.getContainerData());
[email protected](
+ name = "datanode",
+ description = "Debug commands related to Datanode.",
+ subcommands = {
+ ContainerCommands.class
}
-
- return null;
- }
+)
+@MetaInfServices(DebugSubcommand.class)
+public class DatanodeDebug implements DebugSubcommand {
}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/ContainerCommands.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/ContainerCommands.java
similarity index 93%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/ContainerCommands.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/ContainerCommands.java
index 3df8330136..d3a0960f2d 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/ContainerCommands.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/ContainerCommands.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.debug.container;
+package org.apache.hadoop.ozone.debug.datanode.container;
import com.google.common.base.Preconditions;
+import org.apache.hadoop.hdds.cli.AbstractSubcommand;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
-import org.apache.hadoop.hdds.cli.DebugSubcommand;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
@@ -42,12 +42,9 @@ import
org.apache.hadoop.ozone.container.common.volume.StorageVolume;
import org.apache.hadoop.ozone.container.ozoneimpl.ContainerController;
import org.apache.hadoop.ozone.container.ozoneimpl.ContainerReader;
import org.apache.hadoop.ozone.container.upgrade.VersionedDatanodeFeatures;
-import org.apache.hadoop.ozone.debug.OzoneDebug;
-import org.kohsuke.MetaInfServices;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import picocli.CommandLine.Command;
-import picocli.CommandLine.ParentCommand;
import java.io.File;
import java.io.IOException;
@@ -77,25 +74,17 @@ import java.util.stream.Stream;
ExportSubcommand.class,
InspectSubcommand.class
})
-@MetaInfServices(DebugSubcommand.class)
-public class ContainerCommands implements DebugSubcommand {
+public class ContainerCommands extends AbstractSubcommand {
private static final Logger LOG =
LoggerFactory.getLogger(ContainerCommands.class);
- @ParentCommand
- private OzoneDebug parent;
-
private MutableVolumeSet volumeSet;
private ContainerController controller;
- OzoneConfiguration getOzoneConf() {
- return parent.getOzoneConf();
- }
-
public void loadContainersFromVolumes() throws IOException {
- OzoneConfiguration conf = parent.getOzoneConf();
+ OzoneConfiguration conf = getOzoneConf();
ContainerSet containerSet = new ContainerSet(null, 1000, true);
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/ExportSubcommand.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/ExportSubcommand.java
similarity index 96%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/ExportSubcommand.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/ExportSubcommand.java
index d0337f6534..984faec8f7 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/ExportSubcommand.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/ExportSubcommand.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.debug.container;
+package org.apache.hadoop.ozone.debug.datanode.container;
import
org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import
org.apache.hadoop.ozone.container.replication.ContainerReplicationSource;
@@ -35,7 +35,7 @@ import static
org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Res
import static
org.apache.hadoop.ozone.container.replication.CopyContainerCompression.NO_COMPRESSION;
/**
- * Handles {@code ozone debug container export} command.
+ * Handles {@code ozone debug datanode container export} command.
*/
@Command(
name = "export",
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/InfoSubcommand.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/InfoSubcommand.java
similarity index 88%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/InfoSubcommand.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/InfoSubcommand.java
index 0d70d90c5e..87ebd21cac 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/InfoSubcommand.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/InfoSubcommand.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.debug.container;
+package org.apache.hadoop.ozone.debug.datanode.container;
import org.apache.hadoop.ozone.container.common.interfaces.Container;
import picocli.CommandLine;
@@ -24,10 +24,10 @@ import picocli.CommandLine.Command;
import java.util.concurrent.Callable;
-import static
org.apache.hadoop.ozone.debug.container.ContainerCommands.outputContainer;
+import static
org.apache.hadoop.ozone.debug.datanode.container.ContainerCommands.outputContainer;
/**
- * Handles {@code ozone debug container info} command.
+ * Handles {@code ozone debug datanode container info} command.
*/
@Command(
name = "info",
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/InspectSubcommand.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/InspectSubcommand.java
similarity index 96%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/InspectSubcommand.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/InspectSubcommand.java
index f924277d27..63d3cab523 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/InspectSubcommand.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/InspectSubcommand.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.debug.container;
+package org.apache.hadoop.ozone.debug.datanode.container;
import org.apache.hadoop.hdds.cli.AbstractSubcommand;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
@@ -33,7 +33,7 @@ import java.io.IOException;
import java.util.concurrent.Callable;
/**
- * {@code ozone debug container inspect},
+ * {@code ozone debug datanode container inspect},
* a command to run {@link KeyValueContainerMetadataInspector}.
*/
@Command(
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/ListSubcommand.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/ListSubcommand.java
similarity index 87%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/ListSubcommand.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/ListSubcommand.java
index 037d61327b..ff6cc11a71 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/ListSubcommand.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/ListSubcommand.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.debug.container;
+package org.apache.hadoop.ozone.debug.datanode.container;
import org.apache.hadoop.ozone.container.common.interfaces.Container;
import picocli.CommandLine;
@@ -24,10 +24,10 @@ import picocli.CommandLine.Command;
import java.util.concurrent.Callable;
-import static
org.apache.hadoop.ozone.debug.container.ContainerCommands.outputContainer;
+import static
org.apache.hadoop.ozone.debug.datanode.container.ContainerCommands.outputContainer;
/**
- * Handles {@code ozone debug container list} command.
+ * Handles {@code ozone debug datanode container list} command.
*/
@Command(
name = "list",
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/package-info.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/package-info.java
similarity index 93%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/package-info.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/package-info.java
index fbfc293d30..d34d4d9dd2 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/container/package-info.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/container/package-info.java
@@ -19,4 +19,4 @@
/**
* Contains all of the datanode container replica related commands.
*/
-package org.apache.hadoop.ozone.debug.container;
+package org.apache.hadoop.ozone.debug.datanode.container;
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/package-info.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/package-info.java
new file mode 100644
index 0000000000..9117cc6b22
--- /dev/null
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/datanode/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Datanode debug related commands.
+ */
+package org.apache.hadoop.ozone.debug.datanode;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
