From 4c5ce9b995ae1e89b3e656e98fc035de96db33fe Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Thu, 23 May 2019 23:01:58 -0400
Subject: [PATCH] Perform additional tweaks to units

Use RemainAfterExit to avoid pvc-flush from auto-stopping immediately.

Use PartOf to tie services to the target itself.

Use --wait on flush to avoid daemon stopping before flush is complete.
---
 node-daemon/pvc-flush.service | 4 +++-
 node-daemon/pvcd.service      | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/node-daemon/pvc-flush.service b/node-daemon/pvc-flush.service
index 6e07cf31..814e19bf 100644
--- a/node-daemon/pvc-flush.service
+++ b/node-daemon/pvc-flush.service
@@ -3,12 +3,14 @@
 [Unit]
 Description = Parallel Virtual Cluster autoflush daemon
 After = pvcd.service
+PartOf = pvcd.target
 
 [Service]
 Type = oneshot
+RemainAfterExit = true
 WorkingDirectory = /usr/share/pvc
 ExecStart = /usr/bin/pvc node unflush
-ExecStop = /usr/bin/pvc node flush
+ExecStop = /usr/bin/pvc node flush --wait
 
 [Install]
 WantedBy = pvcd.target
diff --git a/node-daemon/pvcd.service b/node-daemon/pvcd.service
index fd2ec8b8..601d833f 100644
--- a/node-daemon/pvcd.service
+++ b/node-daemon/pvcd.service
@@ -3,6 +3,7 @@
 [Unit]
 Description = Parallel Virtual Cluster node daemon
 After = network-online.target libvirtd.service zookeeper.service
+PartOf = pvcd.target
 
 [Service]
 Type = simple