d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFV r304159: 7277 zdb should be able to print zfs_dbgmsg's

Browse Source 
illumos/illumos-gate@29bdd2f916
https://github.com/illumos/illumos-gate/commit/29bdd2f916366ece37c4748bca6b3d61f
57a223b

https://www.illumos.org/issues/7277
  ztest always prints the debug messages (zfs_dbgmsg()) by calling
  zfs_dbgmsg_print(). We should add a flag to zdb to make it do this as well
  before exiting.

Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Approved by: Dan McDonald <danmcd@omniti.com>
Author: Pavel Zakharov <pavel.zakharov@delphix.com>
This commit is contained in:
Alexander Motin 2016-09-03 10:07:46 +00:00
commit 929d0128f7
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cddl/contrib/opensolaris/cmd/zdb/zdb.c
View File

@ -21,7 +21,7 @@
/* /*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2015 by Delphix. All rights reserved. * Copyright (c) 2011, 2016 by Delphix. All rights reserved.
* Copyright (c) 2014 Integros [integros.com] * Copyright (c) 2014 Integros [integros.com]
*/ */
@ -117,7 +117,7 @@ static void
usage(void) usage(void)
{ {
(void) fprintf(stderr, (void) fprintf(stderr,
"Usage: %s [-CumMdibcsDvhLXFPA] [-t txg] [-e [-p path...]] " "Usage: %s [-CumMdibcsDvhLXFPAG] [-t txg] [-e [-p path...]] "
"[-U config] [-I inflight I/Os] [-x dumpdir] poolname [object...]\n" "[-U config] [-I inflight I/Os] [-x dumpdir] poolname [object...]\n"
" %s [-divPA] [-e -p path...] [-U config] dataset " " %s [-divPA] [-e -p path...] [-U config] dataset "
"[object...]\n" "[object...]\n"
@ -178,12 +178,23 @@ usage(void)
(void) fprintf(stderr, " -I <number of inflight I/Os> -- " (void) fprintf(stderr, " -I <number of inflight I/Os> -- "
"specify the maximum number of " "specify the maximum number of "
"checksumming I/Os [default is 200]\n"); "checksumming I/Os [default is 200]\n");
(void) fprintf(stderr, " -G dump zfs_dbgmsg buffer before "
"exiting\n");
(void) fprintf(stderr, "Specify an option more than once (e.g. -bb) " (void) fprintf(stderr, "Specify an option more than once (e.g. -bb) "
"to make only that option verbose\n"); "to make only that option verbose\n");
(void) fprintf(stderr, "Default is to dump everything non-verbosely\n"); (void) fprintf(stderr, "Default is to dump everything non-verbosely\n");
exit(1); exit(1);
} }
static void
dump_debug_buffer()
{
if (dump_opt['G']) {
(void) printf("\n");
zfs_dbgmsg_print("zdb");
}
}
/* /*
* Called for usage errors that are discovered after a call to spa_open(), * Called for usage errors that are discovered after a call to spa_open(),
* dmu_bonus_hold(), or pool_match(). abort() is called for other errors. * dmu_bonus_hold(), or pool_match(). abort() is called for other errors.
@ -200,6 +211,8 @@ fatal(const char *fmt, ...)
va_end(ap); va_end(ap);
(void) fprintf(stderr, "\n"); (void) fprintf(stderr, "\n");
dump_debug_buffer();
exit(1); exit(1);
} }
@ -3103,8 +3116,10 @@ dump_zpool(spa_t *spa)
if (dump_opt['h']) if (dump_opt['h'])
dump_history(spa); dump_history(spa);
if (rc != 0) if (rc != 0) {
dump_debug_buffer();
exit(rc); exit(rc);
}
} }
#define ZDB_FLAG_CHECKSUM 0x0001 #define ZDB_FLAG_CHECKSUM 0x0001
@ -3575,7 +3590,7 @@ main(int argc, char **argv)
spa_config_path = spa_config_path_env; spa_config_path = spa_config_path_env;
while ((c = getopt(argc, argv, while ((c = getopt(argc, argv,
"bcdhilmMI:suCDRSAFLXx:evp:t:U:P")) != -1) { "bcdhilmMI:suCDRSAFLXx:evp:t:U:PG")) != -1) {
switch (c) { switch (c) {
case 'b': case 'b':
case 'c': case 'c':
@ -3591,6 +3606,7 @@ main(int argc, char **argv)
case 'M': case 'M':
case 'R': case 'R':
case 'S': case 'S':
case 'G':
dump_opt[c]++; dump_opt[c]++;
dump_all = 0; dump_all = 0;
break; break;
@ -3826,6 +3842,8 @@ main(int argc, char **argv)
fuid_table_destroy(); fuid_table_destroy();
sa_loaded = B_FALSE; sa_loaded = B_FALSE;
dump_debug_buffer();
libzfs_fini(g_zfs); libzfs_fini(g_zfs);
kernel_fini(); kernel_fini();