From owner-svn-src-head@FreeBSD.ORG Sat Jan 22 22:31:55 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DAA61106566B; Sat, 22 Jan 2011 22:31:55 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C99518FC14; Sat, 22 Jan 2011 22:31:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0MMVtdl006580; Sat, 22 Jan 2011 22:31:55 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0MMVthK006578; Sat, 22 Jan 2011 22:31:55 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201101222231.p0MMVthK006578@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Sat, 22 Jan 2011 22:31:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217729 - head/sbin/hastd X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Jan 2011 22:31:55 -0000 Author: pjd Date: Sat Jan 22 22:31:55 2011 New Revision: 217729 URL: http://svn.freebsd.org/changeset/base/217729 Log: - On primary worker reload, update hr_exec field. - Update comment. MFC after: 1 week Modified: head/sbin/hastd/hastd.c Modified: head/sbin/hastd/hastd.c ============================================================================== --- head/sbin/hastd/hastd.c Sat Jan 22 22:18:47 2011 (r217728) +++ head/sbin/hastd/hastd.c Sat Jan 22 22:31:55 2011 (r217729) @@ -306,8 +306,9 @@ hastd_reload(void) * recreating it. * * We do just reload (send SIGHUP to worker process) if we act as - * PRIMARY, but only remote address, replication mode and timeout - * has changed. For those, there is no need to restart worker process. + * PRIMARY, but only if remote address, replication mode, timeout or + * execution path has changed. For those, there is no need to restart + * worker process. * If PRIMARY receives SIGHUP, it will reconnect if remote address or * replication mode has changed or simply set new timeout if only * timeout has changed. @@ -335,6 +336,8 @@ hastd_reload(void) sizeof(cres->hr_remoteaddr)); cres->hr_replication = nres->hr_replication; cres->hr_timeout = nres->hr_timeout; + strlcpy(cres->hr_exec, nres->hr_exec, + sizeof(cres->hr_exec)); if (cres->hr_workerpid != 0) { if (kill(cres->hr_workerpid, SIGHUP) < 0) { pjdlog_errno(LOG_WARNING,