RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-30 23:13:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "stop.sh: use --no-mon-config when trying to unmap rbd devices"

Browse Source 
This reverts commit 6c722cd5f3.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2018-05-09 15:01:18 -04:00
parent 46eafdabde
commit 3c6b015747
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/stop.sh
View File

@ -80,8 +80,8 @@ while [ $# -ge 1 ]; do
done
if [ $stop_all -eq 1 ]; then
if "${CEPH_BIN}"/rbd device list -c $conf_fn --no-mon-config >/dev/null 2>&1; then
"${CEPH_BIN}"/rbd device list -c $conf_fn --no-mon-config | tail -n +2 |
if "${CEPH_BIN}"/rbd device list -c $conf_fn >/dev/null 2>&1; then
"${CEPH_BIN}"/rbd device list -c $conf_fn | tail -n +2 |
while read DEV; do
# While it is currently possible to create an rbd image with
# whitespace chars in its name, krbd will refuse mapping such
@ -89,10 +89,10 @@ if [ $stop_all -eq 1 ]; then
# same goes for whitespace chars in names of the pools that
# contain rbd images).
DEV="$(echo "${DEV}" | tr -s '[:space:]' | awk '{ print $5 }')"
sudo "${CEPH_BIN}"/rbd device unmap "${DEV}" -c $conf_fn --no-mon-config
sudo "${CEPH_BIN}"/rbd device unmap "${DEV}" -c $conf_fn
done
if [ -n "$("${CEPH_BIN}"/rbd device list -c $conf_fn --no-mon-config)" ]; then
if [ -n "$("${CEPH_BIN}"/rbd device list -c $conf_fn)" ]; then
echo "WARNING: Some rbd images are still mapped!" >&2
fi
fi