From 2c755cef6935e2ebf356711861c5ff0378f33dd7 Mon Sep 17 00:00:00 2001 From: Brad Hubbard Date: Wed, 15 Aug 2018 13:52:12 +1000 Subject: [PATCH] Remove upstart files and references Nautilus is not supported on any distros still running upstart so these are redundant. Signed-off-by: Brad Hubbard --- PendingReleaseNotes | 3 ++ debian/rules | 18 -------- doc/install/manual-deployment.rst | 18 -------- doc/rados/operations/operating.rst | 16 ------- src/upstart/ceph-all.conf | 4 -- src/upstart/ceph-mds-all-starter.conf | 18 -------- src/upstart/ceph-mds-all.conf | 4 -- src/upstart/ceph-mds.conf | 26 ----------- src/upstart/ceph-mgr-all-starter.conf | 17 ------- src/upstart/ceph-mgr-all.conf | 4 -- src/upstart/ceph-mgr.conf | 26 ----------- src/upstart/ceph-mon-all-starter.conf | 19 -------- src/upstart/ceph-mon-all.conf | 4 -- src/upstart/ceph-mon.conf | 31 ------------- src/upstart/ceph-osd-all-starter.conf | 19 -------- src/upstart/ceph-osd-all.conf | 4 -- src/upstart/ceph-osd.conf | 29 ------------ src/upstart/ceph-rbd-mirror-all-starter.conf | 18 -------- src/upstart/ceph-rbd-mirror-all.conf | 4 -- src/upstart/ceph-rbd-mirror.conf | 26 ----------- src/upstart/radosgw-all-starter.conf | 18 -------- src/upstart/radosgw-all.conf | 4 -- src/upstart/radosgw.conf | 26 ----------- src/upstart/rbdmap.conf | 48 -------------------- 24 files changed, 3 insertions(+), 401 deletions(-) delete mode 100644 src/upstart/ceph-all.conf delete mode 100644 src/upstart/ceph-mds-all-starter.conf delete mode 100644 src/upstart/ceph-mds-all.conf delete mode 100644 src/upstart/ceph-mds.conf delete mode 100644 src/upstart/ceph-mgr-all-starter.conf delete mode 100644 src/upstart/ceph-mgr-all.conf delete mode 100644 src/upstart/ceph-mgr.conf delete mode 100644 src/upstart/ceph-mon-all-starter.conf delete mode 100644 src/upstart/ceph-mon-all.conf delete mode 100644 src/upstart/ceph-mon.conf delete mode 100644 src/upstart/ceph-osd-all-starter.conf delete mode 100644 src/upstart/ceph-osd-all.conf delete mode 100644 src/upstart/ceph-osd.conf delete mode 100644 src/upstart/ceph-rbd-mirror-all-starter.conf delete mode 100644 src/upstart/ceph-rbd-mirror-all.conf delete mode 100644 src/upstart/ceph-rbd-mirror.conf delete mode 100644 src/upstart/radosgw-all-starter.conf delete mode 100644 src/upstart/radosgw-all.conf delete mode 100644 src/upstart/radosgw.conf delete mode 100644 src/upstart/rbdmap.conf diff --git a/PendingReleaseNotes b/PendingReleaseNotes index ae5a1b3e33cbb..e36ec0973bb81 100644 --- a/PendingReleaseNotes +++ b/PendingReleaseNotes @@ -5,6 +5,9 @@ 'ceph osd destroy' or 'ceph osd purge' (but after first confirming it is safe to do so via the 'ceph osd safe-to-destroy' command). +* Nautilus is not supported on any distros still running upstart so upstart + specific files and references have been removed. + >=13.1.0 -------- diff --git a/debian/rules b/debian/rules index 44490c8fbddd5..a7f0717442e96 100755 --- a/debian/rules +++ b/debian/rules @@ -67,24 +67,6 @@ override_dh_installlogrotate: dh_installlogrotate -pceph-common override_dh_installinit: - # dh_installinit is only set up to handle one upstart script - # per package, so do this ourselves - install -d -m0755 debian/ceph-base/etc/init - install -m0644 src/upstart/ceph-all.conf debian/ceph-base/etc/init - install -d -m0755 debian/ceph-osd/etc/init - install -m0644 src/upstart/ceph-osd*.conf debian/ceph-osd/etc/init - install -d -m0755 debian/ceph-mon/etc/init - install -m0644 src/upstart/ceph-mon*.conf debian/ceph-mon/etc/init - install -d -m0755 debian/ceph-common/etc/init - install -m0644 src/upstart/rbdmap.conf debian/ceph-common/etc/init - install -d -m0755 debian/ceph-mds/etc/init - install -m0644 src/upstart/ceph-mds*.conf debian/ceph-mds/etc/init - install -d -m0755 debian/ceph-mgr/etc/init - install -m0644 src/upstart/ceph-mgr*.conf debian/ceph-mgr/etc/init - install -d -m0755 debian/radosgw/etc/init - install -m0644 src/upstart/radosgw*.conf debian/radosgw/etc/init - install -d -m0755 debian/rbd-mirror/etc/init - install -m0644 src/upstart/ceph-rbd-mirror*.conf debian/rbd-mirror/etc/init # install the systemd stuff manually since we have funny service names install -d -m0755 debian/ceph-common/etc/default install -m0644 etc/default/ceph debian/ceph-common/etc/default/ diff --git a/doc/install/manual-deployment.rst b/doc/install/manual-deployment.rst index 67146c1fe5e3d..843908a11dc81 100644 --- a/doc/install/manual-deployment.rst +++ b/doc/install/manual-deployment.rst @@ -240,11 +240,6 @@ The procedure is as follows: osd pool default pgp num = 333 osd crush chooseleaf type = 1 -#. Touch the ``done`` file. - - Mark that the monitor is created and ready to be started:: - - sudo touch /var/lib/ceph/mon/ceph-node1/done #. Start the monitor(s). @@ -252,19 +247,6 @@ The procedure is as follows: sudo systemctl start ceph-mon@node1 - For Ubuntu Trusty, use Upstart:: - - sudo start ceph-mon id=node1 [cluster={cluster-name}] - - In this case, to allow the start of the daemon at each reboot you - must create two empty files like this:: - - sudo touch /var/lib/ceph/mon/{cluster-name}-{hostname}/upstart - - For example:: - - sudo touch /var/lib/ceph/mon/ceph-node1/upstart - For older Debian/CentOS/RHEL, use sysvinit:: sudo /etc/init.d/ceph start mon.node1 diff --git a/doc/rados/operations/operating.rst b/doc/rados/operations/operating.rst index 791941a94565e..fcfd5268ae6ae 100644 --- a/doc/rados/operations/operating.rst +++ b/doc/rados/operations/operating.rst @@ -97,21 +97,6 @@ For example:: -Running Ceph with Upstart -========================= - -When deploying Ceph with ``ceph-deploy`` on Ubuntu Trusty, you may start and -stop Ceph daemons on a :term:`Ceph Node` using the event-based `Upstart`_. -Upstart does not require you to define daemon instances in the Ceph -configuration file. - -To list the Ceph Upstart jobs and instances on a node, execute:: - - sudo initctl list | grep ceph - -See `initctl`_ for additional details. - - Starting all Daemons -------------------- @@ -247,5 +232,4 @@ include: .. _Valgrind: http://www.valgrind.org/ -.. _Upstart: http://upstart.ubuntu.com/index.html .. _initctl: http://manpages.ubuntu.com/manpages/raring/en/man8/initctl.8.html diff --git a/src/upstart/ceph-all.conf b/src/upstart/ceph-all.conf deleted file mode 100644 index 52d0f08b8e07e..0000000000000 --- a/src/upstart/ceph-all.conf +++ /dev/null @@ -1,4 +0,0 @@ -description "Ceph" - -start on runlevel [2345] and static-network-up -stop on runlevel [!2345] diff --git a/src/upstart/ceph-mds-all-starter.conf b/src/upstart/ceph-mds-all-starter.conf deleted file mode 100644 index 5c1e02ef1cdb8..0000000000000 --- a/src/upstart/ceph-mds-all-starter.conf +++ /dev/null @@ -1,18 +0,0 @@ -description "Ceph MDS (start all instances)" - -start on starting ceph-mds-all - -task - -script - set -e - # TODO what's the valid charset for cluster names and mds ids? - find -L /var/lib/ceph/mds/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[A-Za-z0-9]+-[A-Za-z0-9._-]+' -printf '%P\n' \ - | while read f; do - if [ -e "/var/lib/ceph/mds/$f/done" ] && [ -e "/var/lib/ceph/mds/$f/upstart" ] && [ ! -e "/var/lib/ceph/mds/$f/sysvinit" ]; then - cluster="${f%%-*}" - id="${f#*-}" - initctl emit ceph-mds cluster="$cluster" id="$id" - fi - done -end script diff --git a/src/upstart/ceph-mds-all.conf b/src/upstart/ceph-mds-all.conf deleted file mode 100644 index 991019e14583d..0000000000000 --- a/src/upstart/ceph-mds-all.conf +++ /dev/null @@ -1,4 +0,0 @@ -description "Ceph MDS (all instances)" - -start on starting ceph-all -stop on stopping ceph-all diff --git a/src/upstart/ceph-mds.conf b/src/upstart/ceph-mds.conf deleted file mode 100644 index 7c691173927c0..0000000000000 --- a/src/upstart/ceph-mds.conf +++ /dev/null @@ -1,26 +0,0 @@ -description "Ceph MDS" - -start on ceph-mds -stop on runlevel [!2345] or stopping ceph-mds-all - -respawn -respawn limit 3 1800 - -limit nofile 16384 16384 - -pre-start script - set -e - test -x /usr/bin/ceph-mds || { stop; exit 0; } - test -d "/var/lib/ceph/mds/${cluster:-ceph}-$id" || { stop; exit 0; } - - install -d -m0770 -o ceph -g ceph /var/run/ceph -end script - -instance ${cluster:-ceph}/$id -export cluster -export id - -# this breaks oneiric -#usage "cluster = name of cluster (defaults to 'ceph'); id = mds instance id" - -exec /usr/bin/ceph-mds --cluster="${cluster:-ceph}" -i "$id" -f --setuser ceph --setgroup ceph diff --git a/src/upstart/ceph-mgr-all-starter.conf b/src/upstart/ceph-mgr-all-starter.conf deleted file mode 100644 index 099b416d6ea07..0000000000000 --- a/src/upstart/ceph-mgr-all-starter.conf +++ /dev/null @@ -1,17 +0,0 @@ -description "Ceph Manager (start all instances)" - -start on starting ceph-mgr-all - -task - -script - set -e - find -L /var/lib/ceph/mgr/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[A-Za-z0-9]+-[A-Za-z0-9._-]+' -printf '%P\n' \ - | while read f; do - if [ -e "/var/lib/ceph/mgr/$f/done" ] && [ -e "/var/lib/ceph/mgr/$f/upstart" ] && [ ! -e "/var/lib/ceph/mgr/$f/sysvinit" ]; then - cluster="${f%%-*}" - id="${f#*-}" - initctl emit ceph-mgr cluster="$cluster" id="$id" - fi - done -end script diff --git a/src/upstart/ceph-mgr-all.conf b/src/upstart/ceph-mgr-all.conf deleted file mode 100644 index 6be4fdbb0bbef..0000000000000 --- a/src/upstart/ceph-mgr-all.conf +++ /dev/null @@ -1,4 +0,0 @@ -description "Ceph Manager (all instances)" - -start on starting ceph-all -stop on stopping ceph-all diff --git a/src/upstart/ceph-mgr.conf b/src/upstart/ceph-mgr.conf deleted file mode 100644 index 11c36a5673b4c..0000000000000 --- a/src/upstart/ceph-mgr.conf +++ /dev/null @@ -1,26 +0,0 @@ -description "Ceph Manager" - -start on ceph-mgr -stop on runlevel [!2345] or stopping ceph-mgr-all - -respawn -respawn limit 3 1800 - -limit nofile 16384 16384 - -pre-start script - set -e - test -x /usr/bin/ceph-mgr || { stop; exit 0; } - test -d "/var/lib/ceph/mgr/${cluster:-ceph}-$id" || { stop; exit 0; } - - install -d -m0770 -o ceph -g ceph /var/run/ceph -end script - -instance ${cluster:-ceph}/$id -export cluster -export id - -# this breaks oneiric -#usage "cluster = name of cluster (defaults to 'ceph'); id = mgr instance id" - -exec /usr/bin/ceph-mgr --cluster="${cluster:-ceph}" -i "$id" -f --setuser ceph --setgroup ceph diff --git a/src/upstart/ceph-mon-all-starter.conf b/src/upstart/ceph-mon-all-starter.conf deleted file mode 100644 index 9b9c8199cc64f..0000000000000 --- a/src/upstart/ceph-mon-all-starter.conf +++ /dev/null @@ -1,19 +0,0 @@ -description "Ceph MON (start all instances)" - -start on starting ceph-mon-all - -task - -script - set -e - # TODO what's the valid charset for cluster names and mon ids? - find -L /var/lib/ceph/mon/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[A-Za-z0-9]+-[A-Za-z0-9._-]+' -printf '%P\n' \ - | while read f; do - if [ -e "/var/lib/ceph/mon/$f/done" ] && [ -e "/var/lib/ceph/mon/$f/upstart" ] && [ ! -e "/var/lib/ceph/mon/$f/sysvinit" ]; then - cluster="${f%%-*}" - id="${f#*-}" - - initctl emit ceph-mon cluster="$cluster" id="$id" - fi - done -end script diff --git a/src/upstart/ceph-mon-all.conf b/src/upstart/ceph-mon-all.conf deleted file mode 100644 index aea00c4d1f766..0000000000000 --- a/src/upstart/ceph-mon-all.conf +++ /dev/null @@ -1,4 +0,0 @@ -description "Ceph monitor (all instances)" - -start on starting ceph-all -stop on runlevel [!2345] or stopping ceph-all diff --git a/src/upstart/ceph-mon.conf b/src/upstart/ceph-mon.conf deleted file mode 100644 index 89119457b9c28..0000000000000 --- a/src/upstart/ceph-mon.conf +++ /dev/null @@ -1,31 +0,0 @@ -description "Ceph MON" - -start on ceph-mon -stop on runlevel [!2345] or stopping ceph-mon-all - -respawn -respawn limit 3 1800 - -limit nofile 16384 16384 - -pre-start script - set -e - test -x /usr/bin/ceph-mon || { stop; exit 0; } - test -d "/var/lib/ceph/mon/${cluster:-ceph}-$id" || { stop; exit 0; } - - install -d -m0770 -o ceph -g ceph /var/run/ceph -end script - -instance ${cluster:-ceph}/$id -export cluster -export id - -# this breaks oneiric -#usage "cluster = name of cluster (defaults to 'ceph'); id = monitor instance id" - -exec /usr/bin/ceph-mon --cluster="${cluster:-ceph}" -i "$id" -f --setuser ceph --setgroup ceph - -post-stop script - # Cleanup socket in case of segfault - rm -f "/var/run/ceph/ceph-mon.$id.asok" -end script diff --git a/src/upstart/ceph-osd-all-starter.conf b/src/upstart/ceph-osd-all-starter.conf deleted file mode 100644 index 9cee78c89f3c1..0000000000000 --- a/src/upstart/ceph-osd-all-starter.conf +++ /dev/null @@ -1,19 +0,0 @@ -description "Ceph OSD (start all instances)" - -start on starting ceph-osd-all - -task - -script - set -e - - # TODO what's the valid charset for cluster names and osd ids? - find -L /var/lib/ceph/osd/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[A-Za-z0-9]+-[A-Za-z0-9._-]+' -printf '%P\n' \ - | while read f; do - if [ -e "/var/lib/ceph/osd/$f/ready" ] && [ -e "/var/lib/ceph/osd/$f/upstart" ] && [ ! -e "/var/lib/ceph/osd/$f/sysvinit" ]; then - cluster="${f%%-*}" - id="${f#*-}" - initctl emit ceph-osd cluster="$cluster" id="$id" - fi - done -end script diff --git a/src/upstart/ceph-osd-all.conf b/src/upstart/ceph-osd-all.conf deleted file mode 100644 index 73d3b37e7c8ed..0000000000000 --- a/src/upstart/ceph-osd-all.conf +++ /dev/null @@ -1,4 +0,0 @@ -description "Ceph OSD (all instances)" - -start on starting ceph-all -stop on runlevel [!2345] or stopping ceph-all diff --git a/src/upstart/ceph-osd.conf b/src/upstart/ceph-osd.conf deleted file mode 100644 index 60b7b829c4338..0000000000000 --- a/src/upstart/ceph-osd.conf +++ /dev/null @@ -1,29 +0,0 @@ -description "Ceph OSD" - -start on ceph-osd -stop on runlevel [!2345] or stopping ceph-osd-all - -respawn -respawn limit 3 1800 - -limit nofile 327680 327680 - -pre-start script - set -e - test -x /usr/bin/ceph-osd || { stop; exit 0; } - test -d "/var/lib/ceph/osd/${cluster:-ceph}-$id" || { stop; exit 0; } - - install -d -m0770 -o ceph -g ceph /var/run/ceph - - /usr/lib/ceph/ceph-osd-prestart.sh --cluster="${cluster:-ceph}" -i "$id" -end script - -instance ${cluster:-ceph}/$id -export cluster -export id - -script - test -f /etc/default/ceph && . /etc/default/ceph - export TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES - exec /usr/bin/ceph-osd --cluster="${cluster:-ceph}" -i "$id" -f --setuser ceph --setgroup ceph -end script diff --git a/src/upstart/ceph-rbd-mirror-all-starter.conf b/src/upstart/ceph-rbd-mirror-all-starter.conf deleted file mode 100644 index 038cdb13f6859..0000000000000 --- a/src/upstart/ceph-rbd-mirror-all-starter.conf +++ /dev/null @@ -1,18 +0,0 @@ -description "Ceph rbd-mirror (task to start all instances)" - -start on starting ceph-rbd-mirror-all - -task - -script - set -e - # TODO what's the valid charset for cluster names and daemon ids? - find -L /var/lib/ceph/rbd-mirror/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[A-Za-z0-9]+-[A-Za-z0-9._-]+' -printf '%P\n' \ - | while read f; do - if [ -e "/var/lib/ceph/rbd-mirror/$f/done" ]; then - cluster="${f%%-*}" - id="${f#*-}" - initctl emit ceph-rbd-mirror cluster="$cluster" id="$id" - fi - done -end script diff --git a/src/upstart/ceph-rbd-mirror-all.conf b/src/upstart/ceph-rbd-mirror-all.conf deleted file mode 100644 index 7e6126b64650e..0000000000000 --- a/src/upstart/ceph-rbd-mirror-all.conf +++ /dev/null @@ -1,4 +0,0 @@ -description "Ceph rbd mirror (all instances)" - -start on starting ceph-all -stop on runlevel [!2345] or stopping ceph-all diff --git a/src/upstart/ceph-rbd-mirror.conf b/src/upstart/ceph-rbd-mirror.conf deleted file mode 100644 index a9901113c0e15..0000000000000 --- a/src/upstart/ceph-rbd-mirror.conf +++ /dev/null @@ -1,26 +0,0 @@ -description "Ceph rbd mirror" - -start on ceph-rbd-mirror -stop on runlevel [!2345] or stopping ceph-rbd-mirror-all - -respawn -respawn limit 3 1800 - -limit nofile 8096 65536 - -pre-start script - set -e - test -x /usr/bin/rbd-mirror || { stop; exit 0; } - test -d "/var/lib/ceph/rbd-mirror/${cluster:-ceph}-$id" || { stop; exit 0; } - - install -d -m0770 -o ceph -g ceph /var/run/ceph -end script - -instance ${cluster:-ceph}/$id -export cluster -export id - -# this breaks oneiric -#usage "cluster = name of cluster (defaults to 'ceph'); id = instance id" - -exec /usr/bin/rbd-mirror --cluster="${cluster:-ceph}" --id "$id" -f --setuser ceph --setgroup ceph diff --git a/src/upstart/radosgw-all-starter.conf b/src/upstart/radosgw-all-starter.conf deleted file mode 100644 index 8ab3c0d90293b..0000000000000 --- a/src/upstart/radosgw-all-starter.conf +++ /dev/null @@ -1,18 +0,0 @@ -description "Ceph radosgw (task to start all instances)" - -start on starting radosgw-all - -task - -script - set -e - # TODO what's the valid charset for cluster names and daemon ids? - find -L /var/lib/ceph/radosgw/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[A-Za-z0-9]+-[A-Za-z0-9._-]+' -printf '%P\n' \ - | while read f; do - if [ -e "/var/lib/ceph/radosgw/$f/done" ]; then - cluster="${f%%-*}" - id="${f#*-}" - initctl emit radosgw cluster="$cluster" id="$id" - fi - done -end script diff --git a/src/upstart/radosgw-all.conf b/src/upstart/radosgw-all.conf deleted file mode 100644 index 9067113ae944c..0000000000000 --- a/src/upstart/radosgw-all.conf +++ /dev/null @@ -1,4 +0,0 @@ -description "Ceph radosgw (all instances)" - -start on starting ceph-all or runlevel [2345] -stop on runlevel [!2345] or stopping ceph-all diff --git a/src/upstart/radosgw.conf b/src/upstart/radosgw.conf deleted file mode 100644 index 828c314d2386d..0000000000000 --- a/src/upstart/radosgw.conf +++ /dev/null @@ -1,26 +0,0 @@ -description "Ceph radosgw" - -start on radosgw -stop on runlevel [!2345] or stopping radosgw-all - -respawn -respawn limit 5 30 - -limit nofile 8096 65536 - -pre-start script - set -e - test -x /usr/bin/radosgw || { stop; exit 0; } - test -d "/var/lib/ceph/radosgw/${cluster:-ceph}-$id" || { stop; exit 0; } - - install -d -m0770 -o ceph -g ceph /var/run/ceph -end script - -instance ${cluster:-ceph}/$id -export cluster -export id - -# this breaks oneiric -#usage "cluster = name of cluster (defaults to 'ceph'); id = mds instance id" - -exec /usr/bin/radosgw --cluster="${cluster:-ceph}" --id "$id" -f --setuser ceph --setgroup ceph diff --git a/src/upstart/rbdmap.conf b/src/upstart/rbdmap.conf deleted file mode 100644 index eeefec3b2dc60..0000000000000 --- a/src/upstart/rbdmap.conf +++ /dev/null @@ -1,48 +0,0 @@ -# rbdmap - Ceph RBD Mapping -# -# This script does not manage mount and unmount fs which depends on rbd device. -# You should use _netdev option in fstab to mount and umount in the correct order. - -description "ceph rbd mapping" - -start on (started networking - and remote-filesystems) -stop on unmounted-remote-filesystems - -env RBDMAPFILE="/etc/ceph/rbdmap" - -pre-start script - if [ ! -f "$RBDMAPFILE" ]; then - exit 0 - fi - - while read DEV PARAMS; do - case "$DEV" in - ""|\#*) - continue - ;; - */*) - ;; - *) - DEV=rbd/$DEV - ;; - esac - for PARAM in $(echo $PARAMS | tr ',' '\n'); do - CMDPARAMS="$CMDPARAMS --$(echo $PARAM | tr '=' ' ')" - done - if [ ! -b /dev/rbd/$DEV ]; then - echo "rbd map $DEV" - rbd map $DEV $CMDPARAMS - fi - done < $RBDMAPFILE -end script - -post-stop script - if ls /dev/rbd[0-9]* >/dev/null 2>&1; then - for DEV in /dev/rbd[0-9]*; do - echo "rbd unmap $DEV" - rbd unmap $DEV - done - fi -end script - -- 2.39.5