From owner-svn-src-stable-11@freebsd.org Thu Jul 6 17:34:54 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F010DD8BB29; Thu, 6 Jul 2017 17:34:54 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A32D27865E; Thu, 6 Jul 2017 17:34:54 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v66HYrqE017960; Thu, 6 Jul 2017 17:34:53 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v66HYrai017957; Thu, 6 Jul 2017 17:34:53 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201707061734.v66HYrai017957@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 6 Jul 2017 17:34:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r320747 - in stable/11: cddl/usr.sbin/zfsd sbin/devd sbin/devd/tests X-SVN-Group: stable-11 X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in stable/11: cddl/usr.sbin/zfsd sbin/devd sbin/devd/tests X-SVN-Commit-Revision: 320747 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2017 17:34:55 -0000 Author: asomers Date: Thu Jul 6 17:34:53 2017 New Revision: 320747 URL: https://svnweb.freebsd.org/changeset/base/320747 Log: MFC r320165-r320167 r320165: devd(8): Remove pidfile on shutdown Sponsored by: Spectra Logic Corp r320166: Require devd to be running for its ATF tests to run The ATF tests communicate with the system's running devd PR: 220169 Reported by: gjb Sponsored by: Spectra Logic Corp r320167: zfsd(8): Remove pidfile on shutdown Sponsored by: Spectra Logic Corp Modified: stable/11/cddl/usr.sbin/zfsd/zfsd.cc stable/11/sbin/devd/devd.cc stable/11/sbin/devd/tests/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/usr.sbin/zfsd/zfsd.cc ============================================================================== --- stable/11/cddl/usr.sbin/zfsd/zfsd.cc Thu Jul 6 17:31:38 2017 (r320746) +++ stable/11/cddl/usr.sbin/zfsd/zfsd.cc Thu Jul 6 17:34:53 2017 (r320747) @@ -437,7 +437,7 @@ void ZfsDaemon::ClosePIDFile() { if (s_pidFH != NULL) - pidfile_close(s_pidFH); + pidfile_remove(s_pidFH); } void Modified: stable/11/sbin/devd/devd.cc ============================================================================== --- stable/11/sbin/devd/devd.cc Thu Jul 6 17:31:38 2017 (r320746) +++ stable/11/sbin/devd/devd.cc Thu Jul 6 17:34:53 2017 (r320747) @@ -1085,6 +1085,7 @@ event_loop(void) if (FD_ISSET(seqpacket_fd, &fds)) new_client(seqpacket_fd, SOCK_SEQPACKET); } + cfg.remove_pidfile(); close(seqpacket_fd); close(stream_fd); close(fd); Modified: stable/11/sbin/devd/tests/Makefile ============================================================================== --- stable/11/sbin/devd/tests/Makefile Thu Jul 6 17:31:38 2017 (r320746) +++ stable/11/sbin/devd/tests/Makefile Thu Jul 6 17:34:53 2017 (r320747) @@ -1,7 +1,8 @@ # $FreeBSD$ ATF_TESTS_C= client_test -TEST_METADATA.client_test= required_programs="devd" +TEST_METADATA.client_test= required_files="/var/run/devd.pid" +TEST_METADATA.client_test+= required_programs="devd" TEST_METADATA.client_test+= required_user="root" TEST_METADATA.client_test+= timeout=15