Print this page
4101 metaslab_debug should allow for fine-grained control
4102 space_maps should store more information about themselves
4103 space map object blocksize should be increased
4104 ::spa_space no longer works
4105 removing a mirrored log device results in a leaked object
4106 asynchronously load metaslab
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Sebastien Roy <seb@delphix.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/zfs/sys/vdev_impl.h
          +++ new/usr/src/uts/common/fs/zfs/sys/vdev_impl.h
↓ open down ↓ 136 lines elided ↑ open up ↑
 137  137          uint64_t        vdev_prevstate; /* used when reopening a vdev   */
 138  138          vdev_ops_t      *vdev_ops;      /* vdev operations              */
 139  139          spa_t           *vdev_spa;      /* spa for this vdev            */
 140  140          void            *vdev_tsd;      /* type-specific data           */
 141  141          vnode_t         *vdev_name_vp;  /* vnode for pathname           */
 142  142          vnode_t         *vdev_devid_vp; /* vnode for devid              */
 143  143          vdev_t          *vdev_top;      /* top-level vdev               */
 144  144          vdev_t          *vdev_parent;   /* parent vdev                  */
 145  145          vdev_t          **vdev_child;   /* array of children            */
 146  146          uint64_t        vdev_children;  /* number of children           */
 147      -        space_map_t     vdev_dtl[DTL_TYPES]; /* in-core dirty time logs */
 148  147          vdev_stat_t     vdev_stat;      /* virtual device statistics    */
 149  148          boolean_t       vdev_expanding; /* expand the vdev?             */
 150  149          boolean_t       vdev_reopening; /* reopen in progress?          */
 151  150          int             vdev_open_error; /* error on last open          */
 152  151          kthread_t       *vdev_open_thread; /* thread opening children   */
 153  152          uint64_t        vdev_crtxg;     /* txg when top-level was added */
 154  153  
 155  154          /*
 156  155           * Top-level vdev state.
 157  156           */
 158  157          uint64_t        vdev_ms_array;  /* metaslab array object        */
 159  158          uint64_t        vdev_ms_shift;  /* metaslab size shift          */
 160  159          uint64_t        vdev_ms_count;  /* number of metaslabs          */
 161  160          metaslab_group_t *vdev_mg;      /* metaslab group               */
 162  161          metaslab_t      **vdev_ms;      /* metaslab array               */
 163  162          txg_list_t      vdev_ms_list;   /* per-txg dirty metaslab lists */
 164  163          txg_list_t      vdev_dtl_list;  /* per-txg dirty DTL lists      */
 165  164          txg_node_t      vdev_txg_node;  /* per-txg dirty vdev linkage   */
 166  165          boolean_t       vdev_remove_wanted; /* async remove wanted?     */
 167  166          boolean_t       vdev_probe_wanted; /* async probe wanted?       */
 168      -        uint64_t        vdev_removing;  /* device is being removed?     */
 169  167          list_node_t     vdev_config_dirty_node; /* config dirty list    */
 170  168          list_node_t     vdev_state_dirty_node; /* state dirty list      */
 171  169          uint64_t        vdev_deflate_ratio; /* deflation ratio (x512)   */
 172  170          uint64_t        vdev_islog;     /* is an intent log device      */
 173      -        uint64_t        vdev_ishole;    /* is a hole in the namespace   */
      171 +        uint64_t        vdev_removing;  /* device is being removed?     */
      172 +        boolean_t       vdev_ishole;    /* is a hole in the namespace   */
 174  173  
 175  174          /*
 176  175           * Leaf vdev state.
 177  176           */
 178      -        uint64_t        vdev_psize;     /* physical device capacity     */
 179      -        space_map_obj_t vdev_dtl_smo;   /* dirty time log space map obj */
      177 +        range_tree_t    *vdev_dtl[DTL_TYPES]; /* dirty time logs        */
      178 +        space_map_t     *vdev_dtl_sm;   /* dirty time log space map     */
 180  179          txg_node_t      vdev_dtl_node;  /* per-txg dirty DTL linkage    */
      180 +        uint64_t        vdev_dtl_object; /* DTL object                  */
      181 +        uint64_t        vdev_psize;     /* physical device capacity     */
 181  182          uint64_t        vdev_wholedisk; /* true if this is a whole disk */
 182  183          uint64_t        vdev_offline;   /* persistent offline state     */
 183  184          uint64_t        vdev_faulted;   /* persistent faulted state     */
 184  185          uint64_t        vdev_degraded;  /* persistent degraded state    */
 185  186          uint64_t        vdev_removed;   /* persistent removed state     */
 186  187          uint64_t        vdev_resilver_txg; /* persistent resilvering state */
 187  188          uint64_t        vdev_nparity;   /* number of parity devices for raidz */
 188  189          char            *vdev_path;     /* vdev path (if any)           */
 189  190          char            *vdev_devid;    /* vdev devid (if any)          */
 190  191          char            *vdev_physpath; /* vdev device path (if any)    */
 191  192          char            *vdev_fru;      /* physical FRU location        */
 192  193          uint64_t        vdev_not_present; /* not present during import  */
 193  194          uint64_t        vdev_unspare;   /* unspare when resilvering done */
 194      -        hrtime_t        vdev_last_try;  /* last reopen time             */
 195  195          boolean_t       vdev_nowritecache; /* true if flushwritecache failed */
 196  196          boolean_t       vdev_checkremove; /* temporary online test      */
 197  197          boolean_t       vdev_forcefault; /* force online fault          */
 198  198          boolean_t       vdev_splitting; /* split or repair in progress  */
 199  199          boolean_t       vdev_delayed_close; /* delayed device close?    */
 200      -        uint8_t         vdev_tmpoffline; /* device taken offline temporarily? */
 201      -        uint8_t         vdev_detached;  /* device detached?             */
 202      -        uint8_t         vdev_cant_read; /* vdev is failing all reads    */
 203      -        uint8_t         vdev_cant_write; /* vdev is failing all writes  */
 204      -        uint64_t        vdev_isspare;   /* was a hot spare              */
 205      -        uint64_t        vdev_isl2cache; /* was a l2cache device         */
      200 +        boolean_t       vdev_tmpoffline; /* device taken offline temporarily? */
      201 +        boolean_t       vdev_detached;  /* device detached?             */
      202 +        boolean_t       vdev_cant_read; /* vdev is failing all reads    */
      203 +        boolean_t       vdev_cant_write; /* vdev is failing all writes  */
      204 +        boolean_t       vdev_isspare;   /* was a hot spare              */
      205 +        boolean_t       vdev_isl2cache; /* was a l2cache device         */
 206  206          vdev_queue_t    vdev_queue;     /* I/O deadline schedule queue  */
 207  207          vdev_cache_t    vdev_cache;     /* physical block cache         */
 208  208          spa_aux_vdev_t  *vdev_aux;      /* for l2cache vdevs            */
 209  209          zio_t           *vdev_probe_zio; /* root of current probe       */
 210  210          vdev_aux_t      vdev_label_aux; /* on-disk aux state            */
 211  211  
 212  212          /*
 213  213           * For DTrace to work in userland (libzpool) context, these fields must
 214  214           * remain at the end of the structure.  DTrace will use the kernel's
 215  215           * CTF definition for 'struct vdev', and since the size of a kmutex_t is
↓ open down ↓ 80 lines elided ↑ open up ↑
 296  296  extern void vdev_compact_children(vdev_t *pvd);
 297  297  extern vdev_t *vdev_add_parent(vdev_t *cvd, vdev_ops_t *ops);
 298  298  extern void vdev_remove_parent(vdev_t *cvd);
 299  299  
 300  300  /*
 301  301   * vdev sync load and sync
 302  302   */
 303  303  extern void vdev_load_log_state(vdev_t *nvd, vdev_t *ovd);
 304  304  extern boolean_t vdev_log_state_valid(vdev_t *vd);
 305  305  extern void vdev_load(vdev_t *vd);
      306 +extern int vdev_dtl_load(vdev_t *vd);
 306  307  extern void vdev_sync(vdev_t *vd, uint64_t txg);
 307  308  extern void vdev_sync_done(vdev_t *vd, uint64_t txg);
 308  309  extern void vdev_dirty(vdev_t *vd, int flags, void *arg, uint64_t txg);
      310 +extern void vdev_dirty_leaves(vdev_t *vd, int flags, uint64_t txg);
 309  311  
 310  312  /*
 311  313   * Available vdev types.
 312  314   */
 313  315  extern vdev_ops_t vdev_root_ops;
 314  316  extern vdev_ops_t vdev_mirror_ops;
 315  317  extern vdev_ops_t vdev_replacing_ops;
 316  318  extern vdev_ops_t vdev_raidz_ops;
 317  319  extern vdev_ops_t vdev_disk_ops;
 318  320  extern vdev_ops_t vdev_file_ops;
↓ open down ↓ 30 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX