Merge ~ballot/influxdb-charm/+git/influxdb-charm:lp1947882 into influxdb-charm:master

[Benjamin Allot]

Add a systemd override directive to avoid timeout on start

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

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

[Tom Haddon (mthaddon)]

review: Needs Fixing

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

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

Change successfully merged at revision 51e86798f2febe6e38c8e1350b52102e90d98eaa

diff --git a/files/influxdb_override.conf b/files/influxdb_override.conf
new file mode 100644
index 0000000..0543121
--- /dev/null
+++ b/files/influxdb_override.conf
@@ -0,0 +1,2 @@
+[Service]
+TimeoutStartSec=30m
diff --git a/layer.yaml b/layer.yaml
index c68c892..103c49d 100644
--- a/layer.yaml
+++ b/layer.yaml
@@ -3,6 +3,7 @@ includes:
   - layer:basic
   - layer:apt
   - layer:nagios
+  - layer:status
   - interface:http
   - interface:grafana-source
   - interface:influxdb-api
diff --git a/reactive/influxdb.py b/reactive/influxdb.py
index c751ea8..eb12dfd 100644
--- a/reactive/influxdb.py
+++ b/reactive/influxdb.py
@@ -1,6 +1,7 @@
 import os
 import re
 import shutil
+import subprocess
 import yaml
 
 from charmhelpers.contrib.charmsupport import nrpe
@@ -9,6 +10,7 @@ from charmhelpers.core import host
 from charmhelpers.core.templating import render
 from charms.reactive import hook, set_flag, clear_flag, when, when_all, when_not
 from charms import apt
+from charms.layer import status
 
 import influxdb
 
@@ -19,6 +21,7 @@ CRONFILE = '/etc/cron.daily/influxdb-charm-backup'
 CHECK_SRC = 'files/check_influxdb.py'
 CHECK_DIR = '/usr/local/lib/nagios/plugins'
 CHECK_CMD = CHECK_DIR + '/check_influxdb.py'
+INFLUXDB_SERVICE = "influxdb.service"
 
 
 @when('admin.available')
@@ -146,6 +149,19 @@ def config_changed():
         updated_config = apply_configs(f, conf)
     host.write_file(target, updated_config.encode("utf-8"), perms=0o644)
 
+    # Write the systemd override timeout for the start of the service
+    if host.service_available(INFLUXDB_SERVICE):
+        systemd_override_dir = "/etc/systemd/system/{0}.d/".format(INFLUXDB_SERVICE)
+        host.mkdir(systemd_override_dir)
+        systemd_override = os.path.join(systemd_override_dir, "override.conf")
+        shutil.copy2("files/influxdb_override.conf", systemd_override)
+        hookenv.log("Setting TimeoutStartSec override for influxdb service", hookenv.DEBUG)
+        try:
+            subprocess.check_call(["systemctl", "daemon-reload"])
+        except (OSError, subprocess.CalledProcessError):
+            hookenv.log("Cannot reload systemd", hookenv.ERROR)
+            status.blocked("Cannot configure influxdb.service")
+    hookenv.log("Restarting influxdb service", hookenv.INFO)
     host.service_stop('influxdb')
     host.service_start('influxdb')