Skip to content
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

Jump to bottom

Fix bookie shell getUsage msg #4046

Closed
wants to merge 2 commits into from
Closed

Fix bookie shell getUsage msg #4046

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8699fe3
Fix bookie shell getUsage msg
AnonHxy Aug 11, 2023
17e8f23
fix checkstyle
AnonHxy Aug 11, 2023
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
62 changes: 32 additions & 30 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ String getDescription() {

@Override
String getUsage() {
return "metaformat [-nonInteractive] [-force]";
return "metaformat [--nonInteractive] [--force]";
}

@Override
Expand Down Expand Up @@ -378,7 +378,7 @@ String getDescription() {

@Override
String getUsage() {
return "nukeexistingcluster -zkledgersrootpath <zkledgersrootpath> [-instanceid <instanceid> | -force]";
return "nukeexistingcluster --zkledgersrootpath <zkledgersrootpath> [--instanceid <instanceid> | --force]";
}

@Override
Expand Down Expand Up @@ -423,7 +423,7 @@ String getDescription() {

@Override
String getUsage() {
return "bookieformat [-nonInteractive] [-force] [-deleteCookie]";
return "bookieformat [--nonInteractive] [--force] [--deleteCookie]";
}

@Override
Expand Down Expand Up @@ -505,7 +505,7 @@ String getDescription() {

@Override
String getUsage() {
return "recover [-deleteCookie] <bookieSrc[,bookieSrc,...]>";
return "recover [--deleteCookie] <bookieSrc[,bookieSrc,...]>";
}

@Override
Expand Down Expand Up @@ -611,9 +611,9 @@ String getDescription() {

@Override
String getUsage() {
return "readledger [-bookie <address:port>] [-msg] -ledgerid <ledgerid> "
+ "[-firstentryid <firstentryid> [-lastentryid <lastentryid>]] "
+ "[-force-recovery]";
return "readledger [--bookie <address:port>] [--msg] --ledgerid <ledgerid> "
+ "[--firstentryid <firstentryid> [--lastentryid <lastentryid>]] "
+ "[--force-recovery]";
}

@Override
Expand Down Expand Up @@ -677,8 +677,9 @@ String getDescription() {

@Override
String getUsage() {
return "listunderreplicated [[-missingreplica <bookieaddress>]"
+ " [-excludingmissingreplica <bookieaddress>]] [-printmissingreplica] [-printreplicationworkerid]";
return "listunderreplicated [[--missingreplica <bookieaddress>]"
+ " [--excludingmissingreplica <bookieaddress>]] [--printmissingreplica]"
+ " [--printreplicationworkerid]";
}

@Override
Expand Down Expand Up @@ -735,7 +736,7 @@ String getDescription() {

@Override
String getUsage() {
return "listledgers [-meta] [-bookieid <bookieaddress>]";
return "listledgers [--meta] [--bookieid <bookieaddress>]";
}

@Override
Expand Down Expand Up @@ -781,7 +782,7 @@ String getDescription() {

@Override
String getUsage() {
return "activeledgers [-logId <entry log id>] [-timeout <timeout>] [-formatter <ledger id formatter>]";
return "activeledgers [--logId <entry log id>] [--timeout <timeout>] [--formatter <ledger id formatter>]";
}

@Override
Expand Down Expand Up @@ -844,7 +845,7 @@ String getDescription() {

@Override
String getUsage() {
return "ledgermetadata -ledgerid <ledgerid> [--dumptofile FILENAME|--restorefromfile FILENAME]";
return "ledgermetadata --ledgerid <ledgerid> [--dumptofile FILENAME|--restorefromfile FILENAME]";
}

@Override
Expand Down Expand Up @@ -924,7 +925,7 @@ String getDescription() {

@Override
String getUsage() {
return "simpletest [-ensemble N] [-writeQuorum N] [-ackQuorum N] [-numEntries N]";
return "simpletest [--ensemble N] [--writeQuorum N] [--ackQuorum N] [--numEntries N]";
}

@Override
Expand Down Expand Up @@ -956,7 +957,7 @@ String getDescription() {

@Override
String getUsage() {
return "bookiesanity [-entries N] [-timeout N]";
return "bookiesanity [--entries N] [--timeout N]";
}

@Override
Expand Down Expand Up @@ -1025,8 +1026,8 @@ String getDescription() {

@Override
String getUsage() {
return "readlog [-msg] <entry_log_id | entry_log_file_name> [-ledgerid <ledgerid> "
+ "[-entryid <entryid>]] [-startpos <startEntryLogBytePos> [-endpos <endEntryLogBytePos>]]";
return "readlog [--msg] <entry_log_id | entry_log_file_name> [--ledgerid <ledgerid> "
+ "[--entryid <entryid>]] [--startpos <startEntryLogBytePos> [--endpos <endEntryLogBytePos>]]";
}

@Override
Expand Down Expand Up @@ -1131,7 +1132,7 @@ String getDescription() {

@Override
String getUsage() {
return "readjournal [-dir] [-msg] <journal_id | journal_file_name>";
return "readjournal [-dir] [--msg] <journal_id | journal_file_name>";
}

@Override
Expand Down Expand Up @@ -1226,7 +1227,7 @@ String getDescription() {

@Override
String getUsage() {
return "listbookies [-readwrite|-readonly|-all] [-hostnames]";
return "listbookies [--readwrite|--readonly|--all] [--hostnames]";
}

@Override
Expand Down Expand Up @@ -1265,7 +1266,7 @@ String getDescription() {

@Override
String getUsage() {
return "listfilesondisc [-journal|-entrylog|-index]";
return "listfilesondisc [--journal|--entrylog|--index]";
}

@Override
Expand Down Expand Up @@ -1341,7 +1342,7 @@ String getDescription() {

@Override
String getUsage() {
return "autorecovery [-enable|-disable]";
return "autorecovery [--enable|--disable]";
}

@Override
Expand Down Expand Up @@ -1417,7 +1418,7 @@ String getDescription() {

@Override
String getUsage() {
return "lostbookierecoverydelay [-get|-set <value>]";
return "lostbookierecoverydelay [--get|--set <value>]";
}

@Override
Expand Down Expand Up @@ -1542,7 +1543,7 @@ String getDescription() {

@Override
String getUsage() {
return "updatecookie [-bookieId <hostname|ip>] [-expandstorage] [-list] [-delete <force>]";
return "updatecookie [--bookieId <hostname|ip>] [--expandstorage] [--list] [--delete <force>]";
}

@Override
Expand Down Expand Up @@ -1616,8 +1617,8 @@ String getDescription() {

@Override
String getUsage() {
return "updateledgers -bookieId <hostname|ip> [-updatespersec N] [-maxOutstandingReads N] [-limit N] "
+ "[-verbose true/false] [-printprogress N]";
return "updateledgers --bookieId <hostname|ip> [--updatespersec N] [--maxOutstandingReads N] [--limit N] "
+ "[--verbose true/false] [--printprogress N]";
}

@Override
Expand Down Expand Up @@ -1693,8 +1694,9 @@ String getDescription() {

@Override
String getUsage() {
return "updateBookieInLedger -srcBookie <source bookie> -destBookie <destination bookie> "
+ "[-updatespersec N] [-maxOutstandingReads N] [-limit N] [-verbose true/false] [-printprogress N]";
return "updateBookieInLedger -srcBookie <source bookie> --destBookie <destination bookie> "
+ "[--updatespersec N] [--maxOutstandingReads N] [--limit N] [--verbose true/false]"
+ " [--printprogress N]";
}

@Override
Expand Down Expand Up @@ -1772,7 +1774,7 @@ String getDescription() {

@Override
String getUsage() {
return "deleteledger -ledgerid <ledgerid> [-force]";
return "deleteledger --ledgerid <ledgerid> [--force]";
}

@Override
Expand Down Expand Up @@ -1872,7 +1874,7 @@ String getDescription() {

@Override
String getUsage() {
return "forceauditchecks [-checkallledgerscheck [-placementpolicycheck] [-replicascheck]";
return "forceauditchecks [--checkallledgerscheck [--placementpolicycheck] [--replicascheck]";
}

@Override
Expand Down Expand Up @@ -1936,7 +1938,7 @@ String getDescription() {

@Override
String getUsage() {
return CMD_DECOMMISSIONBOOKIE + " [-bookieid <bookieaddress>]";
return CMD_DECOMMISSIONBOOKIE + " [--bookieid <bookieaddress>]";
}

@Override
Expand Down Expand Up @@ -1972,7 +1974,7 @@ String getDescription() {

@Override
String getUsage() {
return CMD_ENDPOINTINFO + " [-bookieid <bookieaddress>]";
return CMD_ENDPOINTINFO + " [--bookieid <bookieaddress>]";
}

@Override
Expand Down
Loading