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 80dc87a652 HDDS-12039. Move quota subcommands under ozone repair om
(#7662)
80dc87a652 is described below
commit 80dc87a652f6000cac853c5db01f4a1f20c6f4a6
Author: Sarveksha Yeshavantha Raju
<[email protected]>
AuthorDate: Thu Jan 9 15:24:53 2025 +0530
HDDS-12039. Move quota subcommands under ozone repair om (#7662)
---
.../apache/hadoop/ozone/shell/TestOzoneRepairShell.java | 6 +++---
.../org/apache/hadoop/ozone/repair/om/OMRepair.java | 4 +++-
.../hadoop/ozone/repair/om/SnapshotChainRepair.java | 3 +++
.../hadoop/ozone/repair/om/TransactionInfoRepair.java | 3 +++
.../hadoop/ozone/repair/{ => om}/quota/QuotaRepair.java | 17 ++++++-----------
.../hadoop/ozone/repair/{ => om}/quota/QuotaStatus.java | 6 ++----
.../ozone/repair/{ => om}/quota/QuotaTrigger.java | 2 +-
.../ozone/repair/{ => om}/quota/package-info.java | 4 ++--
8 files changed, 23 insertions(+), 22 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneRepairShell.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneRepairShell.java
index 6ddde5ffe8..dffc4bd552 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneRepairShell.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneRepairShell.java
@@ -128,14 +128,14 @@ public class TestOzoneRepairShell {
public void testQuotaRepair() throws Exception {
CommandLine cmd = new OzoneRepair().getCmd();
- int exitCode = cmd.execute("quota", "status", "--service-host",
conf.get(OZONE_OM_ADDRESS_KEY));
+ int exitCode = cmd.execute("om", "quota", "status", "--service-host",
conf.get(OZONE_OM_ADDRESS_KEY));
assertEquals(0, exitCode, err);
- exitCode = cmd.execute("quota", "start", "--service-host",
conf.get(OZONE_OM_ADDRESS_KEY));
+ exitCode = cmd.execute("om", "quota", "start", "--service-host",
conf.get(OZONE_OM_ADDRESS_KEY));
assertEquals(0, exitCode, err);
GenericTestUtils.waitFor(() -> {
out.reset();
// verify quota trigger is completed having non-zero lastRunFinishedTime
- cmd.execute("quota", "status", "--service-host",
conf.get(OZONE_OM_ADDRESS_KEY));
+ cmd.execute("om", "quota", "status", "--service-host",
conf.get(OZONE_OM_ADDRESS_KEY));
try {
return out.get().contains("\"lastRunFinishedTime\":\"\"");
} catch (Exception ex) {
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/OMRepair.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/OMRepair.java
index 9e20f6b9d1..c8e9f6e9e4 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/OMRepair.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/OMRepair.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.repair.om;
import org.apache.hadoop.hdds.cli.RepairSubcommand;
+import org.apache.hadoop.ozone.repair.om.quota.QuotaRepair;
import org.kohsuke.MetaInfServices;
import picocli.CommandLine;
@@ -29,7 +30,8 @@ import picocli.CommandLine;
subcommands = {
FSORepairTool.class,
SnapshotRepair.class,
- TransactionInfoRepair.class
+ TransactionInfoRepair.class,
+ QuotaRepair.class
},
description = "Operational tool to repair OM.")
@MetaInfServices(RepairSubcommand.class)
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/SnapshotChainRepair.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/SnapshotChainRepair.java
index a5d1244f00..37cf0c5ddb 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/SnapshotChainRepair.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/SnapshotChainRepair.java
@@ -83,6 +83,9 @@ public class SnapshotChainRepair extends RepairTool {
@Override
public void execute() throws Exception {
+ if (checkIfServiceIsRunning("OM")) {
+ return;
+ }
List<ColumnFamilyHandle> cfHandleList = new ArrayList<>();
List<ColumnFamilyDescriptor> cfDescList =
RocksDBUtils.getColumnFamilyDescriptors(dbPath);
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/TransactionInfoRepair.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/TransactionInfoRepair.java
index e737f0a913..59ea67138b 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/TransactionInfoRepair.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/TransactionInfoRepair.java
@@ -68,6 +68,9 @@ public class TransactionInfoRepair extends RepairTool {
@Override
public void execute() throws Exception {
+ if (checkIfServiceIsRunning("OM")) {
+ return;
+ }
List<ColumnFamilyHandle> cfHandleList = new ArrayList<>();
List<ColumnFamilyDescriptor> cfDescList =
RocksDBUtils.getColumnFamilyDescriptors(
dbPath);
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/quota/QuotaRepair.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/quota/QuotaRepair.java
similarity index 89%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/quota/QuotaRepair.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/quota/QuotaRepair.java
index 988b42ceb9..e5cd7b73af 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/quota/QuotaRepair.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/quota/QuotaRepair.java
@@ -16,11 +16,12 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.repair.quota;
+package org.apache.hadoop.ozone.repair.om.quota;
import java.io.IOException;
import java.util.Collection;
-import org.apache.hadoop.hdds.cli.RepairSubcommand;
+
+import org.apache.hadoop.hdds.cli.AbstractSubcommand;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ipc.ProtobufRpcEngine;
import org.apache.hadoop.ipc.RPC;
@@ -30,10 +31,8 @@ import
org.apache.hadoop.ozone.om.protocolPB.Hadoop3OmTransportFactory;
import org.apache.hadoop.ozone.om.protocolPB.OmTransport;
import
org.apache.hadoop.ozone.om.protocolPB.OzoneManagerProtocolClientSideTranslatorPB;
import org.apache.hadoop.ozone.om.protocolPB.OzoneManagerProtocolPB;
-import org.apache.hadoop.ozone.repair.OzoneRepair;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.ratis.protocol.ClientId;
-import org.kohsuke.MetaInfServices;
import picocli.CommandLine;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ADDRESS_KEY;
@@ -48,18 +47,14 @@ import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY;
QuotaTrigger.class,
},
description = "Operational tool to repair quota in OM DB.")
-@MetaInfServices(RepairSubcommand.class)
-public class QuotaRepair implements RepairSubcommand {
-
- @CommandLine.ParentCommand
- private OzoneRepair parent;
+public class QuotaRepair extends AbstractSubcommand {
public OzoneManagerProtocolClientSideTranslatorPB createOmClient(
String omServiceID,
String omHost,
boolean forceHA
) throws Exception {
- OzoneConfiguration conf = parent.getOzoneConf();
+ OzoneConfiguration conf = getOzoneConf();
if (omHost != null && !omHost.isEmpty()) {
omServiceID = null;
conf.set(OZONE_OM_ADDRESS_KEY, omHost);
@@ -93,7 +88,7 @@ public class QuotaRepair implements RepairSubcommand {
}
private Collection<String> getConfiguredServiceIds() {
- OzoneConfiguration conf = parent.getOzoneConf();
+ OzoneConfiguration conf = getOzoneConf();
Collection<String> omServiceIds =
conf.getTrimmedStringCollection(OZONE_OM_SERVICE_IDS_KEY);
return omServiceIds;
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/quota/QuotaStatus.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/quota/QuotaStatus.java
similarity index 92%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/quota/QuotaStatus.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/quota/QuotaStatus.java
index cd9ef42da8..879dc06f18 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/quota/QuotaStatus.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/quota/QuotaStatus.java
@@ -19,7 +19,7 @@
* permissions and
* limitations under the License.
*/
-package org.apache.hadoop.ozone.repair.quota;
+package org.apache.hadoop.ozone.repair.om.quota;
import java.util.concurrent.Callable;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
@@ -35,9 +35,7 @@ import picocli.CommandLine;
mixinStandardHelpOptions = true,
versionProvider = HddsVersionProvider.class
)
-public class QuotaStatus implements Callable<Void> {
- @CommandLine.Spec
- private static CommandLine.Model.CommandSpec spec;
+public class QuotaStatus implements Callable<Void> {
@CommandLine.Option(
names = {"--service-id", "--om-service-id"},
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/quota/QuotaTrigger.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/quota/QuotaTrigger.java
similarity index 98%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/quota/QuotaTrigger.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/quota/QuotaTrigger.java
index 2930c87356..b490f758ea 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/quota/QuotaTrigger.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/quota/QuotaTrigger.java
@@ -19,7 +19,7 @@
* permissions and
* limitations under the License.
*/
-package org.apache.hadoop.ozone.repair.quota;
+package org.apache.hadoop.ozone.repair.om.quota;
import java.util.Arrays;
import java.util.Collections;
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/quota/package-info.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/quota/package-info.java
similarity index 91%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/quota/package-info.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/quota/package-info.java
index 40c0abcb91..b17a986472 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/quota/package-info.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/quota/package-info.java
@@ -17,6 +17,6 @@
*/
/**
- * Ozone Quota Repair tools.
+ * Ozone OM Quota Repair tools.
*/
-package org.apache.hadoop.ozone.repair.quota;
+package org.apache.hadoop.ozone.repair.om.quota;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
