Skip to content

HDDS-11728. Refactor subcommand layouts of ozone debug and repair #7489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 4 commits into from
Dec 3, 2024
Merged

HDDS-11728. Refactor subcommand layouts of ozone debug and repair #7489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e27dde
HDDS-11728. Refactor subcommand layouts of ozone debug and repair
sarvekshayr Nov 26, 2024
1d58929
Modified license header
sarvekshayr Dec 1, 2024
7d3edb6
Merge branch 'master' into HDDS-11728
sarvekshayr Dec 3, 2024
878bad3
Resolved conflicts
sarvekshayr Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/debug/TestLDBCli.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
import org.apache.hadoop.ozone.container.common.statemachine.DatanodeConfiguration;
import org.apache.hadoop.ozone.container.keyvalue.helpers.BlockUtils;
import org.apache.hadoop.ozone.container.metadata.DatanodeSchemaThreeDBDefinition;
import org.apache.hadoop.ozone.debug.ldb.DBScanner;
import org.apache.hadoop.ozone.debug.ldb.RDBParser;
import org.apache.hadoop.ozone.debug.ldb.ValueSchema;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import jakarta.annotation.Nonnull;
Expand Down
2 changes: 1 addition & 1 deletion ...integration-test/src/test/java/org/apache/hadoop/ozone/dn/ratis/TestDnRatisLogParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.segmentparser.DatanodeRatisLogParser;
import org.apache.hadoop.ozone.debug.segmentparser.DatanodeRatisLogParser;

import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterEach;
Expand Down
4 changes: 2 additions & 2 deletions ...egration-test/src/test/java/org/apache/hadoop/ozone/parser/TestOzoneHARatisLogParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
import org.apache.hadoop.ozone.client.OzoneClientFactory;
import org.apache.hadoop.ozone.om.helpers.OMRatisHelper;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.segmentparser.OMRatisLogParser;
import org.apache.hadoop.ozone.segmentparser.SCMRatisLogParser;
import org.apache.hadoop.ozone.debug.segmentparser.OMRatisLogParser;
import org.apache.hadoop.ozone.debug.segmentparser.SCMRatisLogParser;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.tag.Flaky;
import org.junit.jupiter.api.AfterEach;
Expand Down
4 changes: 2 additions & 2 deletions ...one/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDebugShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneClientFactory;
import org.apache.hadoop.ozone.client.OzoneSnapshot;
import org.apache.hadoop.ozone.debug.DBScanner;
import org.apache.hadoop.ozone.debug.ldb.DBScanner;
import org.apache.hadoop.ozone.debug.OzoneDebug;
import org.apache.hadoop.ozone.debug.RDBParser;
import org.apache.hadoop.ozone.debug.ldb.RDBParser;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.om.OMStorage;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
Expand Down
8 changes: 4 additions & 4 deletions ...ne/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneRepairShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@

import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.debug.DBScanner;
import org.apache.hadoop.ozone.debug.RDBParser;
import org.apache.hadoop.ozone.debug.ldb.DBScanner;
import org.apache.hadoop.ozone.debug.ldb.RDBParser;
import org.apache.hadoop.ozone.om.OMStorage;
import org.apache.hadoop.ozone.repair.OzoneRepair;
import org.apache.hadoop.ozone.repair.RDBRepair;
import org.apache.hadoop.ozone.repair.TransactionInfoRepair;
import org.apache.hadoop.ozone.repair.ldb.RDBRepair;
import org.apache.hadoop.ozone.repair.ldb.TransactionInfoRepair;
import org.apache.hadoop.ozone.repair.quota.QuotaRepair;
import org.apache.hadoop.ozone.repair.quota.QuotaStatus;
import org.apache.hadoop.ozone.repair.quota.QuotaTrigger;
Expand Down
2 changes: 1 addition & 1 deletion ...oop/ozone/debug/ChunkDataNodeDetails.java → ...one/debug/chunk/ChunkDataNodeDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.debug;
package org.apache.hadoop.ozone.debug.chunk;
/**
* Class that gives datanode details on which the chunk is present.
*/
Expand Down
2 changes: 1 addition & 1 deletion ...ache/hadoop/ozone/debug/ChunkDetails.java → ...adoop/ozone/debug/chunk/ChunkDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.debug;
package org.apache.hadoop.ozone.debug.chunk;

/**
* Class that gives chunkDetails.
Expand Down
3 changes: 2 additions & 1 deletion ...e/hadoop/ozone/debug/ChunkKeyHandler.java → ...op/ozone/debug/chunk/ChunkKeyHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.debug;
package org.apache.hadoop.ozone.debug.chunk;

import java.io.File;
import java.io.IOException;
Expand All @@ -42,6 +42,7 @@
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;
Expand Down
2 changes: 1 addition & 1 deletion .../apache/hadoop/ozone/debug/ChunkType.java → ...e/hadoop/ozone/debug/chunk/ChunkType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.apache.hadoop.ozone.debug;
package org.apache.hadoop.ozone.debug.chunk;

/**
* The type of chunks of an Erasure Coded key.
Expand Down
2 changes: 1 addition & 1 deletion ...adoop/ozone/debug/ContainerChunkInfo.java → ...ozone/debug/chunk/ContainerChunkInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.debug;
package org.apache.hadoop.ozone.debug.chunk;

import com.fasterxml.jackson.annotation.JsonInclude;

Expand Down
22 changes: 22 additions & 0 deletions hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/chunk/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
*/

/**
* Command to debug chunk information.
*/
package org.apache.hadoop.ozone.debug.chunk;
4 changes: 3 additions & 1 deletion .../apache/hadoop/ozone/debug/DBScanner.java → ...che/hadoop/ozone/debug/ldb/DBScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.debug;
package org.apache.hadoop.ozone.debug.ldb;

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonInclude;
Expand Down Expand Up @@ -44,6 +44,8 @@
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.container.common.statemachine.DatanodeConfiguration;
import org.apache.hadoop.ozone.container.metadata.DatanodeSchemaThreeDBDefinition;
import org.apache.hadoop.ozone.debug.DBDefinitionFactory;
import org.apache.hadoop.ozone.debug.RocksDBUtils;
import org.apache.hadoop.ozone.utils.Filter;
import org.kohsuke.MetaInfServices;
import org.rocksdb.ColumnFamilyDescriptor;
Expand Down
3 changes: 2 additions & 1 deletion .../apache/hadoop/ozone/debug/DropTable.java → ...che/hadoop/ozone/debug/ldb/DropTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.debug;
package org.apache.hadoop.ozone.debug.ldb;

import org.apache.hadoop.hdds.cli.SubcommandWithParent;
import org.apache.hadoop.hdds.utils.db.managed.ManagedRocksDB;
import org.apache.hadoop.ozone.debug.RocksDBUtils;
import org.rocksdb.ColumnFamilyDescriptor;
import org.rocksdb.ColumnFamilyHandle;
import picocli.CommandLine;
Expand Down
2 changes: 1 addition & 1 deletion ...apache/hadoop/ozone/debug/ListTables.java → ...he/hadoop/ozone/debug/ldb/ListTables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.debug;
package org.apache.hadoop.ozone.debug.ldb;

import java.nio.charset.StandardCharsets;
import java.util.List;
Expand Down
3 changes: 2 additions & 1 deletion .../apache/hadoop/ozone/debug/RDBParser.java → ...che/hadoop/ozone/debug/ldb/RDBParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.debug;
package org.apache.hadoop.ozone.debug.ldb;

import java.util.concurrent.Callable;

import org.apache.hadoop.hdds.cli.GenericCli;
import org.apache.hadoop.hdds.cli.SubcommandWithParent;

import org.apache.hadoop.ozone.debug.OzoneDebug;
import org.kohsuke.MetaInfServices;
import picocli.CommandLine;
import picocli.CommandLine.Model.CommandSpec;
Expand Down
3 changes: 2 additions & 1 deletion ...pache/hadoop/ozone/debug/ValueSchema.java → ...e/hadoop/ozone/debug/ldb/ValueSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.debug;
package org.apache.hadoop.ozone.debug.ldb;

import org.apache.hadoop.hdds.cli.SubcommandWithParent;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.server.JsonUtils;
import org.apache.hadoop.hdds.utils.db.DBColumnFamilyDefinition;
import org.apache.hadoop.hdds.utils.db.DBDefinition;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.debug.DBDefinitionFactory;
import org.kohsuke.MetaInfServices;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
22 changes: 22 additions & 0 deletions hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/ldb/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
*/

/**
* RDB debug related commands.
*/
package org.apache.hadoop.ozone.debug.ldb;
2 changes: 1 addition & 1 deletion ...op/ozone/segmentparser/BaseLogParser.java → ...ne/debug/segmentparser/BaseLogParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.segmentparser;
package org.apache.hadoop.ozone.debug.segmentparser;

import com.google.common.annotations.VisibleForTesting;
import org.apache.ratis.proto.RaftProtos;
Expand Down
2 changes: 1 addition & 1 deletion ...segmentparser/DatanodeRatisLogParser.java → ...segmentparser/DatanodeRatisLogParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.segmentparser;
package org.apache.hadoop.ozone.debug.segmentparser;

import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.ozone.container.common.transport.server
Expand Down
2 changes: 1 addition & 1 deletion .../segmentparser/GenericRatisLogParser.java → .../segmentparser/GenericRatisLogParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.segmentparser;
package org.apache.hadoop.ozone.debug.segmentparser;

import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import picocli.CommandLine;
Expand Down
2 changes: 1 addition & 1 deletion ...ozone/segmentparser/OMRatisLogParser.java → ...debug/segmentparser/OMRatisLogParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.segmentparser;
package org.apache.hadoop.ozone.debug.segmentparser;

import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.ozone.om.helpers.OMRatisHelper;
Expand Down
2 changes: 1 addition & 1 deletion ...p/ozone/segmentparser/RatisLogParser.java → ...e/debug/segmentparser/RatisLogParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.segmentparser;
package org.apache.hadoop.ozone.debug.segmentparser;

import org.apache.hadoop.hdds.cli.GenericCli;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
Expand Down
2 changes: 1 addition & 1 deletion ...zone/segmentparser/SCMRatisLogParser.java → ...ebug/segmentparser/SCMRatisLogParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.segmentparser;
package org.apache.hadoop.ozone.debug.segmentparser;

import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.scm.ha.SCMRatisRequest;
Expand Down
2 changes: 1 addition & 1 deletion ...oop/ozone/segmentparser/package-info.java → ...one/debug/segmentparser/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.segmentparser;

/**
* Command line utility for dump ratis log files.
*/
package org.apache.hadoop.ozone.debug.segmentparser;
3 changes: 2 additions & 1 deletion ...apache/hadoop/ozone/repair/RDBRepair.java → ...he/hadoop/ozone/repair/ldb/RDBRepair.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.repair;
package org.apache.hadoop.ozone.repair.ldb;

import org.apache.hadoop.hdds.cli.GenericCli;
import org.apache.hadoop.hdds.cli.SubcommandWithParent;
import org.apache.hadoop.ozone.repair.OzoneRepair;
import org.kohsuke.MetaInfServices;
import picocli.CommandLine;

Expand Down
3 changes: 1 addition & 2 deletions ...adoop/ozone/repair/om/SnapshotRepair.java → ...doop/ozone/repair/ldb/SnapshotRepair.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.repair.om;
package org.apache.hadoop.ozone.repair.ldb;

import org.apache.hadoop.hdds.cli.SubcommandWithParent;
import org.apache.hadoop.hdds.utils.IOUtils;
Expand All @@ -25,7 +25,6 @@
import org.apache.hadoop.hdds.utils.db.managed.ManagedRocksIterator;
import org.apache.hadoop.ozone.debug.RocksDBUtils;
import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
import org.apache.hadoop.ozone.repair.RDBRepair;
import org.apache.hadoop.ozone.shell.bucket.BucketUri;
import org.kohsuke.MetaInfServices;
import org.rocksdb.ColumnFamilyDescriptor;
Expand Down
2 changes: 1 addition & 1 deletion ...p/ozone/repair/TransactionInfoRepair.java → ...one/repair/ldb/TransactionInfoRepair.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.repair;
package org.apache.hadoop.ozone.repair.ldb;

import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.cli.SubcommandWithParent;
Expand Down
22 changes: 22 additions & 0 deletions hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/ldb/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
*/

/**
* RDB related repair tools.
*/
package org.apache.hadoop.ozone.repair.ldb;
2 changes: 1 addition & 1 deletion hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/quota/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
*/

/**
* Ozone Repair tools.
* Ozone Quota Repair tools.
*/
package org.apache.hadoop.ozone.repair.quota;
2 changes: 1 addition & 1 deletion ...one/repair/TestTransactionInfoRepair.java → ...repair/ldb/TestTransactionInfoRepair.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.repair;
package org.apache.hadoop.ozone.repair.ldb;

import org.apache.hadoop.hdds.utils.TransactionInfo;
import org.apache.hadoop.hdds.utils.db.Codec;
Expand Down
Loading