From nobody Thu Nov 05 15:45:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jL67z32VDz70FQR for ; Thu, 05 Nov 2026 15:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jL67y6JGjz4TTB for ; Thu, 05 Nov 2026 15:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793893502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XTuC/4kuJbsMt5ZP/qbga63VImrWI8dP4sIqD+3hj4s=; b=XPBxM/PDTzc9iLUaQKS3pqr2NMVNr50Y0KZc3aPTYOdCkxCDtR7E8IyZVY5fCOKDRV+ECp T3l66wGDQ+tZq5Bw3DseonLV4hHkK5B8Qdi44+KIjDInxToiXUwTgmd7toE/nLpyuySqZn HijaU97Oz/VvpDIyT0mwpTuO58+cx7S+JPQLeecwmcs494+pYwAFOnslrRvxQctwNaxBUb sny1HgjCALkbg8iTIgV7ms7SbiHlwt3M/S2OUP4UTcyf7Qt0GvAyfj/ABdfygEtLc1shW+ B0EKjkZ9a/UXfw4HNH9WmQiPwQCskH9y9icPj5HrBaPQwshW+lQnjYtuqLTnBQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793893502; b=WcNAU+KtJEv36nXy0JuCNibBNKCbHFcHgZ3FlZq9Hbw8b/i2V7mUeE7EiwXcWKwDH8FKqY Cts3ItpDN4Tcs1pNxSqib2i3iOYUgf1TKGB45uvugCuIsZ2X0+5mB6ufZu3qQGwql+hdnR ivlxK7G9X0o4ET50cD55PS/3KDLpZ+PAOOjJHMJJfBGOuwawJWmWwJO33VNVWPHzMMVGZq L5IDBkqFYRYERXxS368q9VSgRFfORwgvYsE67LapZQimzPSbMcroLg9/AcZqytV1oA15Em Td93cltIFk3hMYmwhsy7t9XKG02e6nT50UrjHf7kPcz+GTjWqwPGswO2yFIp7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793893502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XTuC/4kuJbsMt5ZP/qbga63VImrWI8dP4sIqD+3hj4s=; b=CxfOzGNaVagYPCzf+oPrtQNqTqwx1jhG4LOv06ekIGLpbkZDQcQHAmMjA+a4O75R0/x6On JXGdpdQlYTcmrufGoc1J+evkX7V8mXsbb6taDfcX/8Lrtwtq8h6yY9F8FXztbzn4sowYrI M29C6RmNEozwroulfb5LUpA5wWkttN5Na6vr9WHYbjA6w+7AAoMUmcU2Ls1X5Irn/5E4w/ m0GLf/TWjQq49iCp4YN4LoLzO7HC3SOogBvXsH5BtJkbTdhUV+u1Y0OXvailOAy4cFtzW3 cF/OR88KhhIJagxxr/MSlvuWLoP5uJHV0siIIfomPdZUBgFBkcnplFz6o3o3GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jL67y5y5xzxFQ for ; Thu, 05 Nov 2026 15:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27be5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 15:45:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 4478c54362b1 - stable/14 - hastd: Add a stop control message List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4478c54362b10e07479456db96bee6e6d553715f Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 15:45:02 +0000 Message-Id: <6aeca47e.27be5.b8618c9@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4478c54362b10e07479456db96bee6e6d553715f commit 4478c54362b10e07479456db96bee6e6d553715f Author: Dag-Erling Smørgrav AuthorDate: 2026-09-05 15:44:09 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-05 15:44:51 +0000 hastd: Add a stop control message Add a stop control message which causes hastd to clean up and terminate. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D59344 (cherry picked from commit 7dfadd78ba3c4608c3631fb5008de77ea1e29e88) --- sbin/hastctl/hastctl.c | 14 ++++++++++++++ sbin/hastd/control.c | 17 +++++++++++++++++ sbin/hastd/hast.h | 1 + sbin/hastd/hastd.c | 12 ++++++++---- 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/sbin/hastctl/hastctl.c b/sbin/hastctl/hastctl.c index 3375723b40fd..6a056a01003e 100644 --- a/sbin/hastctl/hastctl.c +++ b/sbin/hastctl/hastctl.c @@ -60,6 +60,7 @@ enum { CMD_ROLE, CMD_STATUS, CMD_DUMP, + CMD_STOP, CMD_LIST }; @@ -431,6 +432,9 @@ main(int argc, char *argv[]) } else if (strcmp(argv[1], "dump") == 0) { cmd = CMD_DUMP; optstr = "c:dh"; + } else if (strcmp(argv[1], "stop") == 0) { + cmd = CMD_STOP; + optstr = "c:dh"; } else usage(); @@ -525,6 +529,13 @@ main(int argc, char *argv[]) nv_add_string(nv, argv[ii], "resource%d", ii); } break; + case CMD_STOP: + /* Stop hastd. */ + if (argc > 0) + usage(); + nv = nv_alloc(); + nv_add_uint8(nv, HASTCTL_CMD_STOP, "cmd"); + break; default: PJDLOG_ABORT("Impossible command!"); } @@ -575,6 +586,9 @@ main(int argc, char *argv[]) case CMD_STATUS: error = control_status(nv); break; + case CMD_STOP: + error = 0; + break; default: PJDLOG_ABORT("Impossible command!"); } diff --git a/sbin/hastd/control.c b/sbin/hastd/control.c index 48171fde9053..570505440c39 100644 --- a/sbin/hastd/control.c +++ b/sbin/hastd/control.c @@ -301,6 +301,15 @@ control_status(struct hastd_config *cfg, struct nv *nvout, control_status_worker(res, nvout, no); } +static void +control_stop(struct hastd_config *cfg, struct nv *nvout) +{ + pjdlog_info("Stop message received."); + (void)cfg; + (void)nvout; + sigexit_received = true; +} + void control_handle(struct hastd_config *cfg) { @@ -342,6 +351,14 @@ control_handle(struct hastd_config *cfg) error = 0; + /* The stop command does not expect any arguments. */ + if (cmd == HASTCTL_CMD_STOP) { + control_stop(cfg, nvout); + if (nv_error(nvout) != 0) + goto close; + goto fail; + } + str = nv_get_string(nvin, "resource0"); if (str == NULL) { pjdlog_error("Control header is missing 'resource0' field."); diff --git a/sbin/hastd/hast.h b/sbin/hastd/hast.h index d0f9dd874c56..a91993fc398e 100644 --- a/sbin/hastd/hast.h +++ b/sbin/hastd/hast.h @@ -66,6 +66,7 @@ #define HASTCTL_CMD_UNKNOWN 0 #define HASTCTL_CMD_SETROLE 1 #define HASTCTL_CMD_STATUS 2 +#define HASTCTL_CMD_STOP 3 #define HAST_ROLE_UNDEF 0 #define HAST_ROLE_INIT 1 diff --git a/sbin/hastd/hastd.c b/sbin/hastd/hastd.c index f303f277e0ad..aa8328c0b041 100644 --- a/sbin/hastd/hastd.c +++ b/sbin/hastd/hastd.c @@ -725,7 +725,6 @@ terminate_workers(void) { struct hast_resource *res; - pjdlog_info("Termination signal received, exiting."); TAILQ_FOREACH(res, &cfg->hc_resources, hr_next) { if (res->hr_workerpid == 0) continue; @@ -1045,10 +1044,8 @@ check_signals(void) switch (signo) { case SIGINT: case SIGTERM: + pjdlog_info("Termination signal received."); sigexit_received = true; - terminate_workers(); - proto_close(cfg->hc_controlconn); - exit(EX_OK); break; case SIGCHLD: child_exit(); @@ -1078,6 +1075,8 @@ main_loop(void) for (;;) { check_signals(); + if (sigexit_received) + break; /* Setup descriptors for select(2). */ FD_ZERO(&rfds); @@ -1136,6 +1135,8 @@ main_loop(void) * info about terminated workers in the meantime. */ check_signals(); + if (sigexit_received) + break; if (FD_ISSET(proto_descriptor(cfg->hc_controlconn), &rfds)) control_handle(cfg); @@ -1171,6 +1172,9 @@ main_loop(void) } } } + terminate_workers(); + proto_close(cfg->hc_controlconn); + exit(EX_OK); } static void