Date: Wed, 23 Nov 2022 20:56:25 GMT From: Alan Somers <asomers@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 896282a37f5a - stable/13 - ctld: if adding a target fails, retry it on the next reload Message-ID: <202211232056.2ANKuP5L066032@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=896282a37f5aff6dfdae4b02fc34cd4ef98dd7c6 commit 896282a37f5aff6dfdae4b02fc34cd4ef98dd7c6 Author: Alan Somers <asomers@FreeBSD.org> AuthorDate: 2022-10-12 22:44:09 +0000 Commit: Alan Somers <asomers@FreeBSD.org> CommitDate: 2022-11-23 20:55:41 +0000 ctld: if adding a target fails, retry it on the next reload If the admin creates more CTL ports than kern.cam.ctl.max_ports, then adding some will fail. If he then removes some ports and does "service ctld reload", he would expect that the new ports would get added in the newly-freed port space. But they don't, because ctld assigned them port numbers during their first creation attempts. Fix this bug by removing newly created ports from ctld's internal list if the kernel rejects them for any reason. That way, a subsequent config reload will attempt to add them again, possibly with new port numbers. Sponsored by: Axcient Reviewed by: jhb, mav Differential Revision: https://reviews.freebsd.org/D36974 (cherry picked from commit 15b3e3bb7efcbf7c29ab76e9ea7990c17df790e6) --- usr.sbin/ctld/ctld.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c index 3f4bca632512..7ee381de08a7 100644 --- a/usr.sbin/ctld/ctld.c +++ b/usr.sbin/ctld/ctld.c @@ -2113,7 +2113,7 @@ conf_apply(struct conf *oldconf, struct conf *newconf) /* * Now add new ports or modify existing ones. */ - TAILQ_FOREACH(newport, &newconf->conf_ports, p_next) { + TAILQ_FOREACH_SAFE(newport, &newconf->conf_ports, p_next, tmpport) { if (port_is_dummy(newport)) continue; oldport = port_find(oldconf, newport->p_name); @@ -2130,6 +2130,8 @@ conf_apply(struct conf *oldconf, struct conf *newconf) log_warnx("failed to %s port %s", (oldport == NULL) ? "add" : "update", newport->p_name); + if (oldport == NULL || port_is_dummy(oldport)) + port_delete(newport); /* * XXX: Uncomment after fixing the root cause. *
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202211232056.2ANKuP5L066032>