Print this page
NEX-5078 Want ability to see progress of freeing data and how much is left to free after large file delete patch
Reviewed by: Saso Kiselkov <saso.kiselkov@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
NEX-5024 Slow performance with a single large file delete
Reviewed by: Saso Kiselkov <saso.kiselkov@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
NEX-4608 WRC: Possible deadlock during the disabling of WRC for a dataset
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
Reviewed by: Saso Kiselkov <saso.kiselkov@nexenta.com>
5981 Deadlock in dmu_objset_find_dp
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Robert Mustacchi <rm@joyent.com>
5269 zpool import slow
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <george@delphix.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Dan McDonald <danmcd@omniti.com>
NEX-3558 KRRP Integration
re #12585 rb4049 ZFS++ work port - refactoring to improve separation of open/closed code, bug fixes, performance improvements - open code
Bug 11205: add missing libzfs_closed_stubs.c to fix opensource-only build.
ZFS plus work: special vdevs, cos, cos/vdev properties
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/uts/common/fs/zfs/sys/dsl_pool.h
+++ new/usr/src/uts/common/fs/zfs/sys/dsl_pool.h
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License (the "License").
6 6 * You may not use this file except in compliance with the License.
7 7 *
8 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 * or http://www.opensolaris.org/os/licensing.
10 10 * See the License for the specific language governing permissions
11 11 * and limitations under the License.
12 12 *
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 23 * Copyright (c) 2013, 2017 by Delphix. All rights reserved.
24 24 * Copyright 2016 Nexenta Systems, Inc. All rights reserved.
25 25 */
26 26
27 27 #ifndef _SYS_DSL_POOL_H
28 28 #define _SYS_DSL_POOL_H
29 29
30 30 #include <sys/spa.h>
31 31 #include <sys/txg.h>
32 32 #include <sys/txg_impl.h>
33 33 #include <sys/zfs_context.h>
34 34 #include <sys/zio.h>
35 35 #include <sys/dnode.h>
36 36 #include <sys/ddt.h>
37 37 #include <sys/arc.h>
38 38 #include <sys/bpobj.h>
39 39 #include <sys/bptree.h>
40 40 #include <sys/rrwlock.h>
41 41
42 42 #ifdef __cplusplus
43 43 extern "C" {
44 44 #endif
45 45
46 46 struct objset;
47 47 struct dsl_dir;
48 48 struct dsl_dataset;
49 49 struct dsl_pool;
50 50 struct dmu_tx;
51 51 struct dsl_scan;
52 52
53 53 extern uint64_t zfs_dirty_data_max;
54 54 extern uint64_t zfs_dirty_data_max_max;
55 55 extern uint64_t zfs_dirty_data_sync;
56 56 extern int zfs_dirty_data_max_percent;
57 57 extern int zfs_delay_min_dirty_percent;
58 58 extern uint64_t zfs_delay_scale;
59 59
60 60 /* These macros are for indexing into the zfs_all_blkstats_t. */
61 61 #define DMU_OT_DEFERRED DMU_OT_NONE
62 62 #define DMU_OT_OTHER DMU_OT_NUMTYPES /* place holder for DMU_OT() types */
63 63 #define DMU_OT_TOTAL (DMU_OT_NUMTYPES + 1)
64 64
65 65 typedef struct zfs_blkstat {
66 66 uint64_t zb_count;
67 67 uint64_t zb_asize;
68 68 uint64_t zb_lsize;
69 69 uint64_t zb_psize;
70 70 uint64_t zb_gangs;
71 71 uint64_t zb_ditto_2_of_2_samevdev;
72 72 uint64_t zb_ditto_2_of_3_samevdev;
73 73 uint64_t zb_ditto_3_of_3_samevdev;
74 74 } zfs_blkstat_t;
75 75
76 76 typedef struct zfs_all_blkstats {
77 77 zfs_blkstat_t zab_type[DN_MAX_LEVELS + 1][DMU_OT_TOTAL + 1];
78 78 } zfs_all_blkstats_t;
79 79
80 80
81 81 typedef struct dsl_pool {
82 82 /* Immutable */
83 83 spa_t *dp_spa;
84 84 struct objset *dp_meta_objset;
85 85 struct dsl_dir *dp_root_dir;
86 86 struct dsl_dir *dp_mos_dir;
87 87 struct dsl_dir *dp_free_dir;
88 88 struct dsl_dir *dp_leak_dir;
|
↓ open down ↓ |
88 lines elided |
↑ open up ↑ |
89 89 struct dsl_dataset *dp_origin_snap;
90 90 uint64_t dp_root_dir_obj;
91 91 struct taskq *dp_vnrele_taskq;
92 92
93 93 /* No lock needed - sync context only */
94 94 blkptr_t dp_meta_rootbp;
95 95 uint64_t dp_tmp_userrefs_obj;
96 96 bpobj_t dp_free_bpobj;
97 97 uint64_t dp_bptree_obj;
98 98 uint64_t dp_empty_bpobj;
99 - bpobj_t dp_obsolete_bpobj;
100 99
100 + /*
101 + * Used for "special" device only
102 + * dp_rtime: the time (in ms) when we moved the data
103 + */
104 + hrtime_t dp_spec_rtime;
105 + uint64_t dp_sync_history[2];
106 +
101 107 struct dsl_scan *dp_scan;
102 108
103 109 /* Uses dp_lock */
104 110 kmutex_t dp_lock;
105 111 kcondvar_t dp_spaceavail_cv;
106 112 uint64_t dp_dirty_pertxg[TXG_SIZE];
107 113 uint64_t dp_dirty_total;
114 + uint64_t dp_long_freeing_total;
108 115 uint64_t dp_long_free_dirty_pertxg[TXG_SIZE];
109 116 uint64_t dp_mos_used_delta;
110 117 uint64_t dp_mos_compressed_delta;
111 118 uint64_t dp_mos_uncompressed_delta;
112 119
113 120 /*
114 121 * Time of most recently scheduled (furthest in the future)
115 122 * wakeup for delayed transactions.
116 123 */
117 124 hrtime_t dp_last_wakeup;
118 125
119 126 /* Has its own locking */
120 127 tx_state_t dp_tx;
121 128 txg_list_t dp_dirty_datasets;
122 129 txg_list_t dp_dirty_zilogs;
123 130 txg_list_t dp_dirty_dirs;
124 131 txg_list_t dp_sync_tasks;
125 132 taskq_t *dp_sync_taskq;
126 133 taskq_t *dp_zil_clean_taskq;
127 134
128 135 /*
129 136 * Protects administrative changes (properties, namespace)
130 137 *
131 138 * It is only held for write in syncing context. Therefore
132 139 * syncing context does not need to ever have it for read, since
133 140 * nobody else could possibly have it for write.
134 141 */
135 142 rrwlock_t dp_config_rwlock;
136 143
137 144 zfs_all_blkstats_t *dp_blkstats;
|
↓ open down ↓ |
20 lines elided |
↑ open up ↑ |
138 145 } dsl_pool_t;
139 146
140 147 int dsl_pool_init(spa_t *spa, uint64_t txg, dsl_pool_t **dpp);
141 148 int dsl_pool_open(dsl_pool_t *dp);
142 149 void dsl_pool_close(dsl_pool_t *dp);
143 150 dsl_pool_t *dsl_pool_create(spa_t *spa, nvlist_t *zplprops, uint64_t txg);
144 151 void dsl_pool_sync(dsl_pool_t *dp, uint64_t txg);
145 152 void dsl_pool_sync_done(dsl_pool_t *dp, uint64_t txg);
146 153 int dsl_pool_sync_context(dsl_pool_t *dp);
147 154 uint64_t dsl_pool_adjustedsize(dsl_pool_t *dp, boolean_t netfree);
155 +uint64_t dsl_pool_adjustedfree(dsl_pool_t *dp, boolean_t netfree);
148 156 void dsl_pool_dirty_space(dsl_pool_t *dp, int64_t space, dmu_tx_t *tx);
149 157 void dsl_pool_undirty_space(dsl_pool_t *dp, int64_t space, uint64_t txg);
150 158 void dsl_free(dsl_pool_t *dp, uint64_t txg, const blkptr_t *bpp);
151 159 void dsl_free_sync(zio_t *pio, dsl_pool_t *dp, uint64_t txg,
152 160 const blkptr_t *bpp);
153 161 void dsl_pool_create_origin(dsl_pool_t *dp, dmu_tx_t *tx);
154 162 void dsl_pool_upgrade_clones(dsl_pool_t *dp, dmu_tx_t *tx);
155 163 void dsl_pool_upgrade_dir_clones(dsl_pool_t *dp, dmu_tx_t *tx);
156 164 void dsl_pool_mos_diduse_space(dsl_pool_t *dp,
157 165 int64_t used, int64_t comp, int64_t uncomp);
158 166 void dsl_pool_config_enter(dsl_pool_t *dp, void *tag);
159 167 void dsl_pool_config_enter_prio(dsl_pool_t *dp, void *tag);
160 168 void dsl_pool_config_exit(dsl_pool_t *dp, void *tag);
161 169 boolean_t dsl_pool_config_held(dsl_pool_t *dp);
162 170 boolean_t dsl_pool_config_held_writer(dsl_pool_t *dp);
163 171 boolean_t dsl_pool_need_dirty_delay(dsl_pool_t *dp);
164 172
165 173 taskq_t *dsl_pool_vnrele_taskq(dsl_pool_t *dp);
|
↓ open down ↓ |
8 lines elided |
↑ open up ↑ |
166 174
167 175 int dsl_pool_user_hold(dsl_pool_t *dp, uint64_t dsobj,
168 176 const char *tag, uint64_t now, dmu_tx_t *tx);
169 177 int dsl_pool_user_release(dsl_pool_t *dp, uint64_t dsobj,
170 178 const char *tag, dmu_tx_t *tx);
171 179 void dsl_pool_clean_tmp_userrefs(dsl_pool_t *dp);
172 180 int dsl_pool_open_special_dir(dsl_pool_t *dp, const char *name, dsl_dir_t **);
173 181 int dsl_pool_hold(const char *name, void *tag, dsl_pool_t **dp);
174 182 void dsl_pool_rele(dsl_pool_t *dp, void *tag);
175 183
176 -void dsl_pool_create_obsolete_bpobj(dsl_pool_t *dp, dmu_tx_t *tx);
177 -void dsl_pool_destroy_obsolete_bpobj(dsl_pool_t *dp, dmu_tx_t *tx);
178 -
179 184 #ifdef __cplusplus
180 185 }
181 186 #endif
182 187
183 188 #endif /* _SYS_DSL_POOL_H */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX