tools: fix typos in user-visible message and comments

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/tools/ceph-lazy/ceph-lazy b/src/tools/ceph-lazy/ceph-lazy
index b3caafbbda1b5bded3bea8127d455217d13b0e17..39a331921ac8bb7f17f15de9884c9b064dde1b5b 100755 (executable)
--- a/src/tools/ceph-lazy/ceph-lazy
+++ b/src/tools/ceph-lazy/ceph-lazy
@@ -35,7 +35,7 @@ function echoerr() {
 function help() {
   >&2 echo "Usage : ceph-lazy [-d | -h] [command] [parameters]
 
-Ceph complex quering tool - Version $VERSION
+Ceph complex querying tool - Version $VERSION
 
 OPTIONS
 ========
@@ -174,13 +174,13 @@ function find_prim_pg_from_osd() {
     exit 1
   fi
 
-  [ $DEBUG -eq 1 ] && echoinfo "Looking for primary PGs beloging to OSD $posd"
+  [ $DEBUG -eq 1 ] && echoinfo "Looking for primary PGs belonging to OSD $posd"
   $CEPH pg dump pgs --format json 2>/dev/null | $JQ --argjson posd $posd '.[] | select(.acting_primary==$posd).pgid'
 }
 
 
 #
-#  Print all pgs (primay & secondary) hosted by an OSD
+#  Print all pgs (primary & secondary) hosted by an OSD
 #
 function find_all_pg_from_osd() {
 

diff --git a/src/tools/cephfs/cephfs-shell b/src/tools/cephfs/cephfs-shell
index 08f555a3f720e68ab6ba165c4862a85e50de34c2..def2dc3517c8575b39348375f64f432fc3d83e1d 100644 (file)
--- a/src/tools/cephfs/cephfs-shell
+++ b/src/tools/cephfs/cephfs-shell
@@ -182,7 +182,7 @@ def print_long(shell, file_name, is_dir, human_readable):
 
 def word_len(word):
     """
-    Returns the word lenght, minus any color codes.
+    Returns the word length, minus any color codes.
     """
     if word[0] == '\x1b':
         return len(word) - 9

diff --git a/src/tools/rbd_recover_tool/README b/src/tools/rbd_recover_tool/README
index ccf55498be8081642802a430b5f75e395fe607e4..d289c11caac2a2f27a8fff5755bf050a4011bdea 100644 (file)
--- a/src/tools/rbd_recover_tool/README
+++ b/src/tools/rbd_recover_tool/README
@@ -4,9 +4,9 @@
 
   ceph rbd recover tool is used for recovering ceph rbd image, when all ceph services are killed.
 it is based on ceph-0.80.x (Firefly and newer)
-  currently, ceph service(ceph-mon, ceph-osd) evently are not avaiable caused by bugs or sth else
+  currently, ceph service(ceph-mon, ceph-osd) evently are not available caused by bugs or sth else
 , especially on large scale ceph cluster, so that the ceph cluster can not supply service 
-and rbd images can not be accessed. In this case, a tool to recover rbd image is nessecary.
+and rbd images can not be accessed. In this case, a tool to recover rbd image is necessary.
   ceph rbd recover tool is just used for this, it can collect all objects of an image from distributed
 osd nodes with the latest pg epoch, and splice objects by offset to a complete image. To make sure
 object data is complete, this tool does flush osd journal on each osd node before recovering.
@@ -36,9 +36,9 @@ admin_node -----------+---- osd.1
 admin_node: {rbd-recover-tool  common_h  epoch_h  metadata_h  database_h}
 osd:        {osd_job           common_h  epoch_h  metadata_h} #/var/rbd_tool/osd_job
 in this architecture, admin_node acts as client, osds act as server.
-so, they run diffrent files: 
+so, they run different files: 
 on admin_node run:  rbd-recover-tool <action> [<parameters>]
-on osd node run:    ./osd_job <funtion> <parameters>
+on osd node run:    ./osd_job <function> <parameters>
 admin_node will copy files: osd_job, common_h, epoch_h, metadata_h to remote osd node
 
 
@@ -83,7 +83,7 @@ recover <pool_id><image_name>[@[<snap_name>]] [/path/to/store/image]  #recover im
 if admin_node operation is failed, you can check it on osd node
 cd /var/rbd_tool/osd_job
 ./osd_job <operation>
-<opeartion> :
+<operation> :
 do_image_id <image_id_hobject>         #get image id of image format v2 
 do_image_id <image_header_hobject>     #get image id of image format v1
 do_image_metadata_v1 <image_header_hobject>    #get image metadata of image format v1, maybe pg epoch is not latest

diff --git a/src/tools/rbd_recover_tool/common_h b/src/tools/rbd_recover_tool/common_h
index 187bcd08058395adf58b5c4c8eba65f1ad8b333a..f2df662ad692b7515c97e4ead67958a59afa68d3 100644 (file)
--- a/src/tools/rbd_recover_tool/common_h
+++ b/src/tools/rbd_recover_tool/common_h
@@ -65,7 +65,7 @@ function gen_md5()
 }
 
 # on each osd node
-# check ceph enviroment: ssh, ceph-kvstore-tool, osd_data_path 
+# check ceph environment: ssh, ceph-kvstore-tool, osd_data_path 
 function check_ceph_env()
 {
   local func="check_ceph_env"
@@ -309,7 +309,7 @@ function get_map_header_key()
   local keyword=$1
   local res=`cat $omap_list| grep $keyword`
   if [ "$res"x = ""x ];then
-    #echo "$func: map_header_key = $keyword not exisits"
+    #echo "$func: map_header_key = $keyword not exists"
     exit
   fi
   echo $res|awk -F ":" '{print $2}'

diff --git a/src/tools/rbd_recover_tool/database_h b/src/tools/rbd_recover_tool/database_h
index d72c6be707e5cde834e7b1a61610b7f532879cfd..4ff20425ace528a71be408c2fc6231e495a70cdb 100644 (file)
--- a/src/tools/rbd_recover_tool/database_h
+++ b/src/tools/rbd_recover_tool/database_h
@@ -507,7 +507,7 @@ function discover_image_snap()
   local func="discover_image_snap"
   echo "$func ..."
   if [ $# -lt 3 ];then
-    echo "$func: paramters: <pool_id> <image_name> [<snap_name>]"
+    echo "$func: parameters: <pool_id> <image_name> [<snap_name>]"
     exit
   fi
   local pool_id=$1
@@ -726,7 +726,7 @@ function collect_image_snap_objects()
   fi
  
   # speed up copy snapshot
-  # lookup the coresponding head hobject of snap hobject
+  # lookup the corresponding head hobject of snap hobject
   # use command: grep <offset> <head hobjects>
   # 
   # eg.
@@ -1073,7 +1073,7 @@ function recover_image()
   echo "$func ..."
   
   if [ $# -lt 3 ];then
-    echo "$func: paramters: <pool_id> <image_name> <snap_name> [<backup_dir>]"
+    echo "$func: parameters: <pool_id> <image_name> <snap_name> [<backup_dir>]"
     exit
   fi
 

diff --git a/src/tools/rbd_recover_tool/metadata_h b/src/tools/rbd_recover_tool/metadata_h
index 55c21d2573a91c1847da95ce89e2583cda8a09aa..4aa491b5bd7b83185be7ccc874bca5a066afebdb 100644 (file)
--- a/src/tools/rbd_recover_tool/metadata_h
+++ b/src/tools/rbd_recover_tool/metadata_h
@@ -66,7 +66,7 @@ function get_image_format_by_hobject()
 }
 
 #======================================== image format v1 ========================================  
-# <image_name>.rbd inlude 3 parts:
+# <image_name>.rbd include 3 parts:
 # header + snap_count*snapshot + snap_count*snap_name
 # 
 # struct rbd_obj_header_ondisk {

diff --git a/src/tools/rbd_recover_tool/rbd-recover-tool b/src/tools/rbd_recover_tool/rbd-recover-tool
index 70f4e7c1dc6f19dbf696e5940f4f3b54fa3b0689..b7a258650e5f27e32bd366964b7582c4dfb3cdb6 100755 (executable)
--- a/src/tools/rbd_recover_tool/rbd-recover-tool
+++ b/src/tools/rbd_recover_tool/rbd-recover-tool
@@ -192,7 +192,7 @@ function usage()
                        before to lookup & recover"
   echo "$cmd_name lookup  <pool_id>/<image_name>[@[<snap_name>]]
                        show image metadata: image format, rbd id, size, order, snapseq
-                       In addtion, for image with snapshots, 
+                       In addition, for image with snapshots, 
                        this will list all snapshot infomations"
   echo "$cmd_name recover <pool_id>/<image_name>[@[<snap_name>]] [</path/to/store/image>]
                        all snapshots share one image head, to economize disk space