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

[Andriy Gapon]

Author: avg
Date: Wed Oct 16 06:18:37 2019
New Revision: 353611
URL: https://svnweb.freebsd.org/changeset/base/353611

Log:
  10330 merge recent ZoL vdev and metaslab changes
  
  illumos/illumos-gate at a0b03b161c4df3cfc54fbc741db09b3bdc23ffba
  https://github.com/illumos/illumos-gate/commit/a0b03b161c4df3cfc54fbc741db09b3bdc23ffba
  
  https://www.illumos.org/issues/10330
    3 recent ZoL changes in the vdev and metaslab code which we can pull over:
    PR 8324 c853f382db 8324 Change target size of metaslabs from 256GB to 16GB
    PR 8290 b194fab0fb 8290 Factor metaslab_load_wait() in metaslab_load()
    PR 8286 419ba59145 8286 Update vdev_is_spacemap_addressable() for new spacemap
    encoding
  
  Author: Serapheim Dimitropoulos <serapheimd at gmail.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/metaslab.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/metaslab.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/metaslab_impl.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_initialize.c

Modified: vendor/illumos/dist/cmd/zdb/zdb.c
==============================================================================
--- vendor/illumos/dist/cmd/zdb/zdb.c	Wed Oct 16 06:11:11 2019	(r353610)
+++ vendor/illumos/dist/cmd/zdb/zdb.c	Wed Oct 16 06:18:37 2019	(r353611)
@@ -901,11 +901,8 @@ dump_metaslab(metaslab_t *msp)
 
 	if (dump_opt['m'] > 2 && !dump_opt['L']) {
 		mutex_enter(&msp->ms_lock);
-		metaslab_load_wait(msp);
-		if (!msp->ms_loaded) {
-			VERIFY0(metaslab_load(msp));
-			range_tree_stat_verify(msp->ms_allocatable);
-		}
+		VERIFY0(metaslab_load(msp));
+		range_tree_stat_verify(msp->ms_allocatable);
 		dump_metaslab_stats(msp);
 		metaslab_unload(msp);
 		mutex_exit(&msp->ms_lock);