svn commit: r331387 - stable/11/cddl/contrib/opensolaris/cmd/ztest

[Alexander Motin]

Author: mav
Date: Thu Mar 22 23:45:46 2018
New Revision: 331387
URL: https://svnweb.freebsd.org/changeset/base/331387

Log:
  MFC r329658: MFV r316872: 7502 ztest should run zdb with -G (debug mode)
  
  illumos/illumos-gate at c3c65d17f7b6689bbd6568a1a1fcc0c4a3bac127
  https://github.com/illumos/illumos-gate/commit/c3c65d17f7b6689bbd6568a1a1fcc0c4a3bac127
  
  https://www.illumos.org/issues/7502
    Right now ztest executes zdb without -G, so when it has errors, the messages
    are often not very helpful:
    Executing zdb -bccsv -d -U /rpool/tmp/zpool.cache ztest
    zdb: can't open 'ztest': Operation not supported
    ztest: '/usr/sbin/amd64/zdb -bccsv -d -U /rpool/tmp/zpool.cache ztest' exit
    code 1
    With -G, we'd have:
    /usr/sbin/amd64/zdb -bccsv -d -U /rpool/tmp/zpool.cache -G ztest
    zdb: can't open 'ztest': Operation not supported
  
    ZFS_DBGMSG(zdb):
    spa_open_common: opening ztest
    spa_load(ztest): LOADING
    spa_load(ztest): FAILED: unable to parse config [error=48]
    spa_load(ztest): UNLOADING
    Which indicates where the error came from
  
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Reviewed by: Dan Kimmel <dan.kimmel at delphix.com>
  Approved by: Gordon Ross <gordon.w.ross at gmail.com>
  Author: Pavel Zakharov <pavel.zakharov at delphix.com>

Modified:
  stable/11/cddl/contrib/opensolaris/cmd/ztest/ztest.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Thu Mar 22 23:45:01 2018	(r331386)
+++ stable/11/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Thu Mar 22 23:45:46 2018	(r331387)
@@ -5277,7 +5277,7 @@ ztest_run_zdb(char *pool)
 	isa = strdup(isa);
 	/* LINTED */
 	(void) sprintf(bin,
-	    "/usr/sbin%.*s/zdb -bcc%s%s -d -U %s %s",
+	    "/usr/sbin%.*s/zdb -bcc%s%s -G -d -U %s %s",
 	    isalen,
 	    isa,
 	    ztest_opts.zo_verbose >= 3 ? "s" : "",