svn commit: r329766 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/cmd/zdb

[Alexander Motin]

Author: mav
Date: Thu Feb 22 00:09:15 2018
New Revision: 329766
URL: https://svnweb.freebsd.org/changeset/base/329766

Log:
  8962 zdb should work on non-idle pools
  
  illumos/illumos-gate at e144c4e6c90e7d4dccaad6db660ee42b6e7ba04f
  
  Currently `zdb` consistently fails to examine non-idle pools as it fails
  during the `spa_load()` process. The main problem seems to be that
  `spa_load_verify()` fails as can be seen below:
  
  $ sudo zdb -d -G dcenter
      zdb: can't open 'dcenter': I/O error
  
  ZFS_DBGMSG(zdb):
      spa_open_common: opening dcenter
      spa_load(dcenter): LOADING
      disk vdev '/dev/dsk/c4t11d0s0': best uberblock found for spa dcenter. txg 40824950
      spa_load(dcenter): using uberblock with txg=40824950
      spa_load(dcenter): UNLOADING
      spa_load(dcenter): RELOADING
      spa_load(dcenter): LOADING
      disk vdev '/dev/dsk/c3t10d0s0': best uberblock found for spa dcenter. txg 40824952
      spa_load(dcenter): using uberblock with txg=40824952
      spa_load(dcenter): FAILED: spa_load_verify failed [error=5]
      spa_load(dcenter): UNLOADING
  
  This change makes `spa_load_verify()` a dryrun when ran from `zdb`. This is
  done by creating a global flag in zfs and then setting it in `zdb`.
  
  Reviewed by: George Wilson <george.wilson at delphix.com>
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Reviewed by: Andy Stormont <astormont at racktopsystems.com>
  Approved by: Dan McDonald <danmcd at joyent.com>
  Author: Pavel Zakharov <pavel.zakharov at delphix.com>

Modified:
  vendor/illumos/dist/cmd/zdb/zdb.c

Changes in other areas also in this revision:
Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c

Modified: vendor/illumos/dist/cmd/zdb/zdb.c
==============================================================================
--- vendor/illumos/dist/cmd/zdb/zdb.c	Thu Feb 22 00:03:14 2018	(r329765)
+++ vendor/illumos/dist/cmd/zdb/zdb.c	Thu Feb 22 00:09:15 2018	(r329766)
@@ -89,12 +89,14 @@ extern boolean_t zfs_recover;
 extern uint64_t zfs_arc_max, zfs_arc_meta_limit;
 extern int zfs_vdev_async_read_max_active;
 extern int aok;
+extern boolean_t spa_load_verify_dryrun;
 #else
 int reference_tracking_enable;
 boolean_t zfs_recover;
 uint64_t zfs_arc_max, zfs_arc_meta_limit;
 int zfs_vdev_async_read_max_active;
 int aok;
+boolean_t spa_load_verify_dryrun;
 #endif
 
 static const char cmdname[] = "zdb";
@@ -4542,6 +4544,12 @@ main(int argc, char **argv)
 	 * Disable reference tracking for better performance.
 	 */
 	reference_tracking_enable = B_FALSE;
+
+	/*
+	 * Do not fail spa_load when spa_load_verify fails. This is needed
+	 * to load non-idle pools.
+	 */
+	spa_load_verify_dryrun = B_TRUE;
 
 	kernel_init(FREAD);
 	g_zfs = libzfs_init();