Merge lp:~cjwatson/turku/turku-agent-fix-rsyncd-interaction into lp:turku/turku-agent

[Colin Watson]

Don't restart rsyncd when updating its configuration.

This should fix problems where running backups are interrupted.

[Colin Watson (cjwatson)]

Work in progress for now as apparently this start-unless-running strategy fails on upstart.

[Junien F (axino)]

Not good enough on trusty :

$ sudo service turku-agent-rsyncd start
start: Job is already running: turku-agent-rsyncd
$ echo $?
1

[Colin Watson (cjwatson)]

I guess we maybe want something like the service_running strategy in charmhelpers for the upstart case?

[Haw Loeung (hloeung)]

LGTM, +1

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 50

=== modified file 'turku-agent-rsyncd.init-debian'
--- turku-agent-rsyncd.init-debian	2015-04-14 05:44:07 +0000
+++ turku-agent-rsyncd.init-debian	2019-05-14 15:06:23 +0000
@@ -23,7 +23,7 @@
   start)
     log_daemon_msg "Starting turku rsync daemon" "turku-agent-rsyncd"
     start-stop-daemon --start --quiet --background --make-pidfile \
-      --pidfile $PID_FILE --exec /usr/bin/env -- turku-agent-rsyncd-wrapper
+      --pidfile $PID_FILE --startas /usr/bin/env -- turku-agent-rsyncd-wrapper
     log_end_msg $?
     ;;
   stop)
 
=== modified file 'turku_agent/update_config.py'
--- turku_agent/update_config.py	2019-04-22 01:19:36 +0000
+++ turku_agent/update_config.py	2019-05-14 15:06:23 +0000
@@ -89,10 +89,12 @@
         f.write(built_rsyncd_secrets)
 
 
-def restart_services():
-    # Restart rsyncd
-    if not subprocess.call(['service', 'turku-agent-rsyncd', 'restart']) == 0:
-        subprocess.check_call(['service', 'turku-agent-rsyncd', 'start'])
+def start_services():
+    # Start rsyncd if it isn't already running.
+    # Note that we do *not* need to reload rsyncd when changing rsyncd.conf,
+    # as it rereads it on every client connection; but we may need to start
+    # it as it won't start if its configuration file doesn't exist.
+    subprocess.check_call(['service', 'turku-agent-rsyncd', 'start'])
 
 
 def send_config(config):
@@ -153,6 +155,6 @@
             raise
         logging.exception(e)
         return 1
-    restart_services()
+    start_services()
 
     lock.close()