OpenZFS 7277 - zdb should be able to print zfs_dbgmsg's

[mirror_zfs.git] / cmd / zdb / zdb.c

diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
index 938df822705f8c267ce7bbef62a3bb2cadd535d6..6a36aa1ef94f55e89b983fe865618f546b4ee92f 100644 (file)
--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
@@ -21,7 +21,7 @@
 
 /*
  * 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) 2015, Intel Corporation.
  */
 
@@ -126,7 +126,7 @@ static void
 usage(void)
 {
        (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"
            "       %s [-divPA] [-e -p path...] [-U config] dataset "
            "[object...]\n"
@@ -187,12 +187,23 @@ usage(void)
        (void) fprintf(stderr, "        -I <number of inflight I/Os> -- "
            "specify the maximum number of "
            "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) "
            "to make only that option verbose\n");
        (void) fprintf(stderr, "Default is to dump everything non-verbosely\n");
        exit(1);
 }
 
+static void
+dump_debug_buffer(void)
+{
+       if (dump_opt['G']) {
+               (void) printf("\n");
+               zfs_dbgmsg_print("zdb");
+       }
+}
+
 /*
  * 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.
@@ -209,6 +220,8 @@ fatal(const char *fmt, ...)
        va_end(ap);
        (void) fprintf(stderr, "\n");
 
+       dump_debug_buffer();
+
        exit(1);
 }
 
@@ -3197,8 +3210,10 @@ dump_zpool(spa_t *spa)
        if (dump_opt['h'])
                dump_history(spa);
 
-       if (rc != 0)
+       if (rc != 0) {
+               dump_debug_buffer();
                exit(rc);
+       }
 }
 
 #define        ZDB_FLAG_CHECKSUM       0x0001
@@ -3692,7 +3707,7 @@ main(int argc, char **argv)
                spa_config_path = spa_config_path_env;
 
        while ((c = getopt(argc, argv,
-           "bcdhilmMI:suCDRSAFLXx:evp:t:U:PV")) != -1) {
+           "bcdhilmMI:suCDRSAFLXx:evp:t:U:PVG")) != -1) {
                switch (c) {
                case 'b':
                case 'c':
@@ -3708,6 +3723,7 @@ main(int argc, char **argv)
                case 'M':
                case 'R':
                case 'S':
+               case 'G':
                        dump_opt[c]++;
                        dump_all = 0;
                        break;
@@ -3939,6 +3955,8 @@ main(int argc, char **argv)
        fuid_table_destroy();
        sa_loaded = B_FALSE;
 
+       dump_debug_buffer();
+
        libzfs_fini(g_zfs);
        kernel_fini();