Skip to content

Commit d6f2e62

Browse files
committed
Fix help for vos_path param
Also force a position for the --vos_path option in tests. Features: recovery ddb_cmd Signed-off-by: Kris Jacque <[email protected]>
1 parent 77eac0b commit d6f2e62

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

src/control/cmd/ddb/main.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -229,18 +229,16 @@ func parseOpts(args []string, opts *cliOptions, log *logging.LeveledLogger) erro
229229
p.Name = "ddb"
230230
p.Usage = "[OPTIONS]"
231231
p.ShortDescription = "daos debug tool"
232-
p.LongDescription = `The DAOS Debug Tool (ddb) allows a user to navigate through and modify
232+
p.LongDescription = `
233+
The DAOS Debug Tool (ddb) allows a user to navigate through and modify
233234
a file in the VOS format. It offers both a command line and interactive
234235
shell mode. If neither a single command or '-f' option is provided, then
235236
the tool will run in interactive mode. In order to modify the VOS file,
236237
the '-w' option must be included.
237238
238-
If the command requires it, the VOS file provided as the first positional
239-
parameter will be opened before any commands are executed. See the
240-
command‑specific help for details. When the VOS file is not required, it is
241-
ignored; however, it must still be supplied, and it may be empty (""), e.g.
242-
243-
ddb "" ls --help
239+
If the command requires it, the VOS file must be provided with the parameter
240+
--vos-path. The VOS file will be opened before any commands are executed. See
241+
the command‑specific help for details.
244242
`
245243

246244
// Set the traceback level such that a crash results in

src/tests/ftest/util/ddb_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def __init__(self, server_host, path, verbose=True, timeout=None, sudo=True):
3838
self.single_command = BasicParameter(None, position=2)
3939

4040
# VOS file path.
41-
self.vos_path = FormattedParameter("--vos-path {}")
41+
self.vos_path = FormattedParameter("--vos-path {}", position=1)
4242

4343
# Members needed for run().
4444
self.verbose = verbose

0 commit comments

Comments
 (0)