Merge ~simpoir/ubuntu/+source/landscape-client:xenial-mem-usage-1685885 into ubuntu/+source/landscape-client:ubuntu/xenial-devel

[Simon Poirier]

[Andreas Hasenack (ahasenack)]

Thanks. Small changes inline, since this time the patch had to be backported.

review: Needs Fixing

[Andreas Hasenack (ahasenack)]

Looks good, thanks.

- backported patch, since the xenial version of landscape-client is much older
- dep3 headers ok
- changelog version for an SRU ok
- SRU template filled in

+1

For the next one, please separate the d/changelog change into its own commit. This makes it easier to compare the changes among different releases and allows for easy cherry-picking.

review: Approve

[Andreas Hasenack (ahasenack)]

Tagged and uploaded.

$ git push pkg upload/16.03-0ubuntu2.16.04.6
Enumerating objects: 13, done.
Counting objects: 100% (13/13), done.
Delta compression using up to 4 threads
Compressing objects: 100% (8/8), done.
Writing objects: 100% (8/8), 1.55 KiB | 226.00 KiB/s, done.
Total 8 (delta 5), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/landscape-client
 * [new tag] upload/16.03-0ubuntu2.16.04.6 -> upload/16.03-0ubuntu2.16.04.6

$ dput ubuntu ../landscape-client_16.03-0ubuntu2.16.04.6_source.changes
Checking signature on .changes
gpg: ../landscape-client_16.03-0ubuntu2.16.04.6_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../landscape-client_16.03-0ubuntu2.16.04.6.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading landscape-client_16.03-0ubuntu2.16.04.6.dsc: done.
  Uploading landscape-client_16.03-0ubuntu2.16.04.6.debian.tar.xz: done.
  Uploading landscape-client_16.03-0ubuntu2.16.04.6_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index fd00c5a..fe8549b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+landscape-client (16.03-0ubuntu2.16.04.6) xenial; urgency=medium
+
+  * debian/patches/mem-usage-1685885.patch: Reduce memory usage by
+    unused twisted logs. (LP: #1685885)
+
+ -- Simon Poirier <[e-mail]>  Fri, 08 Feb 2019 12:02:17 -0500
+
 landscape-client (16.03-0ubuntu2.16.04.5) xenial; urgency=medium
 
   * debian/patches/nutanix-kvm.patch: Update vm_info.py to include Nutanix
diff --git a/debian/patches/mem-usage-1685885.patch b/debian/patches/mem-usage-1685885.patch
new file mode 100644
index 0000000..f5dcc15
--- /dev/null
+++ b/debian/patches/mem-usage-1685885.patch
@@ -0,0 +1,28 @@
+Description: Reduce memory usage by unused twisted logs.
+ This initializes the twisted logging to clear its buffer.
+Author: Simon Poirier <[e-mail]>
+Origin: backport, https://github.com/CanonicalLtd/landscape-client/commit/7f98306e3159e956798b70d2b5fc8c0773373fdd
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1685885
+Last-Update: 2019-02-12
+
+--- a/landscape/deployment.py
++++ b/landscape/deployment.py
+@@ -7,6 +7,7 @@
+                      FileHandler, StreamHandler, Formatter)
+ 
+ from optparse import OptionParser, SUPPRESS_HELP
++from twisted.logger import globalLogBeginner
+ 
+ from landscape import VERSION
+ from landscape.lib.persist import Persist
+@@ -29,6 +30,10 @@
+         format = ("%(asctime)s %(levelname)-8s [%(threadName)-10s] "
+                   "%(message)s")
+         handler.setFormatter(Formatter(format))
++    # Initialize twisted logging, even if we don't explicitly use it,
++    # because of leaky logs https://twistedmatrix.com/trac/ticket/8164
++    globalLogBeginner.beginLoggingTo(
++        [lambda _: None], redirectStandardIO=False, discardBuffer=True)
+ 
+ 
+ class ConfigSpecOptionParser(OptionParser):
diff --git a/debian/patches/series b/debian/patches/series
index acc9db8..0097168 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ nutanix-kvm.patch
 release-upgrade-success.patch
 post-upgrade-reboot.patch
 1616116-resync-loop.patch
+mem-usage-1685885.patch