From 771ca71c0357bd8149677795ac934ab09945a3a3 Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Tue, 11 Sep 2012 16:31:57 -0700 Subject: [PATCH] upstart: Give everything a stop on stanza. These are all tasks, and expected to exit somewhat quickly, but e.g. ceph-create-keys has a loop where it waits for mon to reach quorum, so it might still be in that loop when the machine is shut down. --- src/upstart/ceph-create-keys.conf | 1 + src/upstart/ceph-hotplug.conf | 1 + src/upstart/ceph-mds-all-starter.conf | 1 + src/upstart/ceph-mon-all-starter.conf | 1 + src/upstart/radosgw-all-starter.conf | 1 + 5 files changed, 5 insertions(+) diff --git a/src/upstart/ceph-create-keys.conf b/src/upstart/ceph-create-keys.conf index de215d98ff347..6fb4581852fde 100644 --- a/src/upstart/ceph-create-keys.conf +++ b/src/upstart/ceph-create-keys.conf @@ -1,6 +1,7 @@ description "Create Ceph client.admin key when possible" start on started ceph-mon +stop on runlevel [!2345] task diff --git a/src/upstart/ceph-hotplug.conf b/src/upstart/ceph-hotplug.conf index 817f34120ec91..702045293a2d8 100644 --- a/src/upstart/ceph-hotplug.conf +++ b/src/upstart/ceph-hotplug.conf @@ -3,6 +3,7 @@ description "Ceph hotplug" start on block-device-added \ DEVTYPE=partition \ ID_PART_ENTRY_TYPE=4fbd7e29-9d25-41b8-afd0-062c0ceff05d +stop on runlevel [!2345] task instance $DEVNAME diff --git a/src/upstart/ceph-mds-all-starter.conf b/src/upstart/ceph-mds-all-starter.conf index 2db18124cb4a6..2748f35c93a53 100644 --- a/src/upstart/ceph-mds-all-starter.conf +++ b/src/upstart/ceph-mds-all-starter.conf @@ -1,6 +1,7 @@ description "Ceph MDS (task to start all instances)" start on starting ceph-mds-all +stop on runlevel [!2345] task diff --git a/src/upstart/ceph-mon-all-starter.conf b/src/upstart/ceph-mon-all-starter.conf index b20bcb8ab75c3..f7188cb740532 100644 --- a/src/upstart/ceph-mon-all-starter.conf +++ b/src/upstart/ceph-mon-all-starter.conf @@ -1,6 +1,7 @@ description "Ceph MON (start all instances)" start on starting ceph-mon-all +stop on runlevel [!2345] task diff --git a/src/upstart/radosgw-all-starter.conf b/src/upstart/radosgw-all-starter.conf index ceb4a885a1842..d3cabcf4ee3b8 100644 --- a/src/upstart/radosgw-all-starter.conf +++ b/src/upstart/radosgw-all-starter.conf @@ -1,6 +1,7 @@ description "Ceph radosgw (task to start all instances)" start on starting radosgw-all +stop on runlevel [!2345] task -- 2.39.5