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 8e60597eacc HDDS-7956. Deprecate camelCase and under_score style long
options (#10495)
8e60597eacc is described below
commit 8e60597eacc4fe328b8ae0b25e21bd00f834c0ef
Author: hani-fouladgar <[email protected]>
AuthorDate: Wed Jun 24 01:23:56 2026 -0500
HDDS-7956. Deprecate camelCase and under_score style long options (#10495)
---
.../hadoop/hdds/cli/DeprecatedCliOption.java | 32 ++++++++++++++++-
.../docs/content/feature/ContainerBalancer.md | 8 ++---
hadoop-hdds/docs/content/feature/OM-HA.md | 2 +-
hadoop-hdds/docs/content/feature/SCM-HA.md | 4 +--
hadoop-hdds/docs/content/feature/SCM-HA.zh.md | 2 +-
hadoop-hdds/docs/content/tools/Repair.md | 4 +--
hadoop-hdds/docs/content/tools/debug/Ldb.md | 4 +--
hadoop-hdds/docs/content/tools/debug/Ldb.zh.md | 4 +--
.../docs/content/tools/debug/RatisLogParser.md | 2 +-
.../hdds/scm/cli/ContainerBalancerCommands.java | 4 +--
.../scm/cli/ContainerBalancerStartSubcommand.java | 12 +++----
.../scm/cli/pipeline/CreatePipelineSubcommand.java | 10 +++---
.../scm/cli/pipeline/FilterPipelineOptions.java | 2 +-
.../scm/cli/pipeline/ListPipelinesSubcommand.java | 2 +-
.../ozone/admin/om/TransferOmLeaderSubCommand.java | 2 +-
.../admin/scm/TransferScmLeaderSubCommand.java | 2 +-
.../apache/hadoop/ozone/debug/ldb/DBScanner.java | 4 +--
.../apache/hadoop/ozone/debug/ldb/ValueSchema.java | 4 +--
.../ozone/debug/om/ContainerToKeyMapping.java | 2 +-
.../ozone/debug/ratis/parse/BaseLogParser.java | 2 +-
.../ozone/repair/ldb/RocksDBManualCompaction.java | 2 +-
.../apache/hadoop/ozone/repair/om/CompactOMDB.java | 2 +-
.../hadoop/ozone/shell/keys/PutKeyHandler.java | 2 +-
.../hadoop/ozone/shell/s3/SetS3SecretHandler.java | 2 +-
.../tenant/TenantAssignUserAccessIdHandler.java | 5 +--
.../hadoop/ozone/freon/HadoopDirTreeGenerator.java | 12 +++----
.../ozone/freon/HadoopNestedDirGenerator.java | 5 ++-
.../hadoop/ozone/freon/RandomKeyGenerator.java | 40 +++++++++-------------
.../hadoop/ozone/shell/TestOzoneTenantShell.java | 4 +--
.../hadoop/ozone/freon/SCMThroughputBenchmark.java | 2 +-
30 files changed, 97 insertions(+), 87 deletions(-)
diff --git
a/hadoop-hdds/cli-common/src/main/java/org/apache/hadoop/hdds/cli/DeprecatedCliOption.java
b/hadoop-hdds/cli-common/src/main/java/org/apache/hadoop/hdds/cli/DeprecatedCliOption.java
index 13c154b96a2..2f324778ffe 100644
---
a/hadoop-hdds/cli-common/src/main/java/org/apache/hadoop/hdds/cli/DeprecatedCliOption.java
+++
b/hadoop-hdds/cli-common/src/main/java/org/apache/hadoop/hdds/cli/DeprecatedCliOption.java
@@ -23,7 +23,8 @@
import java.util.Objects;
/**
- * Emits warnings when deprecated multi-character short CLI options are used.
+ * Emits warnings when deprecated CLI option aliases are used
+ * and return the recommended replacement option.
*/
public final class DeprecatedCliOption {
@@ -47,6 +48,35 @@ private static Map<String, String> buildDeprecatedOptions() {
options.put("-tact", "--transaction-apply-check-interval");
options.put("-pct", "--prepare-check-interval");
options.put("-pt", "--prepare-timeout");
+ options.put("--accessId", "--access-id");
+ options.put("--bufferSize", "--buffer-size");
+ options.put("--column_family", "--column-family");
+ options.put("--dnSchema", "--dn-schema");
+ options.put("--expectedGeneration", "--expected-generation");
+ options.put("--fileCount", "--file-count");
+ options.put("--fileSize", "--file-size");
+ options.put("--filterByFactor", "--filter-by-factor");
+ options.put("--filterByState", "--filter-by-state");
+ options.put("--keySize", "--key-size");
+ options.put("--maxDatanodesPercentageToInvolvePerIteration",
+ "--max-datanodes-percentage-to-involve-per-iteration");
+ options.put("--maxSizeEnteringTargetInGB",
"--max-size-entering-target-in-gb");
+ options.put("--maxSizeLeavingSourceInGB",
"--max-size-leaving-source-in-gb");
+ options.put("--maxSizeToMovePerIterationInGB",
"--max-size-to-move-per-iteration-in-gb");
+ options.put("--nameLen", "--name-len");
+ options.put("--newLeaderId", "--new-leader-id");
+ options.put("--numOfBuckets", "--num-of-buckets");
+ options.put("--numOfKeys", "--num-of-keys");
+ options.put("--numOfThreads", "--num-of-threads");
+ options.put("--numOfValidateThreads", "--num-of-validate-threads");
+ options.put("--numOfVolumes", "--num-of-volumes");
+ options.put("--onlyFileNames", "--only-file-names");
+ options.put("--replicationFactor", "--replication-factor");
+ options.put("--replicationType", "--replication-type");
+ options.put("--scmHost", "--scm-host");
+ options.put("--secretKey", "--secret");
+ options.put("--segmentPath", "--segment-path");
+ options.put("--validateWrites", "--validate-writes");
return options;
}
diff --git a/hadoop-hdds/docs/content/feature/ContainerBalancer.md
b/hadoop-hdds/docs/content/feature/ContainerBalancer.md
index 7faa99b0e1e..848e1b998ff 100644
--- a/hadoop-hdds/docs/content/feature/ContainerBalancer.md
+++ b/hadoop-hdds/docs/content/feature/ContainerBalancer.md
@@ -53,10 +53,10 @@ ozone admin containerbalancer start [options]
|-------------------------------------------------------|
--------------------------------------------------------------------------------------------------------------------------------------
|
| `-t`, `--threshold` | The percentage
deviation from the average utilization of the cluster after which a datanode
will be rebalanced. Default is 10%. |
| `-i`, `--iterations` | The maximum number
of consecutive iterations the balancer will run for. Default is 10. Use -1 for
infinite iterations. |
-| `-d`, `--maxDatanodesPercentageToInvolvePerIteration` | The maximum
percentage of healthy, in-service datanodes that can be involved in balancing
in one iteration. Default is 20%. |
-| `-s`, `--maxSizeToMovePerIterationInGB` | The maximum size of
data in GB to be moved in one iteration. Default is 500GB.
|
-| `-e`, `--maxSizeEnteringTargetInGB` | The maximum size in
GB that can enter a target datanode in one iteration. Default is 26GB.
|
-| `-l`, `--maxSizeLeavingSourceInGB` | The maximum size in
GB that can leave a source datanode in one iteration. Default is 26GB.
|
+| `-d`, `--max-datanodes-percentage-to-involve-per-iteration` | The maximum
percentage of healthy, in-service datanodes that can be involved in balancing
in one iteration. Default is 20%. |
+| `-s`, `--max-size-to-move-per-iteration-in-gb` | The maximum
size of data in GB to be moved in one iteration. Default is 500GB.
|
+| `-e`, `--max-size-entering-target-in-gb` | The maximum
size in GB that can enter a target datanode in one iteration. Default is 26GB.
|
+| `-l`, `--max-size-leaving-source-in-gb` | The maximum
size in GB that can leave a source datanode in one iteration. Default is 26GB.
|
| `--balancing-iteration-interval-minutes` | The interval in
minutes between each iteration of the Container Balancer. Default is 70
minutes. |
| `--move-timeout-minutes` | The time in minutes
to allow a single container to move from source to target. Default is 65
minutes. |
| `--move-replication-timeout-minutes` | The time in minutes
to allow a single container's replication from source to target as part of a
container move. Default is 50 minutes. |
diff --git a/hadoop-hdds/docs/content/feature/OM-HA.md
b/hadoop-hdds/docs/content/feature/OM-HA.md
index f055b295849..d0978c7d939 100644
--- a/hadoop-hdds/docs/content/feature/OM-HA.md
+++ b/hadoop-hdds/docs/content/feature/OM-HA.md
@@ -137,7 +137,7 @@ ozone admin om transfer -id <OM_SERVICE_ID> -r
```
* `-id, --service-id`: Specifies the Ozone Manager Service ID.
-* `-n, --newLeaderId, --new-leader-id`: The node ID of the OM to which
leadership will be transferred (e.g., `om1`).
+* `-n, --new-leader-id`: The node ID of the OM to which leadership will be
transferred (e.g., `om1`).
* `-r, --random`: Randomly chooses a follower to transfer leadership to.
### Example
diff --git a/hadoop-hdds/docs/content/feature/SCM-HA.md
b/hadoop-hdds/docs/content/feature/SCM-HA.md
index 7f9396fafe6..0703ccba2fd 100644
--- a/hadoop-hdds/docs/content/feature/SCM-HA.md
+++ b/hadoop-hdds/docs/content/feature/SCM-HA.md
@@ -104,7 +104,7 @@ ozone admin scm transfer -id <SCM_SERVICE_ID> -r
```
* `-id, --service-id`: Specifies the SCM Service ID.
-* `-n, --newLeaderId, --new-leader-id`: The SCM UUID (Raft peer ID) of the
SCM to which leadership will be transferred (e.g.,
`e6877ce5-56cd-4f0b-ad60-4c8ef9000882`).
+* `-n, --new-leader-id`: The SCM UUID (Raft peer ID) of the SCM to which
leadership will be transferred (e.g., `e6877ce5-56cd-4f0b-ad60-4c8ef9000882`).
* `-r, --random`: Randomly chooses a follower to transfer leadership to.
### Example
@@ -291,7 +291,7 @@ layoutVersion=0
You can also create data and double check with `ozone debug` tool if all the
container metadata is replicated.
```shell
-bin/ozone freon randomkeys --numOfVolumes=1 --numOfBuckets=1 --numOfKeys=10000
--keySize=524288 --replicationType=RATIS --numOfThreads=8 --factor=THREE
--bufferSize=1048576
+bin/ozone freon randomkeys --num-of-volumes=1 --num-of-buckets=1
--num-of-keys=10000 --key-size=524288 --type=RATIS --num-of-threads=8
--factor=THREE --buffer-size=1048576
# use debug ldb to check scm.db on all the machines
diff --git a/hadoop-hdds/docs/content/feature/SCM-HA.zh.md
b/hadoop-hdds/docs/content/feature/SCM-HA.zh.md
index 66d2b885fbe..2169ae47563 100644
--- a/hadoop-hdds/docs/content/feature/SCM-HA.zh.md
+++ b/hadoop-hdds/docs/content/feature/SCM-HA.zh.md
@@ -191,7 +191,7 @@ layoutVersion=0
如果所有的容器元数据都已复制，您还可以创建数据并使用 `ozone debug` 工具进行双重检查。
```shell
-bin/ozone freon randomkeys --numOfVolumes=1 --numOfBuckets=1 --numOfKeys=10000
--keySize=524288 --replicationType=RATIS --numOfThreads=8 --factor=THREE
--bufferSize=1048576
+bin/ozone freon randomkeys --num-of-volumes=1 --num-of-buckets=1
--num-of-keys=10000 --key-size=524288 --type=RATIS --num-of-threads=8
--factor=THREE --buffer-size=1048576
# 使用 debug ldb 工具逐一检查各机上的 scm.db
diff --git a/hadoop-hdds/docs/content/tools/Repair.md
b/hadoop-hdds/docs/content/tools/Repair.md
index d3368e8b40b..fdddd47eee1 100644
--- a/hadoop-hdds/docs/content/tools/Repair.md
+++ b/hadoop-hdds/docs/content/tools/Repair.md
@@ -65,7 +65,7 @@ CLI to compact a column-family in the DB while the service is
offline.
Note: If om.db is compacted with this tool then it will negatively impact the
Ozone Manager\'s efficient snapshot diff. The corresponding OM, SCM or Datanode
role should be stopped for this tool.
- --cf, --column-family, --column_family=<columnFamilyName>
+ --cf, --column-family=<columnFamilyName>
Column family name
--db=<dbPath> Database File Path
```
@@ -189,7 +189,7 @@ Usage: ozone repair om compact [-hV] [--dry-run] [--force]
[--verbose]
[--service-id=<omServiceId>]
CLI to compact a column family in the om.db. The compaction happens
asynchronously. Requires admin privileges. OM should be running for this tool.
- --cf, --column-family, --column_family=<columnFamilyName>
+ --cf, --column-family=<columnFamilyName>
Column family name
--node-id=<nodeId> NodeID of the OM for which db needs to be compacted.
--service-id, --om-service-id=<omServiceId>
diff --git a/hadoop-hdds/docs/content/tools/debug/Ldb.md
b/hadoop-hdds/docs/content/tools/debug/Ldb.md
index a6190b6c6d7..55a4cbb3541 100644
--- a/hadoop-hdds/docs/content/tools/debug/Ldb.md
+++ b/hadoop-hdds/docs/content/tools/debug/Ldb.md
@@ -74,7 +74,7 @@ Usage: ozone debug ldb scan [--compact] [--count]
[--with-keys]
Parse specified metadataTable
--batch-size=<batchSize>
Batch size for processing DB data.
- --cf, --column_family, --column-family=<tableName>
+ --cf, --column-family=<tableName>
Table name
--cid, --container-id=<containerId>
Container ID. Applicable if datanode DB Schema is V3
@@ -82,7 +82,7 @@ Parse specified metadataTable
--count, --show-count
Get estimated key count for the given DB column
family
Default: false
- -d, --dnSchema, --dn-schema=<dnDBSchemaVersion>
+ -d, --dn-schema=<dnDBSchemaVersion>
Datanode DB Schema Version: V1/V2/V3
-e, --ek, --endkey=<endKey>
Key at which iteration of the DB ends
diff --git a/hadoop-hdds/docs/content/tools/debug/Ldb.zh.md
b/hadoop-hdds/docs/content/tools/debug/Ldb.zh.md
index 3f3238dd84b..85c9765c432 100644
--- a/hadoop-hdds/docs/content/tools/debug/Ldb.zh.md
+++ b/hadoop-hdds/docs/content/tools/debug/Ldb.zh.md
@@ -101,7 +101,7 @@ Usage: ozone debug ldb scan [--compact] [--count]
[--with-keys]
Parse specified metadataTable
--batch-size=<batchSize>
Batch size for processing DB data.
- --cf, --column_family, --column-family=<tableName>
+ --cf, --column-family=<tableName>
Table name
--cid, --container-id=<containerId>
Container ID. Applicable if datanode DB Schema is V3
@@ -109,7 +109,7 @@ Parse specified metadataTable
--count, --show-count
Get estimated key count for the given DB column
family
Default: false
- -d, --dnSchema, --dn-schema=<dnDBSchemaVersion>
+ -d, --dn-schema=<dnDBSchemaVersion>
Datanode DB Schema Version: V1/V2/V3
-e, --ek, --endkey=<endKey>
Key at which iteration of the DB ends
diff --git a/hadoop-hdds/docs/content/tools/debug/RatisLogParser.md
b/hadoop-hdds/docs/content/tools/debug/RatisLogParser.md
index 17064bbb327..ac3fb6abacd 100644
--- a/hadoop-hdds/docs/content/tools/debug/RatisLogParser.md
+++ b/hadoop-hdds/docs/content/tools/debug/RatisLogParser.md
@@ -30,7 +30,7 @@ Shell for printing Ratis Log in understandable text
-h, --help Show this help message and exit.
--role=<role> Component role for parsing. Values: om, scm, datanode
Default: generic
- -s, --segmentPath, --segment-path=<segmentFile>
+ -s, --segment-path=<segmentFile>
Path of the segment file
-V, --version Print version information and exit.
--verbose More verbose output. Show the stack trace of the errors.
diff --git
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerCommands.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerCommands.java
index 7fbf53d92d1..951d447d0d5 100644
---
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerCommands.java
+++
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerCommands.java
@@ -36,9 +36,9 @@
* ozone admin containerbalancer start
* [ -t/--threshold {@literal <threshold>}]
* [ -i/--iterations {@literal <iterations>}]
- * [ -d/--maxDatanodesPercentageToInvolvePerIteration
+ * [ -d/--max-datanodes-percentage-to-involve-per-iteration
* {@literal <maxDatanodesPercentageToInvolvePerIteration>}]
- * [ -s/--maxSizeToMovePerIterationInGB
+ * [ -s/--max-size-to-move-per-iteration-in-gb
* {@literal <maxSizeToMovePerIterationInGB>}]
* Examples:
* ozone admin containerbalancer start
diff --git
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java
index cd34522d6a6..2cab942f618 100644
---
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java
+++
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerBalancerStartSubcommand.java
@@ -48,30 +48,26 @@ public class ContainerBalancerStartSubcommand extends
ScmSubcommand {
"or -1, with a default of 10 (specify '10' for 10 iterations).")
private Optional<Integer> iterations;
- @Option(names = {"-d", "--max-datanodes-percentage-to-involve-per-iteration",
- "--maxDatanodesPercentageToInvolvePerIteration"},
+ @Option(names = {"-d",
"--max-datanodes-percentage-to-involve-per-iteration"},
description = "Max percentage of healthy, in service datanodes " +
"that can be involved in balancing in one iteration. The value " +
"should be in the range [0,100], with a default of 20 (specify " +
"'20' for 20%%).")
private Optional<Integer> maxDatanodesPercentageToInvolvePerIteration;
- @Option(names = {"-s", "--max-size-to-move-per-iteration-in-gb",
- "--maxSizeToMovePerIterationInGB"},
+ @Option(names = {"-s", "--max-size-to-move-per-iteration-in-gb"},
description = "Maximum size that can be moved per iteration of " +
"balancing. The value should be positive, with a default of 500 " +
"(specify '500' for 500GB).")
private Optional<Long> maxSizeToMovePerIterationInGB;
- @Option(names = {"-e", "--max-size-entering-target-in-gb",
- "--maxSizeEnteringTargetInGB"},
+ @Option(names = {"-e", "--max-size-entering-target-in-gb"},
description = "Maximum size that can enter a target datanode while " +
"balancing. This is the sum of data from multiple sources. The value
" +
"should be positive, with a default of 26 (specify '26' for 26GB).")
private Optional<Long> maxSizeEnteringTargetInGB;
- @Option(names = {"-l", "--max-size-leaving-source-in-gb",
- "--maxSizeLeavingSourceInGB"},
+ @Option(names = {"-l", "--max-size-leaving-source-in-gb"},
description = "Maximum size that can leave a source datanode while " +
"balancing. This is the sum of data moving to multiple targets. " +
"The value should be positive, with a default of 26 " +
diff --git
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/CreatePipelineSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/CreatePipelineSubcommand.java
index 2998a27716e..388d46cc5ce 100644
---
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/CreatePipelineSubcommand.java
+++
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/CreatePipelineSubcommand.java
@@ -36,18 +36,16 @@
public class CreatePipelineSubcommand extends ScmSubcommand {
@CommandLine.Option(
- names = {"-t", "--replication-type", "--replicationType"},
- description = "Replication type is RATIS. Full name" +
- " --replicationType will be removed in later versions.",
+ names = {"-t", "--replication-type"},
+ description = "Replication type is RATIS.",
defaultValue = "RATIS",
hidden = true
)
private HddsProtos.ReplicationType type;
@CommandLine.Option(
- names = {"-f", "--replication-factor", "--replicationFactor"},
- description = "Replication factor for RATIS (ONE, THREE). Full name" +
- " --replicationFactor will be removed in later versions.",
+ names = {"-f", "--replication-factor"},
+ description = "Replication factor for RATIS (ONE, THREE).",
defaultValue = "ONE"
)
private HddsProtos.ReplicationFactor factor;
diff --git
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/FilterPipelineOptions.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/FilterPipelineOptions.java
index c82d5cfe88f..f91df017e6d 100644
---
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/FilterPipelineOptions.java
+++
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/FilterPipelineOptions.java
@@ -45,7 +45,7 @@ public class FilterPipelineOptions {
private String replication;
@CommandLine.Option(
- names = {"--filterByFactor", "--filter-by-factor"},
+ names = {"--filter-by-factor"},
description = "[deprecated] Filter pipelines by factor (e.g. ONE, THREE)
(implies RATIS replication type)")
private ReplicationFactor factor;
diff --git
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java
index fb3ef26775c..2ce1ade63e3 100644
---
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java
+++
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java
@@ -44,7 +44,7 @@ public class ListPipelinesSubcommand extends ScmSubcommand {
private final FilterPipelineOptions filterOptions = new
FilterPipelineOptions();
@CommandLine.Option(
- names = {"-s", "--state", "--filterByState", "--filter-by-state"},
+ names = {"-s", "--state", "--filter-by-state"},
description = "Filter listed pipelines by State, eg OPEN, CLOSED",
defaultValue = "")
private String state;
diff --git
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/TransferOmLeaderSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/TransferOmLeaderSubCommand.java
index 069e10c1343..34f81f3f0cb 100644
---
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/TransferOmLeaderSubCommand.java
+++
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/om/TransferOmLeaderSubCommand.java
@@ -41,7 +41,7 @@ public class TransferOmLeaderSubCommand implements
Callable<Void> {
static class TransferOption {
@CommandLine.Option(
- names = {"-n", "--newLeaderId", "--new-leader-id"},
+ names = {"-n", "--new-leader-id"},
description = "The new leader id of OM to transfer leadership. E.g
OM1."
)
private String omNodeId;
diff --git
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/TransferScmLeaderSubCommand.java
b/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/TransferScmLeaderSubCommand.java
index e0be9dff1b7..70f30e3d519 100644
---
a/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/scm/TransferScmLeaderSubCommand.java
+++
b/hadoop-ozone/cli-admin/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", "--new-leader-id"},
+ names = {"-n", "--new-leader-id"},
description = "The new leader id of SCM to transfer leadership. " +
"Should be ScmId(UUID)."
)
diff --git
a/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/ldb/DBScanner.java
b/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/ldb/DBScanner.java
index 3f95a92db0d..6338c49d988 100644
---
a/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/ldb/DBScanner.java
+++
b/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/ldb/DBScanner.java
@@ -94,7 +94,7 @@ public class DBScanner extends AbstractSubcommand implements
Callable<Void> {
@CommandLine.ParentCommand
private RDBParser parent;
- @CommandLine.Option(names = {"--column_family", "--column-family", "--cf"},
+ @CommandLine.Option(names = {"--column-family", "--cf"},
required = true,
description = "Table name")
private String tableName;
@@ -137,7 +137,7 @@ public class DBScanner extends AbstractSubcommand
implements Callable<Void> {
" \"keyName:regex:^key.*$\" for showing records having keyName
that matches the given regex.")
private String filter;
- @CommandLine.Option(names = {"--dnSchema", "--dn-schema", "-d"},
+ @CommandLine.Option(names = {"--dn-schema", "-d"},
description = "Datanode DB Schema Version: V1/V2/V3",
defaultValue = "V3")
private String dnDBSchemaVersion;
diff --git
a/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/ldb/ValueSchema.java
b/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/ldb/ValueSchema.java
index d40d9225d28..562c2d19a3e 100644
---
a/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/ldb/ValueSchema.java
+++
b/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/ldb/ValueSchema.java
@@ -56,12 +56,12 @@ public class ValueSchema extends AbstractSubcommand
implements Callable<Void> {
private static final Logger LOG = LoggerFactory.getLogger(ValueSchema.class);
- @CommandLine.Option(names = {"--column_family", "--column-family", "--cf"},
+ @CommandLine.Option(names = {"--column-family", "--cf"},
required = true,
description = "Table name")
private String tableName;
- @CommandLine.Option(names = {"--dnSchema", "--dn-schema", "-d"},
+ @CommandLine.Option(names = {"--dn-schema", "-d"},
description = "Datanode DB Schema Version: V1/V2/V3",
defaultValue = "V3")
private String dnDBSchemaVersion;
diff --git
a/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/om/ContainerToKeyMapping.java
b/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/om/ContainerToKeyMapping.java
index 0da411b34d4..d6c9fce57de 100644
---
a/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/om/ContainerToKeyMapping.java
+++
b/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/om/ContainerToKeyMapping.java
@@ -81,7 +81,7 @@ public class ContainerToKeyMapping extends AbstractSubcommand
implements Callabl
description = "Comma separated Container IDs")
private String containers;
- @CommandLine.Option(names = {"--onlyFileNames"},
+ @CommandLine.Option(names = {"--only-file-names"},
defaultValue = "false",
description = "Only display file names without full path")
private boolean onlyFileNames;
diff --git
a/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/ratis/parse/BaseLogParser.java
b/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/ratis/parse/BaseLogParser.java
index 667936fe4e3..f4f5ea7d94e 100644
---
a/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/ratis/parse/BaseLogParser.java
+++
b/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/ratis/parse/BaseLogParser.java
@@ -28,7 +28,7 @@
* Base Ratis Log Parser used by generic, datanode etc.
*/
public abstract class BaseLogParser {
- @CommandLine.Option(names = {"-s", "--segmentPath", "--segment-path"},
+ @CommandLine.Option(names = {"-s", "--segment-path"},
required = true,
description = "Path of the segment file")
private File segmentFile;
diff --git
a/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/ldb/RocksDBManualCompaction.java
b/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/ldb/RocksDBManualCompaction.java
index ffefe93b25d..0b89bb42418 100644
---
a/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/ldb/RocksDBManualCompaction.java
+++
b/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/ldb/RocksDBManualCompaction.java
@@ -58,7 +58,7 @@ public class RocksDBManualCompaction extends RepairTool {
description = "Database File Path")
private String dbPath;
- @CommandLine.Option(names = {"--column-family", "--column_family", "--cf"},
+ @CommandLine.Option(names = {"--column-family", "--cf"},
required = true,
description = "Column family name")
private String columnFamilyName;
diff --git
a/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/om/CompactOMDB.java
b/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/om/CompactOMDB.java
index 2522c9cf8be..396c0520bb1 100644
---
a/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/om/CompactOMDB.java
+++
b/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/om/CompactOMDB.java
@@ -41,7 +41,7 @@
)
public class CompactOMDB extends RepairTool {
- @CommandLine.Option(names = {"--column-family", "--column_family", "--cf"},
+ @CommandLine.Option(names = {"--column-family", "--cf"},
required = true,
description = "Column family name")
private String columnFamilyName;
diff --git
a/hadoop-ozone/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/keys/PutKeyHandler.java
b/hadoop-ozone/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/keys/PutKeyHandler.java
index c2d7026f16c..2252b1c87c2 100644
---
a/hadoop-ozone/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/keys/PutKeyHandler.java
+++
b/hadoop-ozone/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/keys/PutKeyHandler.java
@@ -65,7 +65,7 @@ public class PutKeyHandler extends KeyHandler {
@Mixin
private ShellReplicationOptions replication;
- @Option(names = "--expectedGeneration",
+ @Option(names = "--expected-generation",
description = "Store key only if it already exists and its generation
matches the value provided")
private Long expectedGeneration;
diff --git
a/hadoop-ozone/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/s3/SetS3SecretHandler.java
b/hadoop-ozone/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/s3/SetS3SecretHandler.java
index c223198848e..312b4ee201d 100644
---
a/hadoop-ozone/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/s3/SetS3SecretHandler.java
+++
b/hadoop-ozone/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/s3/SetS3SecretHandler.java
@@ -38,7 +38,7 @@ public class SetS3SecretHandler extends S3Handler {
+ "(Admins only)'")
private String username;
- @CommandLine.Option(names = {"-s", "--secret", "--secretKey"},
+ @CommandLine.Option(names = {"-s", "--secret"},
description = "Secret key", required = true)
private String secretKey;
diff --git
a/hadoop-ozone/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/tenant/TenantAssignUserAccessIdHandler.java
b/hadoop-ozone/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/tenant/TenantAssignUserAccessIdHandler.java
index f17fc210601..453a4c43618 100644
---
a/hadoop-ozone/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/tenant/TenantAssignUserAccessIdHandler.java
+++
b/hadoop-ozone/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/tenant/TenantAssignUserAccessIdHandler.java
@@ -33,9 +33,6 @@
description = "Assign user accessId to tenant")
public class TenantAssignUserAccessIdHandler extends TenantHandler {
- @CommandLine.Spec
- private CommandLine.Model.CommandSpec spec;
-
@CommandLine.Parameters(description = "User name", arity = "1..1")
private String userPrincipal;
@@ -43,7 +40,7 @@ public class TenantAssignUserAccessIdHandler extends
TenantHandler {
description = "Tenant name", required = true)
private String tenantId;
- @CommandLine.Option(names = {"-a", "--access-id", "--accessId"},
+ @CommandLine.Option(names = {"-a", "--access-id"},
description = "(Optional) Specify the accessId for user in this tenant. "
+ "If unspecified, accessId would be in the form of "
+ "TenantName$Principal.",
diff --git
a/hadoop-ozone/freon/src/main/java/org/apache/hadoop/ozone/freon/HadoopDirTreeGenerator.java
b/hadoop-ozone/freon/src/main/java/org/apache/hadoop/ozone/freon/HadoopDirTreeGenerator.java
index 4193d675eb3..d3236fa4a99 100644
---
a/hadoop-ozone/freon/src/main/java/org/apache/hadoop/ozone/freon/HadoopDirTreeGenerator.java
+++
b/hadoop-ozone/freon/src/main/java/org/apache/hadoop/ozone/freon/HadoopDirTreeGenerator.java
@@ -55,13 +55,12 @@ public class HadoopDirTreeGenerator extends
HadoopBaseFreonGenerator
defaultValue = "5")
private int depth;
- @Option(names = {"-c", "--file-count", "--fileCount"},
- description = "Number of files to be written in each directory. Full" +
- " name --fileCount will be removed in later versions.",
+ @Option(names = {"-c", "--file-count"},
+ description = "Number of files to be written in each directory.",
defaultValue = "2")
private int fileCount;
- @Option(names = {"-g", "--file-size", "--fileSize"},
+ @Option(names = {"-g", "--file-size"},
description = "Generated data size of each file to be " +
"written in each directory. " +
StorageSizeConverter.STORAGE_SIZE_DESCRIPTION,
@@ -80,10 +79,9 @@ public class HadoopDirTreeGenerator extends
HadoopBaseFreonGenerator
defaultValue = "10")
private int span;
- @Option(names = {"-l", "--name-len", "--nameLen"},
+ @Option(names = {"-l", "--name-len"},
description =
- "Length of the random name of directory you want to create. Full " +
- "name --nameLen will be removed in later versions.",
+ "Length of the random name of directory you want to create",
defaultValue = "10")
private int length;
diff --git
a/hadoop-ozone/freon/src/main/java/org/apache/hadoop/ozone/freon/HadoopNestedDirGenerator.java
b/hadoop-ozone/freon/src/main/java/org/apache/hadoop/ozone/freon/HadoopNestedDirGenerator.java
index 416d0aa6302..87fea3257ae 100644
---
a/hadoop-ozone/freon/src/main/java/org/apache/hadoop/ozone/freon/HadoopNestedDirGenerator.java
+++
b/hadoop-ozone/freon/src/main/java/org/apache/hadoop/ozone/freon/HadoopNestedDirGenerator.java
@@ -56,10 +56,9 @@ public class HadoopNestedDirGenerator extends
HadoopBaseFreonGenerator
defaultValue = "10")
private int span;
- @Option(names = {"-l", "--name-len", "--nameLen"},
+ @Option(names = {"-l", "--name-len"},
description =
- "Length of the random name of directory you want to create. Full " +
- "name --nameLen will be removed in later versions.",
+ "Length of the random name of directory you want to create.",
defaultValue = "10")
private int length;
diff --git
a/hadoop-ozone/freon/src/main/java/org/apache/hadoop/ozone/freon/RandomKeyGenerator.java
b/hadoop-ozone/freon/src/main/java/org/apache/hadoop/ozone/freon/RandomKeyGenerator.java
index 5fe14774159..5b8205e2c33 100644
---
a/hadoop-ozone/freon/src/main/java/org/apache/hadoop/ozone/freon/RandomKeyGenerator.java
+++
b/hadoop-ozone/freon/src/main/java/org/apache/hadoop/ozone/freon/RandomKeyGenerator.java
@@ -116,36 +116,31 @@ public final class RandomKeyGenerator implements
Callable<Void>, FreonSubcommand
private volatile boolean completed = false;
private volatile Throwable exception;
- @Option(names = {"--num-of-threads", "--numOfThreads"},
- description = "number of threads to be launched for the run. Full name "
+
- "--numOfThreads will be removed in later versions.",
+ @Option(names = {"--num-of-threads"},
+ description = "number of threads to be launched for the run.",
defaultValue = "10")
private int numOfThreads = 10;
- @Option(names = {"--num-of-volumes", "--numOfVolumes"},
- description = "specifies number of Volumes to be created in offline " +
- "mode. Full name --numOfVolumes will be removed in later versions.",
+ @Option(names = {"--num-of-volumes"},
+ description = "specifies number of Volumes to be created in offline
mode.",
defaultValue = "10")
private int numOfVolumes = 10;
- @Option(names = {"--num-of-buckets", "--numOfBuckets"},
- description = "specifies number of Buckets to be created per Volume. " +
- "Full name --numOfBuckets will be removed in later versions.",
+ @Option(names = {"--num-of-buckets"},
+ description = "specifies number of Buckets to be created per Volume.",
defaultValue = "1000")
private int numOfBuckets = 1000;
@Option(
- names = {"--num-of-keys", "--numOfKeys"},
- description = "specifies number of Keys to be created per Bucket. Full" +
- " name --numOfKeys will be removed in later versions.",
+ names = {"--num-of-keys"},
+ description = "specifies number of Keys to be created per Bucket.",
defaultValue = "500000"
)
private int numOfKeys = 500000;
@Option(
- names = {"--key-size", "--keySize"},
- description = "Specifies the size of Key in bytes to be created. Full" +
- " name --keySize will be removed in later versions. " +
+ names = {"--key-size"},
+ description = "Specifies the size of Key in bytes to be created." +
StorageSizeConverter.STORAGE_SIZE_DESCRIPTION,
defaultValue = "10KB",
converter = StorageSizeConverter.class
@@ -153,22 +148,19 @@ public final class RandomKeyGenerator implements
Callable<Void>, FreonSubcommand
private StorageSize keySize;
@Option(
- names = {"--validate-writes", "--validateWrites"},
- description = "Specifies whether to validate keys after writing. Full" +
- " name --validateWrites will be removed in later versions."
+ names = {"--validate-writes"},
+ description = "Specifies whether to validate keys after writing"
)
private boolean validateWrites = false;
- @Option(names = {"--num-of-validate-threads", "--numOfValidateThreads"},
- description = "number of threads to be launched for validating keys." +
- "Full name --numOfValidateThreads will be removed in later
versions.",
+ @Option(names = {"--num-of-validate-threads"},
+ description = "number of threads to be launched for validating keys.",
defaultValue = "1")
private int numOfValidateThreads = 1;
@Option(
- names = {"--buffer-size", "--bufferSize"},
- description = "Specifies the buffer size while writing. Full name " +
- "--bufferSize will be removed in later versions.",
+ names = {"--buffer-size"},
+ description = "Specifies the buffer size while writing.",
defaultValue = "4096"
)
private int bufferSize = 4096;
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneTenantShell.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneTenantShell.java
index dd39145bc1b..0218be6ab34 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneTenantShell.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneTenantShell.java
@@ -529,14 +529,14 @@ public void testOzoneTenantBasicOperations() throws
IOException {
// Attempt to assign the user to the tenant again
executeHA(tenantShell, new String[] {
"user", "assign", "bob", "--tenant=research",
- "--accessId=research$bob"});
+ "--access-id=research$bob"});
checkOutput(out, "", false);
checkOutput(err, "accessId 'research$bob' already exists!\n", true);
// Attempt to assign the user to the tenant with a custom accessId
executeHA(tenantShell, new String[] {
"user", "assign", "bob", "--tenant=research",
- "--accessId=research$bob42"});
+ "--access-id=research$bob42"});
checkOutput(out, "", false);
// HDDS-6366: Disallow specifying custom accessId.
checkOutput(err, "Invalid accessId 'research$bob42'. "
diff --git
a/hadoop-ozone/vapor/src/main/java/org/apache/hadoop/ozone/freon/SCMThroughputBenchmark.java
b/hadoop-ozone/vapor/src/main/java/org/apache/hadoop/ozone/freon/SCMThroughputBenchmark.java
index 3652a8e58dd..ca8fc7f6cbc 100644
---
a/hadoop-ozone/vapor/src/main/java/org/apache/hadoop/ozone/freon/SCMThroughputBenchmark.java
+++
b/hadoop-ozone/vapor/src/main/java/org/apache/hadoop/ozone/freon/SCMThroughputBenchmark.java
@@ -156,7 +156,7 @@ public final class SCMThroughputBenchmark implements
Callable<Void>, VaporSubcom
defaultValue = "4")
private int numHeartbeats = 4;
- @CommandLine.Option(names = {"--scmHost", "--scm-host"},
+ @CommandLine.Option(names = {"--scm-host"},
required = true,
description = "The leader scm host x.x.x.x.")
private String scm;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
