Merge ~paelzer/ubuntu/+source/quota:fix-1774431-cosmic into ubuntu/+source/quota:ubuntu/devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Backport of upstream fix, version with the fix not yet released but Bionic is affected.
So pushing it to cosmic and then bionic would fix upgraders that are blocked on this.

Test builds at https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3281

Steps to reproduce (from bug)
sudo apt install rpcbind quota

To let the service start at all one need:
- Add ",usrquota" to your fstab options somewhere
- Add a fake export to /etc/exports like
  /tmp 127.0.0.1
- RPCRQUOTADOPTS="-p 599" in /etc/default/quota
- systemctl restart quotarpc.service

=> check top

[Andreas Hasenack (ahasenack)]

Confirmed that the cpu usage problem is fixed with the new packages. I didn't test quota itself, though.

In terms of the branch, running update-maintainer was missed :)

review: Needs Fixing

[Andreas Hasenack (ahasenack)]

I'm switching this to "approved" because what's needed is just a trivial change, and there is no need to review again because of that.

review: Approve

c4e38ef... by Christian Ehrhardt  on 2018-06-05

update-maintainer

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

Thanks, added the maintainer; tagged and uploaded

diff --git a/debian/changelog b/debian/changelog
index 48323b9..2755e26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+quota (4.04-2ubuntu1) cosmic; urgency=medium
+
+  * d/p/lp-1774431-fix-Listen-on-a-TCP-socket.patch: avoid issues with TCP
+    sockets hogging quota at 100% cpu (LP: #1774431 Can be dropped next
+    release >4.04 as the patch is upstream already).
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 04 Jun 2018 09:13:16 +0200
+
 quota (4.04-2) unstable; urgency=medium
 
   * Bumped Standards-Version to 4.1.3, no changes needed.
diff --git a/debian/control b/debian/control
index 8cb5bbd..2e839b1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: quota
 Section: admin
 Priority: optional
-Maintainer: Michael Meskes <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Michael Meskes <[e-mail]>
 Build-Depends: debhelper (>= 11), gettext, libwrap0-dev,
 	       e2fslibs-dev, po-debconf (>= 0.5.0), libldap2-dev,
 	       quilt (>= 0.46-7), libnl-3-dev, libnl-genl-3-dev, libdbus-1-dev,
diff --git a/debian/patches/lp-1774431-fix-Listen-on-a-TCP-socket.patch b/debian/patches/lp-1774431-fix-Listen-on-a-TCP-socket.patch
new file mode 100644
index 0000000..ffd3d99
--- /dev/null
+++ b/debian/patches/lp-1774431-fix-Listen-on-a-TCP-socket.patch
@@ -0,0 +1,84 @@
+From 31ecd29b3b3f51145fd78f63087c10e9fcadf999 Mon Sep 17 00:00:00 2001
+From: Steve Dickson <[e-mail]>
+Date: Tue, 22 May 2018 12:41:59 +0200
+Subject: [PATCH] Listen on a TCP socket
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+rpc.rquotad spins in libtirpc's rendezvous_request() on accepting TCP
+connections because the polled TCP socket is not listening:
+
+poll([{fd=4, events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=5,
+  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=6,
+  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=7,
+  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}], 4, -1) = 2 ([{fd=5,
+  revents=POLLHUP}, {fd=7, revents=POLLHUP}])
+accept(5, 0x7ffe61698700, [128])        = -1 EINVAL (Invalid argument)
+accept(7, 0x7ffe61698700, [128])        = -1 EINVAL (Invalid argument)
+
+The polled descriptors are:
+
+rpc.rquot 21981 root    4u  IPv4 80449159      0t0      UDP *:rquotad
+rpc.rquot 21981 root    5u  sock      0,9      0t0 80449162 protocol: TCP
+rpc.rquot 21981 root    6u  IPv6 80449165      0t0      UDP *:rquotad
+rpc.rquot 21981 root    7u  sock      0,9      0t0 80449168 protocol: TCPv6
+
+That results into a high CPU usage just after staring rpc.rquotad
+process.
+
+This patch adds a listen() call to svc_create_sock()
+routine which is needed with libtirpc version of svc_tli_create()
+as well as a needed IPv6 setsockopt().
+
+Signed-off-by: Petr Písař <[e-mail]>
+
+Author: Christian Ehrhardt <[e-mail]>
+Original-Author: Steve Dickson <[e-mail]>
+Origin: backport, https://sourceforge.net/p/linuxquota/code/ci/77440bd389425a9a79265f52783e6d39535f199f/
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1774431
+Last-Update: 2018-06-03
+
+---
+ svc_socket.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/svc_socket.c b/svc_socket.c
+index 8a44604..d2e3abf 100644
+--- a/svc_socket.c
++++ b/svc_socket.c
+@@ -118,6 +118,15 @@ static int svc_create_sock(struct addrinfo *ai)
+ 		return -1;
+ 	}
+ 
++	if (ai->ai_family == AF_INET6) {
++		if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY,
++				&optval, sizeof(optval)) < 0) {
++			errstr(_("Cannot set IPv6 socket options: %s\n"), strerror(errno));
++			close(fd);
++			return -1;
++		}
++	}
++
+ 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)) < 0) {
+ 		errstr(_("Cannot set socket options: %s\n"), strerror(errno));
+ 		close(fd);
+@@ -129,6 +138,15 @@ static int svc_create_sock(struct addrinfo *ai)
+ 		close(fd);
+ 		return -1;
+ 	}
++
++	if (ai->ai_protocol == IPPROTO_TCP) {
++		if (listen(fd, SOMAXCONN) < 0) {
++			errstr(_("Cannot listen to address: %s\n"), strerror(errno));
++			close(fd);
++			return -1;
++		}
++	}
++
+ 	return fd;
+ }
+ 
+-- 
+2.14.3
+
diff --git a/debian/patches/series b/debian/patches/series
index dd4a5c4..55ce852 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 editor.diff
 loop.diff
 
+lp-1774431-fix-Listen-on-a-TCP-socket.patch