Print this page
NEX-9989 Changing volume names can result in double imports and data corruption
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
NEX-5064 On-demand trim should store operation start and stop time
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
Reviewed by: Alek Pinchuk <alek.pinchuk@nexenta.com>
NEX-3984 On-demand TRIM
Reviewed by: Alek Pinchuk <alek@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
Conflicts:
usr/src/common/zfs/zpool_prop.c
usr/src/uts/common/sys/fs/zfs.h
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/spa_config.c
+++ new/usr/src/uts/common/fs/zfs/spa_config.c
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
|
↓ open down ↓ |
13 lines elided |
↑ open up ↑ |
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 /*
23 23 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
24 - * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
24 + * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
25 25 * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
26 26 * Copyright 2017 Joyent, Inc.
27 27 */
28 28
29 29 #include <sys/spa.h>
30 30 #include <sys/fm/fs/zfs.h>
31 31 #include <sys/spa_impl.h>
32 32 #include <sys/nvpair.h>
33 33 #include <sys/uio.h>
34 34 #include <sys/fs/zfs.h>
35 35 #include <sys/vdev_impl.h>
36 36 #include <sys/zfs_ioctl.h>
37 37 #include <sys/utsname.h>
38 38 #include <sys/systeminfo.h>
39 39 #include <sys/sunddi.h>
40 40 #include <sys/zfeature.h>
41 41 #ifdef _KERNEL
42 42 #include <sys/kobj.h>
43 43 #include <sys/zone.h>
44 44 #endif
45 45
46 46 /*
47 47 * Pool configuration repository.
48 48 *
|
↓ open down ↓ |
14 lines elided |
↑ open up ↑ |
49 49 * Pool configuration is stored as a packed nvlist on the filesystem. By
50 50 * default, all pools are stored in /etc/zfs/zpool.cache and loaded on boot
51 51 * (when the ZFS module is loaded). Pools can also have the 'cachefile'
52 52 * property set that allows them to be stored in an alternate location until
53 53 * the control of external software.
54 54 *
55 55 * For each cache file, we have a single nvlist which holds all the
56 56 * configuration information. When the module loads, we read this information
57 57 * from /etc/zfs/zpool.cache and populate the SPA namespace. This namespace is
58 58 * maintained independently in spa.c. Whenever the namespace is modified, or
59 - * the configuration of a pool is changed, we call spa_write_cachefile(), which
59 + * the configuration of a pool is changed, we call spa_config_sync(), which
60 60 * walks through all the active pools and writes the configuration to disk.
61 61 */
62 62
63 63 static uint64_t spa_config_generation = 1;
64 64
65 65 /*
66 66 * This can be overridden in userland to preserve an alternate namespace for
67 67 * userland pools when doing testing.
68 68 */
69 69 const char *spa_config_path = ZPOOL_CACHE;
70 70
71 71 /*
72 72 * Called when the module is first loaded, this routine loads the configuration
73 73 * file into the SPA namespace. It does not actually open or load the pools; it
74 74 * only populates the namespace.
75 75 */
76 76 void
77 77 spa_config_load(void)
78 78 {
79 79 void *buf = NULL;
80 80 nvlist_t *nvlist, *child;
81 81 nvpair_t *nvpair;
82 82 char *pathname;
83 83 struct _buf *file;
84 84 uint64_t fsize;
85 85
86 86 /*
87 87 * Open the configuration file.
88 88 */
89 89 pathname = kmem_alloc(MAXPATHLEN, KM_SLEEP);
90 90
91 91 (void) snprintf(pathname, MAXPATHLEN, "%s%s",
92 92 (rootdir != NULL) ? "./" : "", spa_config_path);
93 93
94 94 file = kobj_open_file(pathname);
95 95
96 96 kmem_free(pathname, MAXPATHLEN);
97 97
98 98 if (file == (struct _buf *)-1)
99 99 return;
100 100
101 101 if (kobj_get_filesize(file, &fsize) != 0)
102 102 goto out;
103 103
104 104 buf = kmem_alloc(fsize, KM_SLEEP);
105 105
106 106 /*
107 107 * Read the nvlist from the file.
108 108 */
109 109 if (kobj_read_file(file, buf, fsize, 0) < 0)
110 110 goto out;
111 111
112 112 /*
113 113 * Unpack the nvlist.
114 114 */
|
↓ open down ↓ |
45 lines elided |
↑ open up ↑ |
115 115 if (nvlist_unpack(buf, fsize, &nvlist, KM_SLEEP) != 0)
116 116 goto out;
117 117
118 118 /*
119 119 * Iterate over all elements in the nvlist, creating a new spa_t for
120 120 * each one with the specified configuration.
121 121 */
122 122 mutex_enter(&spa_namespace_lock);
123 123 nvpair = NULL;
124 124 while ((nvpair = nvlist_next_nvpair(nvlist, nvpair)) != NULL) {
125 + uint64_t guid = 0;
126 +
125 127 if (nvpair_type(nvpair) != DATA_TYPE_NVLIST)
126 128 continue;
127 129
128 130 child = fnvpair_value_nvlist(nvpair);
131 + /* a zero guid means we simply will ignore the check later */
132 + (void) nvlist_lookup_uint64(child, ZPOOL_CONFIG_POOL_GUID,
133 + &guid);
129 134
130 - if (spa_lookup(nvpair_name(nvpair)) != NULL)
135 + if (spa_lookup(nvpair_name(nvpair)) != NULL ||
136 + spa_config_guid_exists(guid)) {
131 137 continue;
138 + }
132 139 (void) spa_add(nvpair_name(nvpair), child, NULL);
133 140 }
134 141 mutex_exit(&spa_namespace_lock);
135 142
136 143 nvlist_free(nvlist);
137 144
138 145 out:
139 146 if (buf != NULL)
140 147 kmem_free(buf, fsize);
141 148
142 149 kobj_close_file(file);
143 150 }
144 151
145 152 static int
146 153 spa_config_write(spa_config_dirent_t *dp, nvlist_t *nvl)
147 154 {
148 155 size_t buflen;
149 156 char *buf;
150 157 vnode_t *vp;
151 158 int oflags = FWRITE | FTRUNC | FCREAT | FOFFMAX;
152 159 char *temp;
153 160 int err;
154 161
155 162 /*
156 163 * If the nvlist is empty (NULL), then remove the old cachefile.
157 164 */
158 165 if (nvl == NULL) {
159 166 err = vn_remove(dp->scd_path, UIO_SYSSPACE, RMFILE);
160 167 return (err);
161 168 }
162 169
163 170 /*
164 171 * Pack the configuration into a buffer.
165 172 */
166 173 buf = fnvlist_pack(nvl, &buflen);
167 174 temp = kmem_zalloc(MAXPATHLEN, KM_SLEEP);
168 175
169 176 /*
170 177 * Write the configuration to disk. We need to do the traditional
171 178 * 'write to temporary file, sync, move over original' to make sure we
172 179 * always have a consistent view of the data.
173 180 */
174 181 (void) snprintf(temp, MAXPATHLEN, "%s.tmp", dp->scd_path);
175 182
176 183 err = vn_open(temp, UIO_SYSSPACE, oflags, 0644, &vp, CRCREAT, 0);
177 184 if (err == 0) {
178 185 err = vn_rdwr(UIO_WRITE, vp, buf, buflen, 0, UIO_SYSSPACE,
179 186 0, RLIM64_INFINITY, kcred, NULL);
180 187 if (err == 0)
181 188 err = VOP_FSYNC(vp, FSYNC, kcred, NULL);
182 189 if (err == 0)
183 190 err = vn_rename(temp, dp->scd_path, UIO_SYSSPACE);
184 191 (void) VOP_CLOSE(vp, oflags, 1, 0, kcred, NULL);
185 192 VN_RELE(vp);
186 193 }
187 194
188 195 (void) vn_remove(temp, UIO_SYSSPACE, RMFILE);
189 196
190 197 fnvlist_pack_free(buf, buflen);
|
↓ open down ↓ |
49 lines elided |
↑ open up ↑ |
191 198 kmem_free(temp, MAXPATHLEN);
192 199 return (err);
193 200 }
194 201
195 202 /*
196 203 * Synchronize pool configuration to disk. This must be called with the
197 204 * namespace lock held. Synchronizing the pool cache is typically done after
198 205 * the configuration has been synced to the MOS. This exposes a window where
199 206 * the MOS config will have been updated but the cache file has not. If
200 207 * the system were to crash at that instant then the cached config may not
201 - * contain the correct information to open the pool and an explicit import
208 + * contain the correct information to open the pool and an explicity import
202 209 * would be required.
203 210 */
204 211 void
205 -spa_write_cachefile(spa_t *target, boolean_t removing, boolean_t postsysevent)
212 +spa_config_sync(spa_t *target, boolean_t removing, boolean_t postsysevent)
206 213 {
207 214 spa_config_dirent_t *dp, *tdp;
208 215 nvlist_t *nvl;
209 216 boolean_t ccw_failure;
210 217 int error;
211 218
212 219 ASSERT(MUTEX_HELD(&spa_namespace_lock));
213 220
214 221 if (rootdir == NULL || !(spa_mode_global & FWRITE))
215 222 return;
216 223
217 224 /*
218 225 * Iterate over all cachefiles for the pool, past or present. When the
219 226 * cachefile is changed, the new one is pushed onto this list, allowing
220 227 * us to update previous cachefiles that no longer contain this pool.
221 228 */
222 229 ccw_failure = B_FALSE;
223 230 for (dp = list_head(&target->spa_config_list); dp != NULL;
224 231 dp = list_next(&target->spa_config_list, dp)) {
225 232 spa_t *spa = NULL;
226 233 if (dp->scd_path == NULL)
227 234 continue;
228 235
229 236 /*
230 237 * Iterate over all pools, adding any matching pools to 'nvl'.
231 238 */
232 239 nvl = NULL;
233 240 while ((spa = spa_next(spa)) != NULL) {
234 241 /*
235 242 * Skip over our own pool if we're about to remove
236 243 * ourselves from the spa namespace or any pool that
237 244 * is readonly. Since we cannot guarantee that a
238 245 * readonly pool would successfully import upon reboot,
239 246 * we don't allow them to be written to the cache file.
240 247 */
241 248 if ((spa == target && removing) ||
242 249 !spa_writeable(spa))
243 250 continue;
244 251
245 252 mutex_enter(&spa->spa_props_lock);
246 253 tdp = list_head(&spa->spa_config_list);
247 254 if (spa->spa_config == NULL ||
248 255 tdp->scd_path == NULL ||
249 256 strcmp(tdp->scd_path, dp->scd_path) != 0) {
250 257 mutex_exit(&spa->spa_props_lock);
251 258 continue;
252 259 }
253 260
254 261 if (nvl == NULL)
255 262 nvl = fnvlist_alloc();
256 263
257 264 fnvlist_add_nvlist(nvl, spa->spa_name,
258 265 spa->spa_config);
259 266 mutex_exit(&spa->spa_props_lock);
260 267 }
261 268
262 269 error = spa_config_write(dp, nvl);
263 270 if (error != 0)
264 271 ccw_failure = B_TRUE;
265 272 nvlist_free(nvl);
266 273 }
267 274
268 275 if (ccw_failure) {
269 276 /*
270 277 * Keep trying so that configuration data is
271 278 * written if/when any temporary filesystem
272 279 * resource issues are resolved.
273 280 */
274 281 if (target->spa_ccw_fail_time == 0) {
275 282 zfs_ereport_post(FM_EREPORT_ZFS_CONFIG_CACHE_WRITE,
276 283 target, NULL, NULL, 0, 0);
277 284 }
278 285 target->spa_ccw_fail_time = gethrtime();
279 286 spa_async_request(target, SPA_ASYNC_CONFIG_UPDATE);
280 287 } else {
281 288 /*
282 289 * Do not rate limit future attempts to update
283 290 * the config cache.
284 291 */
285 292 target->spa_ccw_fail_time = 0;
286 293 }
287 294
288 295 /*
289 296 * Remove any config entries older than the current one.
290 297 */
291 298 dp = list_head(&target->spa_config_list);
292 299 while ((tdp = list_next(&target->spa_config_list, dp)) != NULL) {
293 300 list_remove(&target->spa_config_list, tdp);
294 301 if (tdp->scd_path != NULL)
295 302 spa_strfree(tdp->scd_path);
296 303 kmem_free(tdp, sizeof (spa_config_dirent_t));
297 304 }
298 305
299 306 spa_config_generation++;
300 307
301 308 if (postsysevent)
302 309 spa_event_notify(target, NULL, NULL, ESC_ZFS_CONFIG_SYNC);
303 310 }
304 311
305 312 /*
306 313 * Sigh. Inside a local zone, we don't have access to /etc/zfs/zpool.cache,
307 314 * and we don't want to allow the local zone to see all the pools anyway.
308 315 * So we have to invent the ZFS_IOC_CONFIG ioctl to grab the configuration
309 316 * information for all pool visible within the zone.
310 317 */
311 318 nvlist_t *
312 319 spa_all_configs(uint64_t *generation)
313 320 {
314 321 nvlist_t *pools;
315 322 spa_t *spa = NULL;
316 323
317 324 if (*generation == spa_config_generation)
318 325 return (NULL);
319 326
320 327 pools = fnvlist_alloc();
321 328
322 329 mutex_enter(&spa_namespace_lock);
323 330 while ((spa = spa_next(spa)) != NULL) {
324 331 if (INGLOBALZONE(curproc) ||
325 332 zone_dataset_visible(spa_name(spa), NULL)) {
326 333 mutex_enter(&spa->spa_props_lock);
327 334 fnvlist_add_nvlist(pools, spa_name(spa),
328 335 spa->spa_config);
329 336 mutex_exit(&spa->spa_props_lock);
330 337 }
331 338 }
|
↓ open down ↓ |
116 lines elided |
↑ open up ↑ |
332 339 *generation = spa_config_generation;
333 340 mutex_exit(&spa_namespace_lock);
334 341
335 342 return (pools);
336 343 }
337 344
338 345 void
339 346 spa_config_set(spa_t *spa, nvlist_t *config)
340 347 {
341 348 mutex_enter(&spa->spa_props_lock);
342 - if (spa->spa_config != NULL && spa->spa_config != config)
343 - nvlist_free(spa->spa_config);
349 + nvlist_free(spa->spa_config);
344 350 spa->spa_config = config;
345 351 mutex_exit(&spa->spa_props_lock);
346 352 }
347 353
348 354 /*
349 355 * Generate the pool's configuration based on the current in-core state.
350 356 *
351 357 * We infer whether to generate a complete config or just one top-level config
352 358 * based on whether vd is the root vdev.
353 359 */
354 360 nvlist_t *
355 361 spa_config_generate(spa_t *spa, vdev_t *vd, uint64_t txg, int getstats)
356 362 {
357 363 nvlist_t *config, *nvroot;
358 364 vdev_t *rvd = spa->spa_root_vdev;
359 365 unsigned long hostid = 0;
360 366 boolean_t locked = B_FALSE;
361 367 uint64_t split_guid;
362 368
363 369 if (vd == NULL) {
364 370 vd = rvd;
365 371 locked = B_TRUE;
366 372 spa_config_enter(spa, SCL_CONFIG | SCL_STATE, FTAG, RW_READER);
367 373 }
368 374
369 375 ASSERT(spa_config_held(spa, SCL_CONFIG | SCL_STATE, RW_READER) ==
370 376 (SCL_CONFIG | SCL_STATE));
371 377
372 378 /*
373 379 * If txg is -1, report the current value of spa->spa_config_txg.
374 380 */
375 381 if (txg == -1ULL)
376 382 txg = spa->spa_config_txg;
377 383
378 384 config = fnvlist_alloc();
379 385
|
↓ open down ↓ |
26 lines elided |
↑ open up ↑ |
380 386 fnvlist_add_uint64(config, ZPOOL_CONFIG_VERSION, spa_version(spa));
381 387 fnvlist_add_string(config, ZPOOL_CONFIG_POOL_NAME, spa_name(spa));
382 388 fnvlist_add_uint64(config, ZPOOL_CONFIG_POOL_STATE, spa_state(spa));
383 389 fnvlist_add_uint64(config, ZPOOL_CONFIG_POOL_TXG, txg);
384 390 fnvlist_add_uint64(config, ZPOOL_CONFIG_POOL_GUID, spa_guid(spa));
385 391 if (spa->spa_comment != NULL) {
386 392 fnvlist_add_string(config, ZPOOL_CONFIG_COMMENT,
387 393 spa->spa_comment);
388 394 }
389 395
396 +#ifdef _KERNEL
390 397 hostid = zone_get_hostid(NULL);
391 -
398 +#else /* _KERNEL */
399 + /*
400 + * We're emulating the system's hostid in userland, so we can't use
401 + * zone_get_hostid().
402 + */
403 + (void) ddi_strtoul(hw_serial, NULL, 10, &hostid);
404 +#endif /* _KERNEL */
392 405 if (hostid != 0) {
393 406 fnvlist_add_uint64(config, ZPOOL_CONFIG_HOSTID, hostid);
394 407 }
395 408 fnvlist_add_string(config, ZPOOL_CONFIG_HOSTNAME, utsname.nodename);
396 409
397 410 int config_gen_flags = 0;
398 411 if (vd != rvd) {
399 412 fnvlist_add_uint64(config, ZPOOL_CONFIG_TOP_GUID,
400 413 vd->vdev_top->vdev_guid);
401 414 fnvlist_add_uint64(config, ZPOOL_CONFIG_GUID,
402 415 vd->vdev_guid);
403 416 if (vd->vdev_isspare) {
404 417 fnvlist_add_uint64(config,
405 418 ZPOOL_CONFIG_IS_SPARE, 1ULL);
406 419 }
420 + if (vd->vdev_isspecial)
421 + fnvlist_add_uint64(config,
422 + ZPOOL_CONFIG_IS_SPECIAL, 1ULL);
407 423 if (vd->vdev_islog) {
408 424 fnvlist_add_uint64(config,
409 425 ZPOOL_CONFIG_IS_LOG, 1ULL);
410 426 }
411 427 vd = vd->vdev_top; /* label contains top config */
412 428 } else {
413 429 /*
414 430 * Only add the (potentially large) split information
415 431 * in the mos config, and not in the vdev labels
416 432 */
417 433 if (spa->spa_config_splitting != NULL)
418 434 fnvlist_add_nvlist(config, ZPOOL_CONFIG_SPLIT,
419 435 spa->spa_config_splitting);
420 436 fnvlist_add_boolean(config,
421 437 ZPOOL_CONFIG_HAS_PER_VDEV_ZAPS);
422 438
423 439 config_gen_flags |= VDEV_CONFIG_MOS;
424 440 }
425 441
426 442 /*
427 443 * Add the top-level config. We even add this on pools which
428 444 * don't support holes in the namespace.
429 445 */
430 446 vdev_top_config_generate(spa, config);
431 447
432 448 /*
433 449 * If we're splitting, record the original pool's guid.
434 450 */
435 451 if (spa->spa_config_splitting != NULL &&
|
↓ open down ↓ |
19 lines elided |
↑ open up ↑ |
436 452 nvlist_lookup_uint64(spa->spa_config_splitting,
437 453 ZPOOL_CONFIG_SPLIT_GUID, &split_guid) == 0) {
438 454 fnvlist_add_uint64(config, ZPOOL_CONFIG_SPLIT_GUID,
439 455 split_guid);
440 456 }
441 457
442 458 nvroot = vdev_config_generate(spa, vd, getstats, config_gen_flags);
443 459 fnvlist_add_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, nvroot);
444 460 nvlist_free(nvroot);
445 461
462 + /* If we're getting stats, calculate trim progress from leaf vdevs. */
463 + if (getstats) {
464 + uint64_t prog, rate, start_time, stop_time;
465 +
466 + spa_get_trim_prog(spa, &prog, &rate, &start_time, &stop_time);
467 + fnvlist_add_uint64(config, ZPOOL_CONFIG_TRIM_PROG, prog);
468 + fnvlist_add_uint64(config, ZPOOL_CONFIG_TRIM_RATE, rate);
469 + fnvlist_add_uint64(config, ZPOOL_CONFIG_TRIM_START_TIME,
470 + start_time);
471 + fnvlist_add_uint64(config, ZPOOL_CONFIG_TRIM_STOP_TIME,
472 + stop_time);
473 + }
474 +
446 475 /*
447 476 * Store what's necessary for reading the MOS in the label.
448 477 */
449 478 fnvlist_add_nvlist(config, ZPOOL_CONFIG_FEATURES_FOR_READ,
450 479 spa->spa_label_features);
451 480
452 481 if (getstats && spa_load_state(spa) == SPA_LOAD_NONE) {
453 482 ddt_histogram_t *ddh;
454 483 ddt_stat_t *dds;
455 484 ddt_object_t *ddo;
456 485
457 486 ddh = kmem_zalloc(sizeof (ddt_histogram_t), KM_SLEEP);
458 487 ddt_get_dedup_histogram(spa, ddh);
459 488 fnvlist_add_uint64_array(config,
460 489 ZPOOL_CONFIG_DDT_HISTOGRAM,
461 490 (uint64_t *)ddh, sizeof (*ddh) / sizeof (uint64_t));
462 491 kmem_free(ddh, sizeof (ddt_histogram_t));
463 492
464 493 ddo = kmem_zalloc(sizeof (ddt_object_t), KM_SLEEP);
465 494 ddt_get_dedup_object_stats(spa, ddo);
466 495 fnvlist_add_uint64_array(config,
467 496 ZPOOL_CONFIG_DDT_OBJ_STATS,
468 497 (uint64_t *)ddo, sizeof (*ddo) / sizeof (uint64_t));
469 498 kmem_free(ddo, sizeof (ddt_object_t));
470 499
471 500 dds = kmem_zalloc(sizeof (ddt_stat_t), KM_SLEEP);
472 501 ddt_get_dedup_stats(spa, dds);
473 502 fnvlist_add_uint64_array(config,
474 503 ZPOOL_CONFIG_DDT_STATS,
475 504 (uint64_t *)dds, sizeof (*dds) / sizeof (uint64_t));
476 505 kmem_free(dds, sizeof (ddt_stat_t));
477 506 }
478 507
479 508 if (locked)
480 509 spa_config_exit(spa, SCL_CONFIG | SCL_STATE, FTAG);
481 510
482 511 return (config);
483 512 }
484 513
485 514 /*
486 515 * Update all disk labels, generate a fresh config based on the current
487 516 * in-core state, and sync the global config cache (do not sync the config
488 517 * cache if this is a booting rootpool).
489 518 */
490 519 void
491 520 spa_config_update(spa_t *spa, int what)
492 521 {
493 522 vdev_t *rvd = spa->spa_root_vdev;
494 523 uint64_t txg;
495 524 int c;
496 525
497 526 ASSERT(MUTEX_HELD(&spa_namespace_lock));
498 527
499 528 spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
500 529 txg = spa_last_synced_txg(spa) + 1;
501 530 if (what == SPA_CONFIG_UPDATE_POOL) {
502 531 vdev_config_dirty(rvd);
503 532 } else {
504 533 /*
505 534 * If we have top-level vdevs that were added but have
506 535 * not yet been prepared for allocation, do that now.
507 536 * (It's safe now because the config cache is up to date,
508 537 * so it will be able to translate the new DVAs.)
509 538 * See comments in spa_vdev_add() for full details.
510 539 */
511 540 for (c = 0; c < rvd->vdev_children; c++) {
512 541 vdev_t *tvd = rvd->vdev_child[c];
513 542 if (tvd->vdev_ms_array == 0)
514 543 vdev_metaslab_set_size(tvd);
515 544 vdev_expand(tvd, txg);
516 545 }
517 546 }
|
↓ open down ↓ |
62 lines elided |
↑ open up ↑ |
518 547 spa_config_exit(spa, SCL_ALL, FTAG);
519 548
520 549 /*
521 550 * Wait for the mosconfig to be regenerated and synced.
522 551 */
523 552 txg_wait_synced(spa->spa_dsl_pool, txg);
524 553
525 554 /*
526 555 * Update the global config cache to reflect the new mosconfig.
527 556 */
528 - if (!spa->spa_is_root) {
529 - spa_write_cachefile(spa, B_FALSE,
530 - what != SPA_CONFIG_UPDATE_POOL);
531 - }
557 + if (!spa->spa_is_root)
558 + spa_config_sync(spa, B_FALSE, what != SPA_CONFIG_UPDATE_POOL);
532 559
533 560 if (what == SPA_CONFIG_UPDATE_POOL)
534 561 spa_config_update(spa, SPA_CONFIG_UPDATE_VDEVS);
535 562 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX