Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Illumos #1949, #1953 

1949 crash during reguid causes stale config
1953 allow and unallow missing from zpool history since removal of pyzfs

Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Matt Ahrens <matt@delphix.com>
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Reviewed by: Bill Pijewski <wdp@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Garrett D'Amore <garrett.damore@gmail.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Steve Gonczi <gonczi@comcast.net>
Approved by: Eric Schrock <eric.schrock@delphix.com>

References:
  https://www.illumos.org/issues/1949
  https://www.illumos.org/issues/1953

Ported by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #665
This commit is contained in:
George Wilson 2012-07-11 13:02:44 -07:00 committed by Brian Behlendorf
parent 3541dc6d02
commit c7f2d69de3
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sys/vdev.h
View File

@ -20,6 +20,7 @@
*/ */
/* /*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012 by Delphix. All rights reserved.
*/ */
#ifndef _SYS_VDEV_H #ifndef _SYS_VDEV_H
@ -48,7 +49,7 @@ extern int zfs_nocacheflush;
extern int vdev_open(vdev_t *); extern int vdev_open(vdev_t *);
extern void vdev_open_children(vdev_t *); extern void vdev_open_children(vdev_t *);
extern boolean_t vdev_uses_zvols(vdev_t *); extern boolean_t vdev_uses_zvols(vdev_t *);
extern int vdev_validate(vdev_t *); extern int vdev_validate(vdev_t *, boolean_t);
extern void vdev_close(vdev_t *); extern void vdev_close(vdev_t *);
extern int vdev_create(vdev_t *, uint64_t txg, boolean_t isreplace); extern int vdev_create(vdev_t *, uint64_t txg, boolean_t isreplace);
extern void vdev_reopen(vdev_t *); extern void vdev_reopen(vdev_t *);

4
lib/libzfs/libzfs_dataset.c
View File

@ -22,7 +22,7 @@
/* /*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2011 by Delphix. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved.
* Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>. * Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
*/ */
@ -4377,7 +4377,7 @@ tryagain:
(void) strlcpy(zc.zc_name, zhp->zfs_name, ZFS_MAXNAMELEN); (void) strlcpy(zc.zc_name, zhp->zfs_name, ZFS_MAXNAMELEN);
if (zfs_ioctl(hdl, ZFS_IOC_GET_FSACL, &zc) != 0) { if (ioctl(hdl->libzfs_fd, ZFS_IOC_GET_FSACL, &zc) != 0) {
(void) snprintf(errbuf, sizeof (errbuf), (void) snprintf(errbuf, sizeof (errbuf),
dgettext(TEXT_DOMAIN, "cannot get permissions on '%s'"), dgettext(TEXT_DOMAIN, "cannot get permissions on '%s'"),
zc.zc_name); zc.zc_name);

2
module/zfs/spa.c
View File

@ -1922,7 +1922,7 @@ spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
*/ */
if (type != SPA_IMPORT_ASSEMBLE) { if (type != SPA_IMPORT_ASSEMBLE) {
spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER); spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
error = vdev_validate(rvd); error = vdev_validate(rvd, mosconfig);
spa_config_exit(spa, SCL_ALL, FTAG); spa_config_exit(spa, SCL_ALL, FTAG);
if (error != 0) if (error != 0)

16
module/zfs/vdev.c
View File

@ -1310,13 +1310,18 @@ vdev_open(vdev_t *vd)
* contents. This needs to be done before vdev_load() so that we don't * contents. This needs to be done before vdev_load() so that we don't
* inadvertently do repair I/Os to the wrong device. * inadvertently do repair I/Os to the wrong device.
* *
* If 'strict' is false ignore the spa guid check. This is necessary because
* if the machine crashed during a re-guid the new guid might have been written
* to all of the vdev labels, but not the cached config. The strict check
* will be performed when the pool is opened again using the mos config.
*
* This function will only return failure if one of the vdevs indicates that it * This function will only return failure if one of the vdevs indicates that it
* has since been destroyed or exported. This is only possible if * has since been destroyed or exported. This is only possible if
* /etc/zfs/zpool.cache was readonly at the time. Otherwise, the vdev state * /etc/zfs/zpool.cache was readonly at the time. Otherwise, the vdev state
* will be updated but the function will return 0. * will be updated but the function will return 0.
*/ */
int int
vdev_validate(vdev_t *vd) vdev_validate(vdev_t *vd, boolean_t strict)
{ {
spa_t *spa = vd->vdev_spa; spa_t *spa = vd->vdev_spa;
nvlist_t *label; nvlist_t *label;
@ -1325,7 +1330,7 @@ vdev_validate(vdev_t *vd)
int c; int c;
for (c = 0; c < vd->vdev_children; c++) for (c = 0; c < vd->vdev_children; c++)
if (vdev_validate(vd->vdev_child[c]) != 0) if (vdev_validate(vd->vdev_child[c], strict) != 0)
return (EBADF); return (EBADF);
/* /*
@ -1355,8 +1360,9 @@ vdev_validate(vdev_t *vd)
return (0); return (0);
} }
if (nvlist_lookup_uint64(label, ZPOOL_CONFIG_POOL_GUID, if (strict && (nvlist_lookup_uint64(label,
&guid) != 0 || guid != spa_guid(spa)) { ZPOOL_CONFIG_POOL_GUID, &guid) != 0 ||
guid != spa_guid(spa))) {
vdev_set_state(vd, B_FALSE, VDEV_STATE_CANT_OPEN, vdev_set_state(vd, B_FALSE, VDEV_STATE_CANT_OPEN,
VDEV_AUX_CORRUPT_DATA); VDEV_AUX_CORRUPT_DATA);
nvlist_free(label); nvlist_free(label);
@ -1519,7 +1525,7 @@ vdev_reopen(vdev_t *vd)
!l2arc_vdev_present(vd)) !l2arc_vdev_present(vd))
l2arc_add_vdev(spa, vd); l2arc_add_vdev(spa, vd);
} else { } else {
(void) vdev_validate(vd); (void) vdev_validate(vd, B_TRUE);
} }
/* /*