From c8f39de9a0d56b2c86e204445fc4b097ca718deb Mon Sep 17 00:00:00 2001 From: Eric MacDonald Date: Wed, 2 Jan 2019 10:21:06 -0500 Subject: [PATCH] Implement collectd startup in manifest apply post stage Starting collectd too early in the manifest apply is seen to occasionally fail due to a dependency configuration on hostname resolution in FQDNLookup not being complete. Since influxdb is used by collectd and is a controller only service this update moves it to the manifest apply post stage as well and is filtered out from non controller load types. This issue is fixed by the following multi-git changes. stx-metal: Filter influxdb out of storage and compute only loads. No real inter git merge dependency stx-integ: This update. Add startup Before=pmond dependency stx-config: Move collectd config and startup to manifest apply post stage Move influxdb config and startup to manifest apply post stage Test Plan: PASS: Build iso PASS: verify install storage system and collectd startup PASS: Verify Storage system DOR PASS: Verify influxdb and extensions excluded in non-controller loads PASS: Verify collectd starts properly on all nodes (CC,DOR,UNLOCK) PASS: Verify influxdb starts properly on controller nodes (CC,DOR,UNLOCK) PASS: Verify collectd pmond process monitoring and recovery PASS: Verify influxdb pmond process monitoring and recovery PEND: Verify collectd statistics storage and fetch to/from influxdb PEND: Install AIO DX and verify collectd and influxdb startup Change-Id: I47d70b05bdbdd22f8fce2f56fcc287fac7371ace Closes-Bug: 1797909 Signed-off-by: Eric MacDonald --- monitoring/collectd-extensions/centos/build_srpm.data | 2 +- monitoring/collectd-extensions/src/collectd.service | 1 + monitoring/influxdb-extensions/centos/build_srpm.data | 2 +- monitoring/influxdb-extensions/src/influxdb.service | 4 +++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/monitoring/collectd-extensions/centos/build_srpm.data b/monitoring/collectd-extensions/centos/build_srpm.data index fb8be4619..52d21566f 100644 --- a/monitoring/collectd-extensions/centos/build_srpm.data +++ b/monitoring/collectd-extensions/centos/build_srpm.data @@ -16,4 +16,4 @@ COPY_LIST="$PKG_BASE/src/LICENSE \ $PKG_BASE/src/example.py \ $PKG_BASE/src/example.conf" -TIS_PATCH_VER=3 +TIS_PATCH_VER=4 diff --git a/monitoring/collectd-extensions/src/collectd.service b/monitoring/collectd-extensions/src/collectd.service index 14d12c327..1ac7cb036 100644 --- a/monitoring/collectd-extensions/src/collectd.service +++ b/monitoring/collectd-extensions/src/collectd.service @@ -1,6 +1,7 @@ [Unit] Description=Collectd statistics daemon and extension services Documentation=man:collectd(1) man:collectd.conf(5) +Before=pmon.service After=local-fs.target network-online.target Requires=local-fs.target network-online.target diff --git a/monitoring/influxdb-extensions/centos/build_srpm.data b/monitoring/influxdb-extensions/centos/build_srpm.data index 2be8701c6..03c5dbcc8 100644 --- a/monitoring/influxdb-extensions/centos/build_srpm.data +++ b/monitoring/influxdb-extensions/centos/build_srpm.data @@ -4,4 +4,4 @@ COPY_LIST="$PKG_BASE/src/LICENSE \ $PKG_BASE/src/influxdb.conf.pmon \ $PKG_BASE/src/influxdb.service" -TIS_PATCH_VER=1 +TIS_PATCH_VER=2 diff --git a/monitoring/influxdb-extensions/src/influxdb.service b/monitoring/influxdb-extensions/src/influxdb.service index 2d3104873..7617d2a6e 100644 --- a/monitoring/influxdb-extensions/src/influxdb.service +++ b/monitoring/influxdb-extensions/src/influxdb.service @@ -1,8 +1,10 @@ [Unit] Description=InfluxDB open-source, distributed, time series database Documentation=https://influxdb.com/docs/ -After=local-fs.target network.target Before=collectd.service +Before=pmon.service +After=local-fs.target network-online.target +Requires=local-fs.target network-online.target [Service] User=influxdb