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

[Andriy Gapon]

Author: avg
Date: Wed Nov  6 09:09:03 2019
New Revision: 354386
URL: https://svnweb.freebsd.org/changeset/base/354386

Log:
  11770 additional mmp fixes
  
  illumos/illumos-gate at 4348eb901228d2f8fa50bb132a34248e8662074e
  https://github.com/illumos/illumos-gate/commit/4348eb901228d2f8fa50bb132a34248e8662074e
  
  https://www.illumos.org/issues/11770
    Port a few additional MMP fixes from ZoL that came in after our
    initial MMP port.
    4ca457b065 ZTS: Fix mmp_interval failure
    ca95f70dff zpool import progress kstat
    (only minimal changes from above can be pulled in right now)
    060f0226e6 MMP interval and fail_intervals in uberblock
  
  Portions contributed by: Jerry Jelinek <jerry.jelinek at joyent.com>
  Portions contributed by: Brian Behlendorf <behlendorf1 at llnl.gov>
  Author: Olaf Faaland <faaland1 at llnl.gov>

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/mmp.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/mmp.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/uberblock_impl.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/uberblock.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c
  vendor-sys/illumos/dist/uts/common/sys/fs/zfs.h

Modified: vendor/illumos/dist/cmd/zdb/zdb.c
==============================================================================
--- vendor/illumos/dist/cmd/zdb/zdb.c	Wed Nov  6 09:05:39 2019	(r354385)
+++ vendor/illumos/dist/cmd/zdb/zdb.c	Wed Nov  6 09:09:03 2019	(r354386)
@@ -2425,9 +2425,22 @@ dump_uberblock(uberblock_t *ub, const char *header, co
 
 	(void) printf("\tmmp_magic = %016llx\n",
 	    (u_longlong_t)ub->ub_mmp_magic);
-	if (ub->ub_mmp_magic == MMP_MAGIC)
+	if (MMP_VALID(ub)) {
 		(void) printf("\tmmp_delay = %0llu\n",
 		    (u_longlong_t)ub->ub_mmp_delay);
+		if (MMP_SEQ_VALID(ub))
+			(void) printf("\tmmp_seq = %u\n",
+			    (unsigned int) MMP_SEQ(ub));
+		if (MMP_FAIL_INT_VALID(ub))
+			(void) printf("\tmmp_fail = %u\n",
+			    (unsigned int) MMP_FAIL_INT(ub));
+		if (MMP_INTERVAL_VALID(ub))
+			(void) printf("\tmmp_write = %u\n",
+			    (unsigned int) MMP_INTERVAL(ub));
+		/* After MMP_* to make summarize_uberblock_mmp cleaner */
+		(void) printf("\tmmp_valid = %x\n",
+		    (unsigned int) ub->ub_mmp_config & 0xFF);
+	}
 
 	if (dump_opt['u'] >= 3) {
 		char blkbuf[BP_SPRINTF_LEN];