Merge ~simpoir/ubuntu/+source/landscape-client:groovy-uncleaned-lockfiles into ubuntu/+source/landscape-client:ubuntu/groovy-devel

[Simon Poirier]

diff --git a/debian/changelog b/debian/changelog
index 7cd0974..c7feb18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+landscape-client (19.12-0ubuntu6) groovy; urgency=medium
+
+  * d/p/0003-clean-publisher-shutdown.patch:
+    Let publisher services shutdown cleanly (LP: #1870087)
+
+ -- Simon Poirier <[e-mail]>  Thu, 27 Aug 2020 17:44:25 -0400
+
 landscape-client (19.12-0ubuntu5) groovy; urgency=medium
 
   * d/landscape-client.service (LP: #1870087)
diff --git a/debian/patches/0003-clean-publisher-shutdown.patch b/debian/patches/0003-clean-publisher-shutdown.patch
new file mode 100644
index 0000000..98bb464
--- /dev/null
+++ b/debian/patches/0003-clean-publisher-shutdown.patch
@@ -0,0 +1,56 @@
+Description: Return missing deferred on service shutdown.
+ This should allow services to let their publisher shut down and clean
+ after itself, thus avoiding stale locks and sockets.
+Author: Simon Poirier <[e-mail]>
+Origin: upstream, https://github.com/CanonicalLtd/landscape-client/commit/8a617a1aafbbe9d972410707563710c3cbedd8e7
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1870087
+
+diff --git a/landscape/client/broker/service.py b/landscape/client/broker/service.py
+index 6e89414e..7e361492 100644
+--- a/landscape/client/broker/service.py
++++ b/landscape/client/broker/service.py
+@@ -82,10 +82,11 @@ class BrokerService(LandscapeService):
+
+     def stopService(self):
+         """Stop the broker."""
+-        self.publisher.stop()
++        deferred = self.publisher.stop()
+         self.exchanger.stop()
+         self.pinger.stop()
+         super(BrokerService, self).stopService()
++        return deferred
+
+
+ def run(args):
+diff --git a/landscape/client/manager/service.py b/landscape/client/manager/service.py
+index b95f4ebf..ef543d6f 100644
+--- a/landscape/client/manager/service.py
++++ b/landscape/client/manager/service.py
+@@ -54,8 +54,9 @@ class ManagerService(LandscapeService):
+     def stopService(self):
+         """Stop the manager and close the connection with the broker."""
+         self.connector.disconnect()
+-        self.publisher.stop()
++        deferred = self.publisher.stop()
+         super(ManagerService, self).stopService()
++        return deferred
+
+
+ def run(args):
+diff --git a/landscape/client/monitor/service.py b/landscape/client/monitor/service.py
+index 77d6f20f..6b9c63a6 100644
+--- a/landscape/client/monitor/service.py
++++ b/landscape/client/monitor/service.py
+@@ -56,10 +56,11 @@ class MonitorService(LandscapeService):
+         The monitor is flushed to ensure that things like persist databases
+         get saved to disk.
+         """
+-        self.publisher.stop()
++        deferred = self.publisher.stop()
+         self.monitor.flush()
+         self.connector.disconnect()
+         super(MonitorService, self).stopService()
++        return deferred
+
+
+ def run(args):
diff --git a/debian/patches/series b/debian/patches/series
index 6b9a76f..3cdf425 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Handle-EINVAL-error-of-SIOCETHTOOL-ioctl.patch
 0002-lp1870087-stale-locks.patch
+0003-clean-publisher-shutdown.patch