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

DAOS-17045 bio: drain inflight health collecting on teardown #15884

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

DAOS-17045 bio: drain inflight health collecting on teardown #15884

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
90 changes: 58 additions & 32 deletions src/bio/bio_recovery.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* (C) Copyright 2018-2024 Intel Corporation.
* (C) Copyright 2025 Hewlett Packard Enterprise Development LP
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
Expand Down Expand Up @@ -148,6 +149,57 @@ bs2bxb(struct bio_blobstore *bbs, struct bio_xs_context *xs_ctxt)
return NULL;
}

static inline int
pause_health_monitor(struct bio_dev_health *bdh)
{
bdh->bdh_stopping = 1;
if (bdh->bdh_inflights > 0)
return 1;

/* Put io channel for health monitor */
if (bdh->bdh_io_channel != NULL) {
spdk_put_io_channel(bdh->bdh_io_channel);
bdh->bdh_io_channel = NULL;
}

/* Close open desc for health monitor */
if (bdh->bdh_desc != NULL) {
spdk_bdev_close(bdh->bdh_desc);
bdh->bdh_desc = NULL;
}

return 0;
}

static inline int
resume_health_monitor(struct bio_bdev *d_bdev, struct bio_dev_health *bdh)
{
int rc;

/* Acquire open desc for health monitor */
if (bdh->bdh_desc == NULL) {
rc = spdk_bdev_open_ext(d_bdev->bb_name, true, bio_bdev_event_cb, NULL,
&bdh->bdh_desc);
if (rc != 0) {
D_ERROR("Failed to open bdev %s, rc:%d\n", d_bdev->bb_name, rc);
return 1;
}
D_ASSERT(bdh->bdh_desc != NULL);
}

/* Get io channel for health monitor */
if (bdh->bdh_io_channel == NULL) {
bdh->bdh_io_channel = spdk_bdev_get_io_channel(bdh->bdh_desc);
if (bdh->bdh_io_channel == NULL) {
D_ERROR("Failed to get health channel for bdev %s\n", d_bdev->bb_name);
return 1;
}
}

bdh->bdh_stopping = 0;
return 0;
}

/*
* Return value: 0: Blobstore is torn down;
* >0: Blobstore teardown is in progress;
Expand Down Expand Up @@ -192,17 +244,9 @@ on_teardown(struct bio_blobstore *bbs)
if (rc)
return rc;

/* Put io channel for health monitor */
if (bdh->bdh_io_channel != NULL) {
spdk_put_io_channel(bdh->bdh_io_channel);
bdh->bdh_io_channel = NULL;
}

/* Close open desc for health monitor */
if (bdh->bdh_desc != NULL) {
spdk_bdev_close(bdh->bdh_desc);
bdh->bdh_desc = NULL;
}
rc = pause_health_monitor(bdh);
if (rc)
return rc;

/*
* Unload the blobstore. The blobstore could be still in loading from
Expand Down Expand Up @@ -346,27 +390,9 @@ on_setup(struct bio_blobstore *bbs)
return 1;

bs_loaded:
/* Acquire open desc for health monitor */
if (bdh->bdh_desc == NULL) {
rc = spdk_bdev_open_ext(d_bdev->bb_name, true,
bio_bdev_event_cb, NULL,
&bdh->bdh_desc);
if (rc != 0) {
D_ERROR("Failed to open bdev %s, for %p, %d\n",
d_bdev->bb_name, bbs, rc);
return 1;
}
D_ASSERT(bdh->bdh_desc != NULL);
}

/* Get io channel for health monitor */
if (bdh->bdh_io_channel == NULL) {
bdh->bdh_io_channel = spdk_bdev_get_io_channel(bdh->bdh_desc);
if (bdh->bdh_io_channel == NULL) {
D_ERROR("Failed to get health channel for %p\n", bbs);
return 1;
}
}
rc = resume_health_monitor(d_bdev, bdh);
if (rc)
return rc;

/*
* It's safe to access xs context array without locking when the
Expand Down
Loading