Skip to content

fix: adapt to new libnvme nvme.ctrl() dict-based constructor #487

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
martin-belanger merged 1 commit into from
Apr 21, 2026
Merged

fix: adapt to new libnvme nvme.ctrl() dict-based constructor #487

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
43 changes: 20 additions & 23 deletions staslib/ctrl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,24 @@ def _on_ctrl_removed(self, udev_obj):
self._retry_connect_tmr.start(self.FAST_CONNECT_RETRY_PERIOD_SEC)

def _get_cfg(self):
'''Get configuration parameters. These may either come from the [Global]
section or from a "controller" entry in the configuration file. A
definition found in a "controller" entry overrides the same definition
found in the [Global] section.
'''Get all parameters needed to create and connect an nvme.ctrl object.
Transport ID parameters are included directly. Fabrics config parameters
may come from the [Global] section or from a "controller" entry in the
configuration file; a "controller" entry overrides the [Global] section.
'''
cfg = {}
service_conf = conf.SvcConf()
cfg = {
'subsysnqn': self.tid.subsysnqn,
'transport': self.tid.transport,
'traddr': self.tid.traddr,
}
if self.tid.trsvcid:
cfg['trsvcid'] = self.tid.trsvcid
if self.tid.host_traddr:
cfg['host_traddr'] = self.tid.host_traddr
if self.tid.host_iface and not service_conf.ignore_iface and self._nvme_options.host_iface_supp:
cfg['host_iface'] = self.tid.host_iface

for option, keyword in (
('kato', 'keep_alive_tmo'),
('queue-size', 'queue_size'),
Expand All @@ -206,21 +217,8 @@ def _get_cfg(self):
return cfg

def _do_connect(self):
service_conf = conf.SvcConf()
host_iface = (
self.tid.host_iface
if (self.tid.host_iface and not service_conf.ignore_iface and self._nvme_options.host_iface_supp)
else None
)
self._ctrl = nvme.ctrl(
self._root,
subsysnqn=self.tid.subsysnqn,
transport=self.tid.transport,
traddr=self.tid.traddr,
trsvcid=self.tid.trsvcid if self.tid.trsvcid else None,
host_traddr=self.tid.host_traddr if self.tid.host_traddr else None,
host_iface=host_iface,
)
cfg = self._get_cfg()
self._ctrl = nvme.ctrl(self._root, cfg)

self._ctrl.discovery_ctrl = self._discovery_ctrl

Expand All @@ -238,7 +236,7 @@ def _do_connect(self):
# This is used for bidirectional authentication
dhchap_ctrl_key = self.tid.cfg.get('dhchap-ctrl-secret')
if dhchap_ctrl_key and self._nvme_options.dhchap_ctrlkey_supp:
self._ctrl.dhchap_key = dhchap_ctrl_key
self._ctrl.dhchap_ctrl_key = dhchap_ctrl_key

# Audit existing nvme devices. If we find a match, then
# we'll just borrow that device instead of creating a new one.
Expand All @@ -253,12 +251,11 @@ def _do_connect(self):
self._on_connect_success, self._on_connect_fail, self._ctrl.init, self._host, int(udev_obj.sys_number)
)
else:
cfg = self._get_cfg()
logging.debug(
'Controller._do_connect() - %s Connecting to nvme control with cfg=%s', self.id, cfg
)
self._connect_op = gutil.AsyncTask(
self._on_connect_success, self._on_connect_fail, self._ctrl.connect, self._host, cfg
self._on_connect_success, self._on_connect_fail, self._ctrl.connect, self._host
)

self._connect_op.run_async()
Expand Down
Loading