git: 689206379f4c - stable/15 - ctld: More consistent error messages

From: Dag-Erling Smørgrav <des_at_FreeBSD.org>
Date: Tue, 02 Jun 2026 16:42:14 UTC
The branch stable/15 has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=689206379f4c419d6340a8dde402f63a236e111b

commit 689206379f4c419d6340a8dde402f63a236e111b
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-05-28 17:22:43 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2026-06-02 16:41:38 +0000

    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
    
    (cherry picked from commit 95fc64cc29fb4cddc7cad093cfa32587a623f560)
---
 usr.sbin/ctld/kernel.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr.sbin/ctld/kernel.cc b/usr.sbin/ctld/kernel.cc
index 6b17ce60ac69..f2bdf53bd3ee 100644
--- a/usr.sbin/ctld/kernel.cc
+++ b/usr.sbin/ctld/kernel.cc
@@ -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");
@@ -496,8 +496,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;
 	}
 
@@ -563,7 +563,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;
 		}