From e8806c97d77af3ed4ec8f598a0c8aca3585bd947 Mon Sep 17 00:00:00 2001 From: Rodrigo Severo Date: Fri, 10 Jan 2020 11:33:45 -0300 Subject: [PATCH 1/2] doc/install/upgrading-ceph: removing trailing spaces Signed-off-by: Rodrigo Severo --- doc/install/upgrading-ceph.rst | 60 +++++++++++++++++----------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/doc/install/upgrading-ceph.rst b/doc/install/upgrading-ceph.rst index bf22b38ecab..b55f5c4d734 100644 --- a/doc/install/upgrading-ceph.rst +++ b/doc/install/upgrading-ceph.rst @@ -29,19 +29,19 @@ release. The `Upgrade Procedures`_ are relatively simple, but do look at the `release notes document of your release`_ before upgrading. The basic process involves -three steps: +three steps: -#. Use ``ceph-deploy`` on your admin node to upgrade the packages for - multiple hosts (using the ``ceph-deploy install`` command), or login to each +#. Use ``ceph-deploy`` on your admin node to upgrade the packages for + multiple hosts (using the ``ceph-deploy install`` command), or login to each host and upgrade the Ceph package `using your distro's package manager`_. For example, when `Upgrading Monitors`_, the ``ceph-deploy`` syntax might look like this:: - + ceph-deploy install --release {release-name} ceph-node1[ ceph-node2] ceph-deploy install --release firefly mon1 mon2 mon3 - **Note:** The ``ceph-deploy install`` command will upgrade the packages - in the specified node(s) from the old release to the release you specify. + **Note:** The ``ceph-deploy install`` command will upgrade the packages + in the specified node(s) from the old release to the release you specify. There is no ``ceph-deploy upgrade`` command. #. Login in to each Ceph node and restart each Ceph daemon. @@ -62,7 +62,7 @@ Before upgrading Ceph daemons, upgrade the ``ceph-deploy`` tool. :: Or:: sudo apt-get install ceph-deploy - + Or:: sudo yum install ceph-deploy python-pushy @@ -71,7 +71,7 @@ Or:: Upgrade Procedures ================== -The following sections describe the upgrade process. +The following sections describe the upgrade process. .. important:: Each release of Ceph may have some additional steps. Refer to the `release notes document of your release`_ for details **BEFORE** you @@ -83,16 +83,16 @@ Upgrading Monitors To upgrade monitors, perform the following steps: -#. Upgrade the Ceph package for each daemon instance. +#. Upgrade the Ceph package for each daemon instance. - You may use ``ceph-deploy`` to address all monitor nodes at once. + You may use ``ceph-deploy`` to address all monitor nodes at once. For example:: ceph-deploy install --release {release-name} ceph-node1[ ceph-node2] ceph-deploy install --release hammer mon1 mon2 mon3 - You may also use the package manager for your Linux distribution on - each individual node. To upgrade packages manually on each Debian/Ubuntu + You may also use the package manager for your Linux distribution on + each individual node. To upgrade packages manually on each Debian/Ubuntu host, perform the following steps:: ssh {mon-host} @@ -102,9 +102,9 @@ To upgrade monitors, perform the following steps: ssh {mon-host} sudo yum update && sudo yum install ceph - - -#. Restart each monitor. For Ubuntu distributions, use:: + + +#. Restart each monitor. For Ubuntu distributions, use:: sudo restart ceph-mon id={hostname} @@ -112,9 +112,9 @@ To upgrade monitors, perform the following steps: sudo /etc/init.d/ceph restart {mon-id} - For CentOS/Red Hat distributions deployed with ``ceph-deploy``, + For CentOS/Red Hat distributions deployed with ``ceph-deploy``, the monitor ID is usually ``mon.{hostname}``. - + #. Ensure each monitor has rejoined the quorum:: ceph mon stat @@ -127,15 +127,15 @@ Upgrading an OSD To upgrade a Ceph OSD Daemon, perform the following steps: -#. Upgrade the Ceph OSD Daemon package. +#. Upgrade the Ceph OSD Daemon package. - You may use ``ceph-deploy`` to address all Ceph OSD Daemon nodes at + You may use ``ceph-deploy`` to address all Ceph OSD Daemon nodes at once. For example:: ceph-deploy install --release {release-name} ceph-node1[ ceph-node2] ceph-deploy install --release hammer osd1 osd2 osd3 - You may also use the package manager on each node to upgrade packages + You may also use the package manager on each node to upgrade packages `using your distro's package manager`_. For Debian/Ubuntu hosts, perform the following steps on each host:: @@ -148,24 +148,24 @@ To upgrade a Ceph OSD Daemon, perform the following steps: sudo yum update && sudo yum install ceph -#. Restart the OSD, where ``N`` is the OSD number. For Ubuntu, use:: +#. Restart the OSD, where ``N`` is the OSD number. For Ubuntu, use:: sudo restart ceph-osd id=N For multiple OSDs on a host, you may restart all of them with Upstart. :: sudo restart ceph-osd-all - + For CentOS/Red Hat/Debian distributions, use:: - sudo /etc/init.d/ceph restart N + sudo /etc/init.d/ceph restart N #. Ensure each upgraded Ceph OSD Daemon has rejoined the cluster:: ceph osd stat -Ensure that you have completed the upgrade cycle for all of your +Ensure that you have completed the upgrade cycle for all of your Ceph OSD Daemons. @@ -174,8 +174,8 @@ Upgrading a Metadata Server To upgrade a Ceph Metadata Server, perform the following steps: -#. Upgrade the Ceph Metadata Server package. You may use ``ceph-deploy`` to - address all Ceph Metadata Server nodes at once, or use the package manager +#. Upgrade the Ceph Metadata Server package. You may use ``ceph-deploy`` to + address all Ceph Metadata Server nodes at once, or use the package manager on each node. For example:: ceph-deploy install --release {release-name} ceph-node1 @@ -192,11 +192,11 @@ To upgrade a Ceph Metadata Server, perform the following steps: ssh {mon-host} sudo yum update && sudo yum install ceph-mds - -#. Restart the metadata server. For Ubuntu, use:: + +#. Restart the metadata server. For Ubuntu, use:: sudo restart ceph-mds id={hostname} - + For CentOS/Red Hat/Debian distributions, use:: sudo /etc/init.d/ceph restart mds.{hostname} @@ -216,7 +216,7 @@ Once you have upgraded the packages and restarted daemons on your Ceph cluster, we recommend upgrading ``ceph-common`` and client libraries (``librbd1`` and ``librados2``) on your client nodes too. -#. Upgrade the package:: +#. Upgrade the package:: ssh {client-host} apt-get update && sudo apt-get install ceph-common librados2 librbd1 python-rados python-rbd From 2422f6df6731fb41d4b15a9ec5bb314cf3669665 Mon Sep 17 00:00:00 2001 From: Rodrigo Severo Date: Fri, 10 Jan 2020 11:38:19 -0300 Subject: [PATCH 2/2] doc/install/upgrading-ceph: using systemd commands in Ubuntu instructions Before this change, we were using the "restart" command which is a symlink to initctl(8). and it's offered by upstart. since ubuntu/vivid, ubuntu moved from upstart to systemd. Please see https://lists.ubuntu.com/archives/ubuntu-devel/2016-July/039465.html Signed-off-by: Rodrigo Severo --- doc/install/upgrading-ceph.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/install/upgrading-ceph.rst b/doc/install/upgrading-ceph.rst index b55f5c4d734..6fbf43a236d 100644 --- a/doc/install/upgrading-ceph.rst +++ b/doc/install/upgrading-ceph.rst @@ -106,7 +106,7 @@ To upgrade monitors, perform the following steps: #. Restart each monitor. For Ubuntu distributions, use:: - sudo restart ceph-mon id={hostname} + sudo systemctl restart ceph-mon@{hostname}.service For CentOS/Red Hat/Debian distributions, use:: @@ -150,11 +150,11 @@ To upgrade a Ceph OSD Daemon, perform the following steps: #. Restart the OSD, where ``N`` is the OSD number. For Ubuntu, use:: - sudo restart ceph-osd id=N + sudo systemctl restart ceph-osd@{N}.service - For multiple OSDs on a host, you may restart all of them with Upstart. :: + For multiple OSDs on a host, you may restart all of them with systemd. :: - sudo restart ceph-osd-all + sudo systemctl restart ceph-osd For CentOS/Red Hat/Debian distributions, use:: @@ -195,7 +195,7 @@ To upgrade a Ceph Metadata Server, perform the following steps: #. Restart the metadata server. For Ubuntu, use:: - sudo restart ceph-mds id={hostname} + sudo systemctl restart ceph-mds@{hostname}.service For CentOS/Red Hat/Debian distributions, use::