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

[Simon Poirier]

[Andreas Hasenack (ahasenack)]

Thanks, this looks good and is a +1.

Two points, for the next ones:
- please separate the d/changelog change into its own commit. It helps tremendously when backporting (cherry-picking) fixes for SRUs (which you might have discovered, since this fix will be SRUed), and also when just wanting to take a peek at what the actual changes are, without d/changelog "noise" :)
- make the MP for the development release of ubuntu against the ubuntu/devel branch, that is always the development release. Today it matches ubuntu/disco-devel.

review: Approve

[Andreas Hasenack (ahasenack)]

Tagged and uploaded

$ git push pkg upload/18.01-0ubuntu7
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 | 264.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/18.01-0ubuntu7 -> upload/18.01-0ubuntu7

$ dput ubuntu ../landscape-client_18.01-0ubuntu7_source.changes
Checking signature on .changes
gpg: ../landscape-client_18.01-0ubuntu7_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../landscape-client_18.01-0ubuntu7.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading landscape-client_18.01-0ubuntu7.dsc: done.
  Uploading landscape-client_18.01-0ubuntu7.debian.tar.xz: done.
  Uploading landscape-client_18.01-0ubuntu7_source.buildinfo: done.
  Uploading landscape-client_18.01-0ubuntu7_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 5d64e8c..c037c70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+landscape-client (18.01-0ubuntu7) disco; 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 (18.01-0ubuntu6) disco; 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..2c57a2c
--- /dev/null
+++ b/debian/patches/mem-usage-1685885.patch
@@ -0,0 +1,30 @@
+Description: Reduce memory usage by unused twisted logs.
+ This initializes the twisted logging to clear its buffer.
+Author: Simon Poirier <[e-mail]>
+Origin: upstream, https://github.com/CanonicalLtd/landscape-client/commit/7f98306e3159e956798b70d2b5fc8c0773373fdd
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1685885
+Last-Update: 2019-02-08
+
+diff --git a/landscape/client/deployment.py b/landscape/client/deployment.py
+index d5ac5aeb..8c2f905e 100644
+--- a/landscape/client/deployment.py
++++ b/landscape/client/deployment.py
+@@ -2,6 +2,7 @@ import os.path
+ import sys
+ 
+ from optparse import SUPPRESS_HELP
++from twisted.logger import globalLogBeginner
+ 
+ from landscape import VERSION
+ from landscape.lib import logging
+@@ -16,6 +17,10 @@ def init_logging(configuration, program_name):
+     logging.init_app_logging(configuration.log_dir, configuration.log_level,
+                              progname=program_name,
+                              quiet=configuration.quiet)
++    # 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)
+ 
+ 
+ def _is_script(filename=sys.argv[0],
diff --git a/debian/patches/series b/debian/patches/series
index 8fe2ee6..79d72dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ release-upgrade-success.patch
 post-upgrade-reboot.patch
 unicode-tags-script.patch
 1616116-resync-loop.patch
+mem-usage-1685885.patch