From a29a3c686e37a465f80c679134edf2fd41b641fc Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Mon, 14 Nov 2016 15:13:52 +0800
Subject: [PATCH] doc: fix the script for rebuild monitor db

- escape the "$" in "$osd", so it won't be expanded by local shell
- fix the permission bits of /var/lib/ceph/mon/mon.0/store.db
- add the doc to explain the step to prepare the keyring

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 doc/rados/troubleshooting/troubleshooting-mon.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/rados/troubleshooting/troubleshooting-mon.rst b/doc/rados/troubleshooting/troubleshooting-mon.rst
index a50db4cb9eb..51b1ccac5dd 100644
--- a/doc/rados/troubleshooting/troubleshooting-mon.rst
+++ b/doc/rados/troubleshooting/troubleshooting-mon.rst
@@ -424,7 +424,7 @@ information stored in OSDs.::
     rm -rf $ms
     ssh user@host <<EOF
       for osd in /var/lib/osd/osd-*; do
-        ceph-objectstore-tool --data-path $osd --op update-mon-db --mon-store-path $ms
+        ceph-objectstore-tool --data-path \$osd --op update-mon-db --mon-store-path $ms
       done
     EOF
     rsync -avz user@host:$ms $ms
@@ -441,11 +441,13 @@ information stored in OSDs.::
   # backup corrupted store.db just in case
   mv /var/lib/ceph/mon/mon.0/store.db /var/lib/ceph/mon/mon.0/store.db.corrupted
   mv /tmp/mon-store/store.db /var/lib/ceph/mon/mon.0/store.db
+  chown -R ceph:ceph /var/lib/ceph/mon/mon.0/store.db
 
 The steps above
 
 #. collect the map from all OSD hosts,
 #. then rebuild the store,
+#. fill the entities in keyring file with appropriate caps
 #. replace the corrupted store on ``mon.0`` with the recovered copy.
 
 Known limitations