Skip to content

DAOS-17935 control: Remove spdk lockfiles before and after local scan #16769

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

Merged
daltonbohning merged 4 commits into from
Sep 9, 2025
Merged

DAOS-17935 control: Remove spdk lockfiles before and after local scan #16769

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d8f137
DAOS-17935 control: Remove spdk lockfiles before scan or format
tanabarr Aug 5, 2025
5f914d5
move scan cleanup to backend
tanabarr Aug 29, 2025
74719e7
revert changes no longer necessary
tanabarr Sep 3, 2025
bf763c6
Merge remote-tracking branch 'origin/master' into tanabarr/control-sp…
tanabarr Sep 5, 2025
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
29 changes: 26 additions & 3 deletions src/control/server/storage/bdev/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ func spdkLockfileAddrCheckAllowAll(_ string) (bool, error) {
// Skip addresses in block list if present then supply address check function that can detect VMD
// backing device addresses during clean operation. If CleanSpdkLockfilesAny set, all lockfiles
// should be removed.
func (sb *spdkBackend) removeSpdkLockfiles(req storage.BdevPrepareRequest, resp *storage.BdevPrepareResponse) error {
func (sb *spdkBackend) cleanLockfiles(req storage.BdevPrepareRequest, resp *storage.BdevPrepareResponse) error {
var lfAddrCheckFn spdk.LockfileAddrCheckFn

if req.CleanSpdkLockfilesAny {
Expand Down Expand Up @@ -303,7 +303,7 @@ func (sb *spdkBackend) prepare(req storage.BdevPrepareRequest, vmdDetect vmdDete
}
}
if req.CleanSpdkLockfiles {
if err := sb.removeSpdkLockfiles(req, resp); err != nil {
if err := sb.cleanLockfiles(req, resp); err != nil {
return resp, errors.Wrapf(err, "clean spdk lockfiles")
}
}
Expand Down Expand Up @@ -419,14 +419,37 @@ func groomDiscoveredBdevs(reqDevs *hardware.PCIAddressSet, discovered storage.Nv
return out, nil
}

func (sb *spdkBackend) cleanLockfilesQuiet(devAddrs *hardware.PCIAddressSet) {
msg := fmt.Sprintf("spdk backend clean-locks (bindings discover call): for %v",
devAddrs.Strings())
addrCheckFn := createSpdkLockfileAddrCheckFunc(devAddrs)

removed, err := sb.binding.Clean(sb.log, addrCheckFn)
if err != nil {
sb.log.Errorf("%s: %s", msg, err.Error())
return
}
sb.log.Debugf("%s: removed %v", msg, removed)
}

// Scan discovers NVMe controllers accessible by SPDK.
func (sb *spdkBackend) Scan(req storage.BdevScanRequest) (*storage.BdevScanResponse, error) {
needDevs := req.DeviceList.PCIAddressSetPtr()

// Remove SPDK lockfiles for requested addresses before and after scan, requested addresses
// should not be in use by other processes and SPDK will refuse access if they are.
if needDevs.IsEmpty() {
sb.log.Debug("clean spdk lockfiles skipped, zero devices selected")
} else {
sb.cleanLockfilesQuiet(needDevs)
defer sb.cleanLockfilesQuiet(needDevs)
}

sb.log.Debugf("spdk backend scan (bindings discover call): %+v", req)

// Only filter devices if all have a PCI address, avoid validating the presence of emulated
// NVMe devices as they may not exist yet e.g. for SPDK AIO-file the devices are created on
// format.
needDevs := req.DeviceList.PCIAddressSetPtr()
spdkOpts := &spdk.EnvOptions{
PCIAllowList: needDevs,
EnableVMD: req.VMDEnabled,
Expand Down
Loading