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 f4013866b1 HDDS-8065. Provide GNU long options (#4394)
f4013866b1 is described below
commit f4013866b1a9a7616d4be65030a8b8b8dda4f5c1
Author: targetoee <[email protected]>
AuthorDate: Wed Mar 15 14:42:09 2023 +0800
HDDS-8065. Provide GNU long options (#4394)
---
.../apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java | 5 +++--
.../org/apache/hadoop/ozone/admin/om/TransferOmLeaderSubCommand.java | 2 +-
.../hadoop/ozone/admin/scm/GetFailedDeletedBlocksTxnSubcommand.java | 2 +-
.../apache/hadoop/ozone/admin/scm/TransferScmLeaderSubCommand.java | 2 +-
.../tools/src/main/java/org/apache/hadoop/ozone/debug/DBScanner.java | 2 +-
.../src/main/java/org/apache/hadoop/ozone/debug/ReadReplicas.java | 2 +-
.../java/org/apache/hadoop/ozone/segmentparser/BaseLogParser.java | 3 ++-
7 files changed, 10 insertions(+), 8 deletions(-)
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java
b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java
index b64673bc0c..f08d316500 100644
---
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java
+++
b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java
@@ -61,12 +61,13 @@ public class ListPipelinesSubcommand extends ScmSubcommand {
private String replication;
@CommandLine.Option(
- names = {"-ffc", "--filterByFactor"},
+ names = {"-ffc", "--filterByFactor", "--filter-by-factor"},
description = "[deprecated] Filter pipelines by factor (e.g. ONE, THREE)
"
+ " (implies RATIS replication type)")
private ReplicationFactor factor;
- @CommandLine.Option(names = {"-s", "--state", "-fst", "--filterByState"},
+ @CommandLine.Option(
+ names = {"-s", "--state", "-fst", "--filterByState",
"--filter-by-state"},
description = "Filter listed pipelines by State, eg OPEN, CLOSED",
defaultValue = "")
private String state;
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/TransferOmLeaderSubCommand.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/TransferOmLeaderSubCommand.java
index 32e432cd04..30f5540531 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/TransferOmLeaderSubCommand.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/TransferOmLeaderSubCommand.java
@@ -48,7 +48,7 @@ public class TransferOmLeaderSubCommand implements
Callable<Void> {
static class TransferOption {
@CommandLine.Option(
- names = {"-n", "--newLeaderId"},
+ names = {"-n", "--newLeaderId", "--new-leader-id"},
description = "The new leader id of OM to transfer leadership. E.g
OM1."
)
private String omNodeId;
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/GetFailedDeletedBlocksTxnSubcommand.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/GetFailedDeletedBlocksTxnSubcommand.java
index cad6c6c1a4..a37c553f0c 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/GetFailedDeletedBlocksTxnSubcommand.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/GetFailedDeletedBlocksTxnSubcommand.java
@@ -57,7 +57,7 @@ public class GetFailedDeletedBlocksTxnSubcommand extends
ScmSubcommand {
private int count;
}
- @CommandLine.Option(names = {"-s", "--startTxId"},
+ @CommandLine.Option(names = {"-s", "--startTxId", "--start-tx-id"},
defaultValue = "0",
description = "The least transaction ID to start with, default 0." +
" Only work with -c/--count")
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/TransferScmLeaderSubCommand.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/TransferScmLeaderSubCommand.java
index c1609d4357..c434d67fdb 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/TransferScmLeaderSubCommand.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/TransferScmLeaderSubCommand.java
@@ -46,7 +46,7 @@ public class TransferScmLeaderSubCommand implements
Callable<Void> {
static class TransferOption {
@CommandLine.Option(
- names = {"-n", "--newLeaderId"},
+ names = {"-n", "--newLeaderId", "--new-leader-id"},
description = "The new leader id of SCM to transfer leadership. " +
"Should be ScmId(UUID)."
)
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/DBScanner.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/DBScanner.java
index 9e4c25641e..47363757e6 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/DBScanner.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/DBScanner.java
@@ -94,7 +94,7 @@ public class DBScanner implements Callable<Void>,
SubcommandWithParent {
description = "Key from which to iterate the DB")
private static String startKey;
- @CommandLine.Option(names = {"--dnSchema", "-d"},
+ @CommandLine.Option(names = {"--dnSchema", "-d", "--dn-schema"},
description = "Datanode DB Schema Version : V1/V2/V3",
defaultValue = "V2")
private static String dnDBSchemaVersion;
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/ReadReplicas.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/ReadReplicas.java
index 27a4c6bc06..77798b4b22 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/ReadReplicas.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/ReadReplicas.java
@@ -60,7 +60,7 @@ import java.util.Map;
@MetaInfServices(SubcommandWithParent.class)
public class ReadReplicas extends KeyHandler implements SubcommandWithParent {
- @CommandLine.Option(names = {"--outputDir", "-o"},
+ @CommandLine.Option(names = {"--outputDir", "-o", "--output-dir"},
description = "Destination where the directory will be created" +
" for the downloaded replicas and the manifest file.",
defaultValue = "/opt/hadoop")
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/segmentparser/BaseLogParser.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/segmentparser/BaseLogParser.java
index 8f36ddbfe2..a3ea9f6a1f 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/segmentparser/BaseLogParser.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/segmentparser/BaseLogParser.java
@@ -29,7 +29,8 @@ import java.util.function.Function;
* Base Ratis Log Parser used by generic, datanode etc.
*/
public abstract class BaseLogParser {
- @CommandLine.Option(names = {"-s", "--segmentPath"}, required = true,
+ @CommandLine.Option(names = {"-s", "--segmentPath", "--segment-path"},
+ required = true,
description = "Path of the segment file")
private File segmentFile;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
