MFV r289306: 6295 metaslab_condense's dbgmsg should include vdev id

Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Andriy Gapon <avg@freebsd.org>
Reviewed by: Xin Li <delphij@freebsd.org>
Reviewed by: Justin Gibbs <gibbs@scsiguy.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Author: Joe Stein <joe.stein@delphix.com>

illumos/illumos-gate@daec38ecb4fb5e73e4ca9e99be84f6b8c50c02fa

diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
index c565e8b8fbd5f19515c705e4e96e65c61a09f4e0..6a20d25667de70108152237a2a0ed124ad54e1bd 100644 (file)
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  */
 
@@ -1794,10 +1794,11 @@ metaslab_condense(metaslab_t *msp, uint64_t txg, dmu_tx_t *tx)
        ASSERT(msp->ms_loaded);
 
 
-       spa_dbgmsg(spa, "condensing: txg %llu, msp[%llu] %p, "
-           "smp size %llu, segments %lu, forcing condense=%s", txg,
-           msp->ms_id, msp, space_map_length(msp->ms_sm),
-           avl_numnodes(&msp->ms_tree->rt_root),
+       spa_dbgmsg(spa, "condensing: txg %llu, msp[%llu] %p, vdev id %llu, "
+           "spa %s, smp size %llu, segments %lu, forcing condense=%s", txg,
+           msp->ms_id, msp, msp->ms_group->mg_vd->vdev_id,
+           msp->ms_group->mg_vd->vdev_spa->spa_name,
+           space_map_length(msp->ms_sm), avl_numnodes(&msp->ms_tree->rt_root),
            msp->ms_condense_wanted ? "TRUE" : "FALSE");
 
        msp->ms_condense_wanted = B_FALSE;