SES7: Removed duplicate step in a procedure (#1064)

* Removed duplicate step in a procedure Co-authored-by: Daria Vladykina <daria.vladykina@suse.com> Co-authored-by: Tim Serong <tserong@suse.com>
SUSE · Apr 21, 2023 · 9c17f5b · 9c17f5b
1 parent af134ab
commit 9c17f5b
Showing 1 changed file with 17 additions and 55 deletions.
diff --git a/xml/admin_ceph_upgrade.xml b/xml/admin_ceph_upgrade.xml
@@ -132,7 +132,7 @@
         </listitem>
         <listitem>
           <para>
-            Read <xref linkend="ses-deployment"/> to familiarise yourself with
+            Read <xref linkend="ses-deployment"/> to familiarize yourself with
             &cephsalt; and the &ceph; orchestrator, and in particular the
             information on service specifications.
           </para>
@@ -538,22 +538,24 @@ Nodes running older software versions must be upgraded in the following order:
         <para>
           Before adopting any OSD node, you need to perform a format conversion
           of OSD nodes to improve the accounting for OMAP data. You can do so
-          by running the following command on the &adm;:
+          by running the following commands on the &adm;:
         </para>
-<screen>&prompt.cephuser;ceph config set osd bluestore_fsck_quick_fix_on_mount true</screen>
+<screen>
+&prompt.cephuser;cephadm unit --name osd.OSD_DAEMON_ID stop
+&prompt.cephuser;cephadm shell --name osd.OSD_DAEMON_ID ceph-bluestore-tool --path /var/lib/ceph/osd/ceph-OSD_DAEMON_ID --command quick-fix
+&prompt.cephuser;cephadm unit --name osd.OSD_DAEMON_ID start
+</screen>
         <para>
-          The OSD nodes will be converted automatically after their adoption
-          finishes.
+          The conversion may take minutes to hours, depending on how much OMAP
+          data the related disk contains. For more details, refer to
+          <link xlink:href="https://docs.ceph.com/en/latest/releases/pacific/#upgrading-non-cephadm-clusters"/>.
         </para>
-        <note>
+        <tip>
           <para>
-            The conversion may take minutes to hours, depending on how much
-            OMAP data the related hard disk contains. For more details, refer
-            to
-            <link
-      xlink:href="https://docs.ceph.com/en/latest/releases/pacific/#upgrading-non-cephadm-clusters"/>.
+            You can run the above commands in parallel on multiple OSD daemons
+            on the same OSD node to help accelerate the upgrade.
           </para>
-        </note>
+        </tip>
       </step>
       <step>
         <para>
@@ -605,51 +607,11 @@ ID   CLASS  WEIGHT   TYPE NAME       STATUS  REWEIGHT  PRI-AFF
       </step>
       <step>
         <para>
-          If the node you are upgrading is an OSD node, follow these steps:
+          If the node you are upgrading is an OSD node, then, after the OSD
+          node with the &salt; minion ID <replaceable>MINION_ID</replaceable>
+          has been rebooted and is now up, run the following command:
         </para>
-        <substeps>
-          <step>
-            <para>
-              At the time the OSD node is rebooted, set the
-              <option>bluestore_fsck_quick_fix_on_mount</option> for each OSD
-              daemon that is deployed on the rebooted node:
-            </para>
-<screen>&prompt.smaster;ceph config set osd.<replaceable>OSD_DAEMON_ID</replaceable> \
- bluestore_fsck_quick_fix_on_mount true</screen>
-          </step>
-          <step>
-            <para>
-              After the OSD node with the &salt; minion ID
-              <replaceable>MINION_ID</replaceable> has been rebooted and now is
-              up, run the following command:
-            </para>
 <screen>&prompt.smaster;salt <replaceable>MINION_ID</replaceable> state.apply ceph.upgrade.ses7.adopt</screen>
-          </step>
-          <step>
-            <para>
-              Run the following commands to perform an offline compaction,
-              enabling a quick fix, and perform an online compaction on each
-              OSD daemon that is deployed on the OSD node identified by the
-              <replaceable>MINION_ID</replaceable>. For example
-            </para>
-<screen>
-&prompt.cephuser;cephadm unit --name osd.<replaceable>OSD_DAEMON_ID</replaceable> stop
-&prompt.cephuser;ceph-kvstore-tool bluestore-kv /var/lib/ceph/263302b4-afa2-11ec-a986-525400af093c/osd.<replaceable>OSD_DAEMON_ID</replaceable> compact
-&prompt.cephuser;cephadm shell --name osd.<replaceable>OSD_DAEMON_ID</replaceable> ceph-bluestore-tool --path /var/lib/ceph/osd/ceph-<replaceable>OSD_DAEMON_ID</replaceable>--command quick-fix
-&prompt.cephuser;cephadm unit --name osd.<replaceable>OSD_DAEMON_ID</replaceable> start
-</screen>
-            <para>
-              Allow the OSD node to be up and in again, then run:
-            </para>
-<screen>&prompt.cephuser;cephadm enter --name osd.<replaceable>OSD_DAEMON_ID</replaceable> ceph daemon osd.<replaceable>OSD_DAEMON_ID</replaceable> compact</screen>
-            <note>
-              <para>
-                You can run the above commands in parallel on multiple OSD
-                daemons on the same OSD node to help accelerate the upgrade.
-              </para>
-            </note>
-          </step>
-        </substeps>
       </step>
       <step>
         <para>