ctld: More consistent error messages
The error messages ctld emits when it finds a port or LUN it did not create were inconsistent with each other as well as with ctld's other error messages. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D57270
This commit is contained in:
@@ -446,8 +446,8 @@ add_iscsi_port(struct kports &kports, struct conf *conf,
|
||||
const struct cctl_port &port, std::string &name)
|
||||
{
|
||||
if (port.cfiscsi_target.empty()) {
|
||||
log_debugx("CTL port %u \"%s\" wasn't managed by ctld; ",
|
||||
port.port_id, name.c_str());
|
||||
log_debugx("CTL iSCSI port %u \"%s\" is not managed by ctld; "
|
||||
"ignoring", port.port_id, name.c_str());
|
||||
if (!kports.has_port(name)) {
|
||||
if (!kports.add_port(name, port.port_id)) {
|
||||
log_warnx("kports::add_port failed");
|
||||
@@ -498,8 +498,8 @@ add_nvmf_port(struct conf *conf, const struct cctl_port &port,
|
||||
std::string &name)
|
||||
{
|
||||
if (port.nqn.empty() || port.ctld_transport_group_name.empty()) {
|
||||
log_debugx("CTL port %u \"%s\" wasn't managed by ctld; ",
|
||||
port.port_id, name.c_str());
|
||||
log_debugx("CTL NVMeoF port %u \"%s\" is not managed by ctld; "
|
||||
"ignoring", port.port_id, name.c_str());
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -570,7 +570,7 @@ conf_new_from_kernel(struct kports &kports)
|
||||
|
||||
for (const auto &lun : devlist.lun_list) {
|
||||
if (lun.ctld_name.empty()) {
|
||||
log_debugx("CTL lun %ju wasn't managed by ctld; "
|
||||
log_debugx("CTL lun %ju is not managed by ctld; "
|
||||
"ignoring", (uintmax_t)lun.lun_id);
|
||||
continue;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user