diff options
| author | Tim Chase <[email protected]> | 2015-05-14 12:45:56 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-05-15 10:52:46 -0700 |
| commit | b1b85c8772ed28d2c8227e6d32905740817ae2c3 (patch) | |
| tree | e22e9828d267566a36b75db823a3e0a6cad03ee3 | |
| parent | 79065ed5a454d36492a3006fec69f14ddf83a88f (diff) | |
Zdb should be able to open the root dataset
If the pool/dataset command-line argument is specified with a trailing
slash, for example, "tank/", it is interpreted as the root dataset.
Signed-off-by: Tim Chase <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #3415
| -rw-r--r-- | cmd/zdb/zdb.c | 12 | ||||
| -rw-r--r-- | man/man8/zdb.8 | 5 |
2 files changed, 16 insertions, 1 deletions
diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c index 0740b5ca6..d0bebbe60 100644 --- a/cmd/zdb/zdb.c +++ b/cmd/zdb/zdb.c @@ -3572,6 +3572,7 @@ main(int argc, char **argv) int rewind = ZPOOL_NEVER_REWIND; char *spa_config_path_env; const char *opts = "bcdhilmMI:suCDRSAFLXevp:t:U:P"; + boolean_t target_is_spa = B_TRUE; (void) setrlimit(RLIMIT_NOFILE, &rl); (void) enable_extended_FILE_stdio(-1, -1); @@ -3740,8 +3741,17 @@ main(int argc, char **argv) } } + if (strpbrk(target, "/@") != NULL) { + size_t targetlen; + + target_is_spa = B_FALSE; + targetlen = strlen(target); + if (targetlen && target[targetlen - 1] == '/') + target[targetlen - 1] = '\0'; + } + if (error == 0) { - if (strpbrk(target, "/@") == NULL || dump_opt['R']) { + if (target_is_spa || dump_opt['R']) { error = spa_open_rewind(target, &spa, FTAG, policy, NULL); if (error) { diff --git a/man/man8/zdb.8 b/man/man8/zdb.8 index 2bfe9683b..d19e4a39f 100644 --- a/man/man8/zdb.8 +++ b/man/man8/zdb.8 @@ -56,6 +56,11 @@ pool, and is inherently unstable. The precise output of most invocations is not documented, a knowledge of ZFS internals is assumed. .P +If the \fIdataset\fR argument does not contain any \fB/\fR or \fB@\fR +characters, it is interpreted as a pool name. The root dataset can be +specified as \fIpool\fB/\fR (pool name followed by a slash). + +.P When operating on an imported and active pool it is possible, though unlikely, that zdb may interpret inconsistent pool data and behave erratically. |