svn commit: r310173 - in stable/10: lib/libutil usr.sbin/pw

[Alan Somers]

Author: asomers
Date: Fri Dec 16 20:10:55 2016
New Revision: 310173
URL: https://svnweb.freebsd.org/changeset/base/310173

Log:
  MFC r308806
  
  Speed up pw operations that edit /etc/group or /etc/passwd
  
  r285050 fixed a bug in pw that could lead to /etc/passwd or /etc/group
  corruption on power loss. However, it fixed it by opening those files with
  O_SYNC, which is very slow, especially on ZFS. This change replaces O_SYNC
  with appropriately placed fsync()s instead, which is much faster. Using a
  ZFS tmpdir, the time to run pw's kyua tests drops from 245s to 35s.

Modified:
  stable/10/lib/libutil/gr_util.c
  stable/10/lib/libutil/pw_util.c
  stable/10/usr.sbin/pw/grupd.c
  stable/10/usr.sbin/pw/pw_nis.c
  stable/10/usr.sbin/pw/pwupd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libutil/gr_util.c
==============================================================================
--- stable/10/lib/libutil/gr_util.c	Fri Dec 16 20:04:56 2016	(r310172)
+++ stable/10/lib/libutil/gr_util.c	Fri Dec 16 20:10:55 2016	(r310173)
@@ -141,7 +141,7 @@ gr_tmp(int mfd)
 		errno = ENAMETOOLONG;
 		return (-1);
 	}
-	if ((tfd = mkostemp(tempname, O_SYNC)) == -1)
+	if ((tfd = mkostemp(tempname, 0)) == -1)
 		return (-1);
 	if (mfd != -1) {
 		while ((nr = read(mfd, buf, sizeof(buf))) > 0)

Modified: stable/10/lib/libutil/pw_util.c
==============================================================================
--- stable/10/lib/libutil/pw_util.c	Fri Dec 16 20:04:56 2016	(r310172)
+++ stable/10/lib/libutil/pw_util.c	Fri Dec 16 20:10:55 2016	(r310173)
@@ -226,7 +226,7 @@ pw_tmp(int mfd)
 		errno = ENAMETOOLONG;
 		return (-1);
 	}
-	if ((tfd = mkostemp(tempname, O_SYNC)) == -1)
+	if ((tfd = mkostemp(tempname, 0)) == -1)
 		return (-1);
 	if (mfd != -1) {
 		while ((nr = read(mfd, buf, sizeof(buf))) > 0)

Modified: stable/10/usr.sbin/pw/grupd.c
==============================================================================
--- stable/10/usr.sbin/pw/grupd.c	Fri Dec 16 20:04:56 2016	(r310172)
+++ stable/10/usr.sbin/pw/grupd.c	Fri Dec 16 20:10:55 2016	(r310173)
@@ -77,6 +77,7 @@ gr_update(struct group * grp, char const
 		close(tfd);
 		err(1, "gr_copy()");
 	}
+	fsync(tfd);
 	close(tfd);
 	if (gr_mkdb() == -1) {
 		gr_fini();

Modified: stable/10/usr.sbin/pw/pw_nis.c
==============================================================================
--- stable/10/usr.sbin/pw/pw_nis.c	Fri Dec 16 20:04:56 2016	(r310172)
+++ stable/10/usr.sbin/pw/pw_nis.c	Fri Dec 16 20:10:55 2016	(r310173)
@@ -67,6 +67,7 @@ pw_nisupdate(const char * path, struct p
 		close(tfd);
 		err(1, "pw_copy()");
 	}
+	fsync(tfd);
 	close(tfd);
 	if (chmod(pw_tempname(), 0644) == -1)
 		err(1, "chmod()");

Modified: stable/10/usr.sbin/pw/pwupd.c
==============================================================================
--- stable/10/usr.sbin/pw/pwupd.c	Fri Dec 16 20:04:56 2016	(r310172)
+++ stable/10/usr.sbin/pw/pwupd.c	Fri Dec 16 20:10:55 2016	(r310173)
@@ -114,6 +114,7 @@ pw_update(struct passwd * pwd, char cons
 		close(tfd);
 		err(1, "pw_copy()");
 	}
+	fsync(tfd);
 	close(tfd);
 	/*
 	 * in case of deletion of a user, the whole database