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 85e752123f HDDS-12056. Move ozone debug chunkinfo to ozone debug
replicas chunk-info (#7702)
85e752123f is described below
commit 85e752123f4a30d109a686b46c6e14336035ed40
Author: Sarveksha Yeshavantha Raju
<[email protected]>
AuthorDate: Wed Jan 15 21:16:36 2025 +0530
HDDS-12056. Move ozone debug chunkinfo to ozone debug replicas chunk-info
(#7702)
---
hadoop-ozone/dist/src/main/compose/testlib.sh | 2 +-
.../hadoop/ozone/shell/TestOzoneDebugShell.java | 4 ++--
.../ReplicasDebug.java} | 21 +++++++++++++++++++--
.../{ => replicas}/chunk/ChunkDataNodeDetails.java | 2 +-
.../debug/{ => replicas}/chunk/ChunkDetails.java | 2 +-
.../debug/{ => replicas}/chunk/ChunkKeyHandler.java | 20 +++++---------------
.../ozone/debug/{ => replicas}/chunk/ChunkType.java | 2 +-
.../{ => replicas}/chunk/ContainerChunkInfo.java | 2 +-
.../debug/{ => replicas}/chunk/package-info.java | 4 ++--
.../debug/{chunk => replicas}/package-info.java | 4 ++--
10 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh
b/hadoop-ozone/dist/src/main/compose/testlib.sh
index 8ced94e500..1ab7533942 100755
--- a/hadoop-ozone/dist/src/main/compose/testlib.sh
+++ b/hadoop-ozone/dist/src/main/compose/testlib.sh
@@ -580,7 +580,7 @@ execute_debug_tests() {
# get block locations for key
local chunkinfo="${key}-blocks-${prefix}"
- docker-compose exec -T ${SCM} bash -c "ozone debug chunkinfo
${volume}/${bucket}/${key}" > "$chunkinfo"
+ docker-compose exec -T ${SCM} bash -c "ozone debug replicas chunk-info
${volume}/${bucket}/${key}" > "$chunkinfo"
local host="$(jq -r '.KeyLocations[0][0]["Datanode-HostName"]' ${chunkinfo})"
local container="${host%%.*}"
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDebugShell.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDebugShell.java
index d8315cb427..b7b23c0528 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDebugShell.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDebugShell.java
@@ -206,7 +206,7 @@ public class TestOzoneDebugShell {
Path.SEPARATOR + volumeName + Path.SEPARATOR + bucketName;
String[] args = new String[] {
getSetConfStringFromConf(OMConfigKeys.OZONE_OM_ADDRESS_KEY),
- "chunkinfo", bucketPath + Path.SEPARATOR + keyName };
+ "replicas", "chunk-info", bucketPath + Path.SEPARATOR + keyName };
int exitCode = ozoneDebugShell.execute(args);
return exitCode;
@@ -218,7 +218,7 @@ public class TestOzoneDebugShell {
Path.SEPARATOR + volumeName + Path.SEPARATOR + bucketName;
String[] args = new String[] {
getSetConfStringFromConf(OMConfigKeys.OZONE_OM_ADDRESS_KEY),
- "chunkinfo", bucketPath + Path.SEPARATOR + keyName };
+ "replicas", "chunk-info", bucketPath + Path.SEPARATOR + keyName };
int exitCode = 1;
try (GenericTestUtils.SystemOutCapturer capture = new GenericTestUtils
.SystemOutCapturer()) {
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/package-info.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/ReplicasDebug.java
similarity index 55%
copy from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/package-info.java
copy to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/ReplicasDebug.java
index d81f2276a6..f68da07ca5 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/package-info.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/ReplicasDebug.java
@@ -16,7 +16,24 @@
* limitations under the License.
*/
+package org.apache.hadoop.ozone.debug.replicas;
+
+import org.apache.hadoop.hdds.cli.DebugSubcommand;
+import org.apache.hadoop.ozone.debug.replicas.chunk.ChunkKeyHandler;
+import org.kohsuke.MetaInfServices;
+import picocli.CommandLine;
+
/**
- * Command to debug chunk information.
+ * Replicas debug related commands.
*/
-package org.apache.hadoop.ozone.debug.chunk;
[email protected](
+ name = "replicas",
+ description = "Debug commands for replica-related issues, retrieving
replica information from the OM and " +
+ "performing checks over the network against a running cluster.",
+ subcommands = {
+ ChunkKeyHandler.class
+ }
+)
+@MetaInfServices(DebugSubcommand.class)
+public class ReplicasDebug implements DebugSubcommand {
+}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/ChunkDataNodeDetails.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/ChunkDataNodeDetails.java
similarity index 96%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/ChunkDataNodeDetails.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/ChunkDataNodeDetails.java
index cf6b7d7a11..0c2d62aa96 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/ChunkDataNodeDetails.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/ChunkDataNodeDetails.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.debug.chunk;
+package org.apache.hadoop.ozone.debug.replicas.chunk;
/**
* Class that gives datanode details on which the chunk is present.
*/
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/ChunkDetails.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/ChunkDetails.java
similarity index 96%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/ChunkDetails.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/ChunkDetails.java
index 4e2b5314a0..49d998ee4d 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/ChunkDetails.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/ChunkDetails.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.debug.chunk;
+package org.apache.hadoop.ozone.debug.replicas.chunk;
/**
* Class that gives chunkDetails.
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/ChunkKeyHandler.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/ChunkKeyHandler.java
similarity index 94%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/ChunkKeyHandler.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/ChunkKeyHandler.java
index 6944c38049..3f6723b750 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/ChunkKeyHandler.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/ChunkKeyHandler.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.debug.chunk;
+package org.apache.hadoop.ozone.debug.replicas.chunk;
import java.io.File;
import java.io.IOException;
@@ -27,7 +27,6 @@ import java.util.HashSet;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.hadoop.hdds.cli.DebugSubcommand;
import org.apache.hadoop.hdds.client.ECReplicationConfig;
import org.apache.hadoop.hdds.client.StandaloneReplicationConfig;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
@@ -42,15 +41,12 @@ import org.apache.hadoop.hdds.server.JsonUtils;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.container.common.impl.ContainerLayoutVersion;
-import org.apache.hadoop.ozone.debug.OzoneDebug;
import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol;
import org.apache.hadoop.ozone.shell.OzoneAddress;
import org.apache.hadoop.ozone.shell.keys.KeyHandler;
-import org.kohsuke.MetaInfServices;
-import picocli.CommandLine;
import picocli.CommandLine.Command;
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.ONE;
@@ -58,15 +54,9 @@ import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor
/**
* Class that gives chunk location given a specific key.
*/
-@Command(name = "chunkinfo",
- description = "returns chunk location"
- + " information about an existing key")
-@MetaInfServices(DebugSubcommand.class)
-public class ChunkKeyHandler extends KeyHandler implements
- DebugSubcommand {
-
- @CommandLine.ParentCommand
- private OzoneDebug parent;
+@Command(name = "chunk-info",
+ description = "Returns chunk location information about an existing
key")
+public class ChunkKeyHandler extends KeyHandler {
private String getChunkLocationPath(String containerLocation) {
return containerLocation + File.separator + OzoneConsts.STORAGE_DIR_CHUNKS;
@@ -75,7 +65,7 @@ public class ChunkKeyHandler extends KeyHandler implements
@Override
protected void execute(OzoneClient client, OzoneAddress address)
throws IOException {
- try (ContainerOperationClient containerOperationClient = new
ContainerOperationClient(parent.getOzoneConf());
+ try (ContainerOperationClient containerOperationClient = new
ContainerOperationClient(getOzoneConf());
XceiverClientManager xceiverClientManager =
containerOperationClient.getXceiverClientManager()) {
OzoneManagerProtocol ozoneManagerClient =
client.getObjectStore().getClientProxy().getOzoneManagerClient();
address.ensureKeyAddress();
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/ChunkType.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/ChunkType.java
similarity index 94%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/ChunkType.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/ChunkType.java
index 3af7f81040..56e969b7d1 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/ChunkType.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/ChunkType.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations
under
* the License.
*/
-package org.apache.hadoop.ozone.debug.chunk;
+package org.apache.hadoop.ozone.debug.replicas.chunk;
/**
* The type of chunks of an Erasure Coded key.
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/ContainerChunkInfo.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/ContainerChunkInfo.java
similarity index 98%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/ContainerChunkInfo.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/ContainerChunkInfo.java
index 1c5fc090b0..a7e2edc1ef 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/ContainerChunkInfo.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/ContainerChunkInfo.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.debug.chunk;
+package org.apache.hadoop.ozone.debug.replicas.chunk;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/package-info.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/package-info.java
similarity index 88%
copy from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/package-info.java
copy to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/package-info.java
index d81f2276a6..3a2200166a 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/package-info.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/chunk/package-info.java
@@ -17,6 +17,6 @@
*/
/**
- * Command to debug chunk information.
+ * Command to debug replicas chunk information.
*/
-package org.apache.hadoop.ozone.debug.chunk;
+package org.apache.hadoop.ozone.debug.replicas.chunk;
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/package-info.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/package-info.java
similarity index 90%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/package-info.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/package-info.java
index d81f2276a6..7369ab256c 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/package-info.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/package-info.java
@@ -17,6 +17,6 @@
*/
/**
- * Command to debug chunk information.
+ * Replicas debug related commands.
*/
-package org.apache.hadoop.ozone.debug.chunk;
+package org.apache.hadoop.ozone.debug.replicas;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
