systemd.debdiff

diff -Nru systemd-229/debian/changelog systemd-229/debian/changelog
--- systemd-229/debian/changelog	2017-10-27 09:43:14.000000000 +0000
+++ systemd-229/debian/changelog	2017-11-16 23:38:35.000000000 +0000
@@ -1,3 +1,9 @@
+systemd (229-4ubuntu22) UNRELEASED; urgency=medium
+
+  * systemd-journald: don't reduce BurstRateLimit when disk space is low
+
+ -- Ubuntu <[email protected]>  Thu, 16 Nov 2017 23:37:46 +0000
+
 systemd (229-4ubuntu21) xenial; urgency=medium
 
   * networkd: do not uncoditionally apply NOARP.
diff -Nru systemd-229/debian/patches/Fix-journald-rate-limit-with-low-disk-space.patch systemd-229/debian/patches/Fix-journald-rate-limit-with-low-disk-space.patch
--- systemd-229/debian/patches/Fix-journald-rate-limit-with-low-disk-space.patch	1970-01-01 00:00:00.000000000 +0000
+++ systemd-229/debian/patches/Fix-journald-rate-limit-with-low-disk-space.patch	2017-11-16 23:30:41.000000000 +0000
@@ -0,0 +1,40 @@
+From eeb084806be1cc7f579d61634fe7b9b3dd5b3df9 Mon Sep 17 00:00:00 2001
+From: HATAYAMA Daisuke <[email protected]>
+Date: Tue, 27 Sep 2016 00:36:20 +0900
+Subject: [PATCH] journald,ratelimit: fix wrong calculation of burst_modulate()
+ (#4218)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch fixes wrong calculation of burst_modulate(), which now calculates
+the values smaller than really expected ones if available disk space is
+strictly more than 1MB.
+
+In particular, if available disk space is strictly more than 1MB and strictly
+less than 16MB, the resulted value becomes smaller than its original one.
+
+>>> (math.log2(1*1024**2)-16) / 4
+1.0
+>>> (math.log2(16*1024**2)-16) / 4
+2.0
+>>> (math.log2(256*1024**2)-16) / 4
+3.0
+→ This matches the comment in the function.
+---
+ src/journal/journald-rate-limit.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/journal/journald-rate-limit.c b/src/journal/journald-rate-limit.c
+index fce799a6ce..d30bf92cec 100644
+--- a/src/journal/journald-rate-limit.c
++++ b/src/journal/journald-rate-limit.c
+@@ -190,7 +190,7 @@ static unsigned burst_modulate(unsigned burst, uint64_t available) {
+         if (k <= 20)
+                 return burst;
+ 
+-        burst = (burst * (k-20)) / 4;
++        burst = (burst * (k-16)) / 4;
+ 
+         /*
+          * Example:
diff -Nru systemd-229/debian/patches/series systemd-229/debian/patches/series
--- systemd-229/debian/patches/series	2017-10-27 08:19:36.000000000 +0000
+++ systemd-229/debian/patches/series	2017-11-16 23:34:57.000000000 +0000
@@ -63,6 +63,7 @@
 networkd-bond-support-primary-slave-and-active-slave-4873.patch
 networkd-do-not-set-NOARP-unconditionally-3891.patch
 networkd-fix-size-of-MTUBytes-so-that-it-does-not-overwri.patch
+Fix-journald-rate-limit-with-low-disk-space.patch
 
 ## Debian specific patches
 Add-back-support-for-Debian-specific-config-files.patch