Print this page
re #13850 Refactor ZFS config discovery IOCs to libzfs_core patterns
re #9110 rb2713 - zdb dies with arithmetic exception
re #8346 rb2639 KT disk failures

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libzpool/common/util.c
          +++ new/usr/src/lib/libzpool/common/util.c
↓ open down ↓ 12 lines elided ↑ open up ↑
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
       23 + * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
  23   24   * Copyright (c) 2016 by Delphix. All rights reserved.
  24   25   * Copyright 2017 RackTop Systems.
  25   26   */
  26   27  
  27   28  #include <assert.h>
  28   29  #include <sys/zfs_context.h>
  29   30  #include <sys/avl.h>
  30   31  #include <string.h>
  31   32  #include <stdio.h>
  32   33  #include <stdlib.h>
↓ open down ↓ 6 lines elided ↑ open up ↑
  39   40  
  40   41  /*
  41   42   * Routines needed by more than one client of libzpool.
  42   43   */
  43   44  
  44   45  static void
  45   46  show_vdev_stats(const char *desc, const char *ctype, nvlist_t *nv, int indent)
  46   47  {
  47   48          vdev_stat_t *vs;
  48   49          vdev_stat_t v0 = { 0 };
  49      -        uint64_t sec;
       50 +        uint64_t sec, ops_rd, ops_wr;
  50   51          uint64_t is_log = 0;
  51   52          nvlist_t **child;
  52   53          uint_t c, children;
  53   54          char used[6], avail[6];
  54   55          char rops[6], wops[6], rbytes[6], wbytes[6], rerr[6], werr[6], cerr[6];
       56 +        char riotime[8], wiotime[8];
  55   57          char *prefix = "";
  56   58  
  57   59          if (indent == 0 && desc != NULL) {
  58   60                  (void) printf("                           "
  59      -                    " capacity   operations   bandwidth  ---- errors ----\n");
       61 +                    " capacity   operations   bandwidth   --- latency ---  "
       62 +                    "---- errors ----\n");
  60   63                  (void) printf("description                "
  61      -                    "used avail  read write  read write  read write cksum\n");
       64 +                    "used avail  read write  read write     read    write  "
       65 +                    "read write cksum\n");
  62   66          }
  63   67  
  64   68          if (desc != NULL) {
  65   69                  (void) nvlist_lookup_uint64(nv, ZPOOL_CONFIG_IS_LOG, &is_log);
  66   70  
  67   71                  if (is_log)
  68   72                          prefix = "log ";
  69   73  
  70   74                  if (nvlist_lookup_uint64_array(nv, ZPOOL_CONFIG_VDEV_STATS,
  71   75                      (uint64_t **)&vs, &c) != 0)
  72   76                          vs = &v0;
  73   77  
  74   78                  sec = MAX(1, vs->vs_timestamp / NANOSEC);
       79 +                ops_rd = MAX(1, vs->vs_ops[ZIO_TYPE_READ]);
       80 +                ops_wr = MAX(1, vs->vs_ops[ZIO_TYPE_WRITE]);
  75   81  
  76   82                  nicenum(vs->vs_alloc, used, sizeof (used));
  77   83                  nicenum(vs->vs_space - vs->vs_alloc, avail, sizeof (avail));
  78   84                  nicenum(vs->vs_ops[ZIO_TYPE_READ] / sec, rops, sizeof (rops));
  79   85                  nicenum(vs->vs_ops[ZIO_TYPE_WRITE] / sec, wops, sizeof (wops));
  80   86                  nicenum(vs->vs_bytes[ZIO_TYPE_READ] / sec, rbytes,
  81   87                      sizeof (rbytes));
  82   88                  nicenum(vs->vs_bytes[ZIO_TYPE_WRITE] / sec, wbytes,
  83   89                      sizeof (wbytes));
       90 +                nicenum(vs->vs_iotime[ZIO_TYPE_READ] / ops_rd, riotime,
       91 +                    sizeof (riotime));
       92 +                nicenum(vs->vs_iotime[ZIO_TYPE_WRITE] / ops_wr, wiotime,
       93 +                    sizeof (wiotime));
  84   94                  nicenum(vs->vs_read_errors, rerr, sizeof (rerr));
  85   95                  nicenum(vs->vs_write_errors, werr, sizeof (werr));
  86   96                  nicenum(vs->vs_checksum_errors, cerr, sizeof (cerr));
  87   97  
  88      -                (void) printf("%*s%s%*s%*s%*s %5s %5s %5s %5s %5s %5s %5s\n",
       98 +                (void) printf(
       99 +                    "%*s%s%*s%*s%*s %5s %5s %5s %5s %8s %8s %5s %5s %5s\n",
  89  100                      indent, "",
  90  101                      prefix,
  91  102                      indent + strlen(prefix) - 25 - (vs->vs_space ? 0 : 12),
  92  103                      desc,
  93  104                      vs->vs_space ? 6 : 0, vs->vs_space ? used : "",
  94  105                      vs->vs_space ? 6 : 0, vs->vs_space ? avail : "",
  95      -                    rops, wops, rbytes, wbytes, rerr, werr, cerr);
      106 +                    rops, wops, rbytes, wbytes, riotime, wiotime, rerr, werr,
      107 +                    cerr);
  96  108          }
  97  109  
  98  110          if (nvlist_lookup_nvlist_array(nv, ctype, &child, &children) != 0)
  99  111                  return;
 100  112  
 101  113          for (c = 0; c < children; c++) {
 102  114                  nvlist_t *cnv = child[c];
 103  115                  char *cname, *tname;
 104  116                  uint64_t np;
 105  117                  if (nvlist_lookup_string(cnv, ZPOOL_CONFIG_PATH, &cname) &&
↓ open down ↓ 85 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX