Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added logs to help root-cause the occasional failure in vdev removal … #5

Merged
merged 1 commit into from
Sep 17, 2021
Merged

added logs to help root-cause the occasional failure in vdev removal … #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion module/os/windows/zfs/vdev_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,10 @@ vdev_file_open(vdev_t *vd, uint64_t *psize, uint64_t *max_psize,
char *vdev_path = NULL;
uint8_t *FileName = NULL;

dprintf("vdev_file_open %p\n", vd->vdev_tsd);
TraceEvent(4, "vdev_file_open %p, vdev_path=%s, vdev_phypath=%s\n",
vd->vdev_tsd, vd->vdev_path ? vd->vdev_path : "",
vd->vdev_physpath ? vd->vdev_physpath : "");

/* Rotational optimizations only make sense on block devices */
vd->vdev_nonrot = B_TRUE;

Expand Down
7 changes: 7 additions & 0 deletions module/zfs/spa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7691,6 +7691,13 @@ spa_vdev_split_mirror(spa_t *spa, char *newname, nvlist_t *config,
vml[c]->vdev_top->vdev_ms_shift) == 0);
VERIFY(nvlist_add_uint64(child[c], ZPOOL_CONFIG_ASIZE,
vml[c]->vdev_top->vdev_asize) == 0);

TraceEvent(4, "%s:%d:setting the ashift value in nvlist ashift:%d, vdev_id:%d, vdev_guid:%llu, vdev_path:%s, vdev_physpath:%s\n",
__func__, __LINE__, vml[c]->vdev_top->vdev_ashift,
vml[c]->vdev_top->vdev_id, vml[c]->vdev_top->vdev_guid,
vml[c]->vdev_top->vdev_path ? vml[c]->vdev_top->vdev_path : "",
vml[c]->vdev_top->vdev_physpath ? vml[c]->vdev_top->vdev_physpath : "");

VERIFY(nvlist_add_uint64(child[c], ZPOOL_CONFIG_ASHIFT,
vml[c]->vdev_top->vdev_ashift) == 0);

Expand Down
28 changes: 26 additions & 2 deletions module/zfs/vdev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,11 @@ vdev_lookup_by_guid(vdev_t *vd, uint64_t guid)
vdev_t *mvd;

if (vd->vdev_guid == guid) {
dprintf("%s:%d: vd->vdev_guid = %llu. Returning 0x%p\n",
__func__, __LINE__, vd->vdev_guid, vd);
dprintf("%s:%d: vd->vdev_guid = %llu, vdev_path = %s, vdev_physpath = %s, Returning 0x%p\n",
__func__, __LINE__, vd->vdev_guid,
vd->vdev_path ? vd->vdev_path : "",
vd->vdev_physpath ? vd->vdev_physpath : "", vd);

return (vd);
}

Expand Down Expand Up @@ -859,6 +862,10 @@ vdev_alloc(spa_t *spa, vdev_t **vdp, nvlist_t *nv, vdev_t *parent, uint_t id,
* Get the alignment requirement.
*/
(void) nvlist_lookup_uint64(nv, ZPOOL_CONFIG_ASHIFT, &vd->vdev_ashift);
TraceEvent(4, "%s:%d:Getting the vdev ashift value from nvlist and set in vdev_ashift:%d, vdev_id:%d, vdev_guid:%llu, vdev_path:%s, vdev_physpath:%s\n",
__func__, __LINE__, vd->vdev_ashift, vd->vdev_id, vd->vdev_guid,
vd->vdev_path ? vd->vdev_path : "",
vd->vdev_physpath ? vd->vdev_physpath : "");

/*
* Retrieve the vdev creation time.
Expand Down Expand Up @@ -1393,11 +1400,23 @@ vdev_metaslab_group_create(vdev_t *vd)
*/
if (vd->vdev_top == vd && vd->vdev_ashift != 0 &&
mc == spa_normal_class(spa) && vd->vdev_aux == NULL) {
TraceEvent(4, "%s:%d:Before modifying vdev_ashift= %d, vdev_path=%s, vdev_phypath=%s, spa_min_ashift = %d, spa_max_ashift=%d\n",
__func__, __LINE__, vd->vdev_ashift,
vd->vdev_path ? vd->vdev_path : "",
vd->vdev_physpath ? vd->vdev_physpath : "",
spa->spa_min_ashift, spa->spa_max_ashift);

if (vd->vdev_ashift > spa->spa_max_ashift)
spa->spa_max_ashift = vd->vdev_ashift;
if (vd->vdev_ashift < spa->spa_min_ashift)
spa->spa_min_ashift = vd->vdev_ashift;

TraceEvent(4, "%s:%d:After modifying vdev_ashift= %d, vdev_path=%s, vdev_phypath=%s, spa_min_ashift = %d, spa_max_ashift=%d\n",
__func__, __LINE__, vd->vdev_ashift,
vd->vdev_path ? vd->vdev_path : "",
vd->vdev_physpath ? vd->vdev_physpath : "",
spa->spa_min_ashift, spa->spa_max_ashift);

uint64_t min_alloc = vdev_get_min_alloc(vd);
if (min_alloc < spa->spa_min_alloc)
spa->spa_min_alloc = min_alloc;
Expand Down Expand Up @@ -2081,6 +2100,11 @@ vdev_open(vdev_t *vd)
*/
if (vd->vdev_ashift == 0) {
vd->vdev_ashift = vd->vdev_logical_ashift;
TraceEvent(4, "%s:%d: Setting vdev_ashift=%d, vdev_path=%s, vdev_physpath=%s, vdev_guid=%llu\n",
__func__, __LINE__, vd->vdev_ashift,
vd->vdev_path ? vd->vdev_path : "",
vd->vdev_physpath ? vd->vdev_physpath : "",
vd->vdev_guid);

if (vd->vdev_logical_ashift > ASHIFT_MAX) {
vdev_set_state(vd, B_TRUE, VDEV_STATE_CANT_OPEN,
Expand Down
8 changes: 8 additions & 0 deletions module/zfs/vdev_label.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,14 @@ vdev_config_generate(spa_t *spa, vdev_t *vd, boolean_t getstats,
fnvlist_add_uint64(nv, ZPOOL_CONFIG_METASLAB_SHIFT,
vd->vdev_ms_shift);
fnvlist_add_uint64(nv, ZPOOL_CONFIG_ASHIFT, vd->vdev_ashift);

TraceEvent(4, "%s:%d:Setting vdev ashift into nvlist, vdev_ashift= %d, vdev_id=%d, vdev_guid=%llu, vdev_path=%s, vdev_physpath=%s, vdev_isl2cache=%d, vdev_islog=%d, vdev_isspare=%d, vdev_spa=0x%p\n",
__func__, __LINE__, vd->vdev_ashift, vd->vdev_id,
vd->vdev_guid, vd->vdev_path ? vd->vdev_path : "",
vd->vdev_physpath ? vd->vdev_physpath : "",
vd->vdev_isl2cache, vd->vdev_islog, vd->vdev_isspare,
vd->vdev_spa);

fnvlist_add_uint64(nv, ZPOOL_CONFIG_ASIZE,
vd->vdev_asize);
fnvlist_add_uint64(nv, ZPOOL_CONFIG_IS_LOG, vd->vdev_islog);
Expand Down
27 changes: 23 additions & 4 deletions module/zfs/vdev_removal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1864,7 +1864,10 @@ spa_vdev_remove_log(vdev_t *vd, uint64_t *txg)
spa_t *spa = vd->vdev_spa;
int error = 0;

dprintf("%s:%d: vd = 0x%p, txg = 0x%p\n", __func__, __LINE__, vd, txg);
TraceEvent(4, "%s:%d: vd = 0x%p,vdevpath=%s, vdevphypath=%s, vdevguid=%llu, txg = 0x%p\n",
__func__, __LINE__, vd, vd->vdev_path ? vd->vdev_path : "",
vd->vdev_physpath ? vd->vdev_physpath : "", vd->vdev_guid, txg);

ASSERT(vd->vdev_islog);
ASSERT(vd == vd->vdev_top);
ASSERT3P(vd->vdev_log_mg, ==, NULL);
Expand Down Expand Up @@ -2041,11 +2044,23 @@ spa_vdev_remove_top_check(vdev_t *vd)
if (!vdev_readable(vd))
return (SET_ERROR(EIO));

TraceEvent(4, "%s:%d:spa->spa_max_ashift = %d, spa_min_ashift = %d, vdev_ashift= %d, vdev_id=%d, vdev_guid=%llu, vdev_path=%s, vdev_physpath=%s, vdev_isl2cache=%d, vdev_islog=%d, vdev_isspare=%d, vdev_spa=0x%p\n",
__func__, __LINE__, spa->spa_max_ashift, spa->spa_min_ashift,
vd->vdev_ashift, vd->vdev_id, vd->vdev_guid,
vd->vdev_path ? vd->vdev_path : "",
vd->vdev_physpath ? vd->vdev_physpath : "", vd->vdev_isl2cache,
vd->vdev_islog, vd->vdev_isspare, vd->vdev_spa);

/*
* All vdevs in normal class must have the same ashift.
*/
if (spa->spa_max_ashift != spa->spa_min_ashift)
if (spa->spa_max_ashift != spa->spa_min_ashift) {
dprintf("%s:%d: spa->spa_max_ashift = %d, spa->spa_min_ashift = %d. Returning, error %d\n",
__func__, __LINE__, spa->spa_max_ashift,
spa->spa_min_ashift, EINVAL);

return (SET_ERROR(EINVAL));
}

/*
* A removed special/dedup vdev must have same ashift as normal class.
Expand Down Expand Up @@ -2121,7 +2136,11 @@ spa_vdev_remove_top(vdev_t *vd, uint64_t *txg)
*/
error = spa_vdev_remove_top_check(vd);
if (error != 0) {
dprintf("%s:%d: Returning %d\n", __func__, __LINE__, error);
dprintf("%s:%d: vdev_path=%s, vdev_physpath=%s, vdev_guid=%llu, Returning %d\n",
__func__, __LINE__, vd->vdev_path ? vd->vdev_path : "",
vd->vdev_physpath ? vd->vdev_physpath : "",
vd->vdev_guid, error);

return (error);
}
/*
Expand Down Expand Up @@ -2342,7 +2361,7 @@ spa_vdev_remove(spa_t *spa, uint64_t guid, boolean_t unspare)
if (ev != NULL)
spa_event_post(ev);

dprintf("%s:%d: Returning 0\n", __func__, __LINE__);
dprintf("%s:%d: Returning %d\n", __func__, __LINE__, error);
return (error);
}

Expand Down
8 changes: 8 additions & 0 deletions module/zfs/zfs_ioctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1883,6 +1883,8 @@ zfs_ioc_vdev_add(zfs_cmd_t *zc)
int error;
nvlist_t *config;

TraceEvent(4, "ZFSin: zfs_ioc_vdev_add\n");

error = spa_open(zc->zc_name, &spa, FTAG);
if (error != 0)
return (error);
Expand Down Expand Up @@ -1910,6 +1912,9 @@ zfs_ioc_vdev_remove(zfs_cmd_t *zc)
spa_t *spa;
int error;

TraceEvent(4, "%s:%d:zc->zc_name= %s\n", __func__, __LINE__,
zc->zc_name);

error = spa_open(zc->zc_name, &spa, FTAG);
if (error != 0) {
dprintf("%s:%d: Returning %d\n", __func__, __LINE__, error);
Expand All @@ -1918,6 +1923,9 @@ zfs_ioc_vdev_remove(zfs_cmd_t *zc)
if (zc->zc_cookie != 0) {
error = spa_vdev_remove_cancel(spa);
} else {
TraceEvent(4, "%s:%d:calling spa_vdev_remove fn for zc->zc_name= %s, zc->zc_guid=%llu\n",
__func__, __LINE__, zc->zc_name, zc->zc_guid);

error = spa_vdev_remove(spa, zc->zc_guid, B_FALSE);
}
spa_close(spa, FTAG);
Expand Down