svn commit: r320747 - in stable/11: cddl/usr.sbin/zfsd sbin/devd sbin/devd/tests

[Alan Somers]

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