doc/rados/operations/bluestore-migration: use the new 'safe-to-destroy' command

Also use 'ceph osd ls-tree' to enumerate the ids.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 39c02728b7db3537621167f29651aef97184e8e4)

diff --git a/doc/rados/operations/bluestore-migration.rst b/doc/rados/operations/bluestore-migration.rst
index dafa26a17ef8cb5e656507398d39c864aeabd87f..06e526aebf10e1628c13eac52115b58c4bbcf4db 100644 (file)
--- a/doc/rados/operations/bluestore-migration.rst
+++ b/doc/rados/operations/bluestore-migration.rst
@@ -55,7 +55,7 @@ more data migration than should be necessary, so it is not optimal.
 
 #. Wait for the data to migrate off the OSD in question::
 
-     while ! ceph health | grep HEALTH_OK ; do sleep 60 ; done
+     while ! ceph osd safe-to-destroy $ID ; sleep 60 ; done
 
 #. Stop the OSD::
 
@@ -168,7 +168,7 @@ the data migrating only once.
 
 #. Wait for data migration to complete::
 
-     while ! ceph health | grep HEALTH_OK ; do sleep 60 ; done
+     while ! ceph osd safe-to-destroy $(ceph osd ls-tree $OLDHOST); do sleep 60 ; done
 
 #. Stop all old OSDs on the now-empty ``$OLDHOST``::
 
@@ -178,7 +178,7 @@ the data migrating only once.
 
 #. Destroy and purge the old OSDs::
 
-     for osd in `ceph osd crush ls $OLDHOST`; do
+     for osd in `ceph osd ls-tree $OLDHOST`; do
          ceph osd purge $osd --yes-i-really-mean-it
      done