Skip to content

Commit

Permalink
7614 zfs device evacuation/removal
Browse files Browse the repository at this point in the history
Reviewed by: Alex Reece <alex@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: John Kennedy <john.kennedy@delphix.com>
Reviewed by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Richard Laager <rlaager@wiktel.com>
Reviewed by: Tim Chase <tim@chase2k.com>
Approved by: Garrett D'Amore <garrett@damore.org>
  • Loading branch information
prashks authored and Prakash Surya committed Jan 10, 2018
1 parent eb9c323 commit 5cabbc6
Show file tree
Hide file tree
Showing 129 changed files with 9,817 additions and 871 deletions.
24 changes: 22 additions & 2 deletions usr/src/cmd/mdb/common/modules/zfs/zfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,23 @@ zfs_params(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
return (DCMD_OK);
}

/* ARGSUSED */
static int
dva(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
{
dva_t dva;
if (mdb_vread(&dva, sizeof (dva_t), addr) == -1) {
mdb_warn("failed to read dva_t");
return (DCMD_ERR);
}
mdb_printf("<%llu:%llx:%llx>\n",
(u_longlong_t)DVA_GET_VDEV(&dva),
(u_longlong_t)DVA_GET_OFFSET(&dva),
(u_longlong_t)DVA_GET_ASIZE(&dva));

return (DCMD_OK);
}

/* ARGSUSED */
static int
blkptr(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
Expand Down Expand Up @@ -2055,10 +2072,12 @@ spa_space(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
sd.ms_freeingtree >> shift, suffix);
mdb_printf("ms_freedtree = %llu%s\n",
sd.ms_freedtree >> shift, suffix);
mdb_printf("ms_tree = %llu%s\n", sd.ms_tree >> shift, suffix);
mdb_printf("ms_tree = %llu%s\n",
sd.ms_tree >> shift, suffix);
mdb_printf("ms_deferspace = %llu%s\n",
sd.ms_deferspace >> shift, suffix);
mdb_printf("last synced avail = %llu%s\n", sd.avail >> shift, suffix);
mdb_printf("last synced avail = %llu%s\n",
sd.avail >> shift, suffix);
mdb_printf("current syncing avail = %llu%s\n",
sd.nowavail >> shift, suffix);

Expand Down Expand Up @@ -3916,6 +3935,7 @@ arc_compression_stats(uintptr_t addr, uint_t flags, int argc,
static const mdb_dcmd_t dcmds[] = {
{ "arc", "[-bkmg]", "print ARC variables", arc_print },
{ "blkptr", ":", "print blkptr_t", blkptr },
{ "dva", ":", "print dva_t", dva },
{ "dbuf", ":", "print dmu_buf_impl_t", dbuf },
{ "dbuf_stats", ":", "dbuf stats", dbuf_stats },
{ "dbufs",
Expand Down
2 changes: 2 additions & 0 deletions usr/src/cmd/truss/codes.c
Original file line number Diff line number Diff line change
Expand Up @@ -1274,6 +1274,8 @@ const struct ioc {
"zfs_cmd_t" },
{ (uint_t)ZFS_IOC_CLONE, "ZFS_IOC_CLONE",
"zfs_cmd_t" },
{ (uint_t)ZFS_IOC_REMAP, "ZFS_IOC_REMAP",
"zfs_cmd_t" },
{ (uint_t)ZFS_IOC_BOOKMARK, "ZFS_IOC_BOOKMARK",
"zfs_cmd_t" },
{ (uint_t)ZFS_IOC_GET_BOOKMARKS, "ZFS_IOC_GET_BOOKMARKS",
Expand Down
Loading

0 comments on commit 5cabbc6

Please sign in to comment.