From 2cbba835aa9285d6f4e683ec38c4a5c4033c98c0 Mon Sep 17 00:00:00 2001
From: Shengjing Zhu <i@zhsj.me>
Date: Sat, 10 Mar 2018 22:36:31 +0800
Subject: [PATCH] misc: fix various spelling errors

Signed-off-by: Shengjing Zhu <i@zhsj.me>
---
 doc/man/8/ceph-bluestore-tool.rst   |  2 +-
 qa/tasks/ceph.py                    |  4 ++--
 qa/tasks/mds_thrash.py              |  2 +-
 src/cls/rgw/cls_rgw.cc              |  6 +++---
 src/common/legacy_config_opts.h     |  2 +-
 src/common/options.cc               |  6 +++---
 src/java/native/libcephfs_jni.cc    |  2 +-
 src/journal/JournalPlayer.cc        |  2 +-
 src/librbd/image/OpenRequest.cc     |  6 +++---
 src/librbd/mirror/DisableRequest.cc |  2 +-
 src/librbd/mirror/EnableRequest.cc  |  2 +-
 src/mds/CDir.cc                     |  2 +-
 src/msg/async/PosixStack.cc         |  2 +-
 src/os/bluestore/BlueStore.cc       |  2 +-
 src/os/bluestore/NVMEDevice.cc      |  2 +-
 src/os/bluestore/bluestore_tool.cc  | 10 +++++-----
 src/pybind/rados/rados.pyx          |  8 ++++----
 src/pybind/rbd/rbd.pyx              |  2 +-
 src/test/objectstore/store_test.cc  |  2 +-
 src/tools/ceph_monstore_tool.cc     |  2 +-
 src/tools/monmaptool.cc             |  2 +-
 src/tools/rbd/action/Journal.cc     |  2 +-
 src/tools/rbd/action/Kernel.cc      |  2 +-
 src/tools/rbd_nbd/rbd-nbd.cc        |  2 +-
 24 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/doc/man/8/ceph-bluestore-tool.rst b/doc/man/8/ceph-bluestore-tool.rst
index 9e732a7abef..6ac9f97417c 100644
--- a/doc/man/8/ceph-bluestore-tool.rst
+++ b/doc/man/8/ceph-bluestore-tool.rst
@@ -96,7 +96,7 @@ device.  You can dump the contents of the label with::
 
 The main device will have a lot of metadata, including information
 that used to be stored in small files in the OSD data directory.  The
-auxilliary devices (db and wal) will only have the minimum required
+auxiliary devices (db and wal) will only have the minimum required
 fields (OSD UUID, size, device type, birth time).
 
 OSD directory priming
diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index bcd39487115..816191c5a78 100644
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -258,7 +258,7 @@ def assign_devs(roles, devs):
 def valgrind_post(ctx, config):
     """
     After the tests run, look throught all the valgrind logs.  Exceptions are raised
-    if textual errors occured in the logs, or if valgrind exceptions were detected in
+    if textual errors occurred in the logs, or if valgrind exceptions were detected in
     the logs.
 
     :param ctx: Context
@@ -399,7 +399,7 @@ def cluster(ctx, config):
         Mkfs mon nodes.
 
     On exit:
-        If errors occured, extract a failure message and store in ctx.summary.
+        If errors occurred, extract a failure message and store in ctx.summary.
         Unmount all test files and temporary journaling files.
         Save the monitor information and archive all ceph logs.
         Cleanup the keyring setup, and remove all monitor map and data files left over.
diff --git a/qa/tasks/mds_thrash.py b/qa/tasks/mds_thrash.py
index 75d236d105e..5349296f6ab 100644
--- a/qa/tasks/mds_thrash.py
+++ b/qa/tasks/mds_thrash.py
@@ -230,7 +230,7 @@ class MDSThrasher(Greenlet):
             self.do_thrash()
         except Exception as e:
             # Log exceptions here so we get the full backtrace (gevent loses them).
-            # Also allow succesful completion as gevent exception handling is a broken mess:
+            # Also allow successful completion as gevent exception handling is a broken mess:
             #
             # 2017-02-03T14:34:01.259 CRITICAL:root:  File "gevent.libev.corecext.pyx", line 367, in gevent.libev.corecext.loop.handle_error (src/gevent/libev/gevent.corecext.c:5051)
             #   File "/home/teuthworker/src/git.ceph.com_git_teuthology_master/virtualenv/local/lib/python2.7/site-packages/gevent/hub.py", line 558, in handle_error
diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc
index d55576f008e..4556bcc99a8 100644
--- a/src/cls/rgw/cls_rgw.cc
+++ b/src/cls/rgw/cls_rgw.cc
@@ -2500,7 +2500,7 @@ static int rgw_bi_list_op(cls_method_context_t hctx, bufferlist *in, bufferlist
   bool more;
   int ret = list_plain_entries(hctx, op.name, op.marker, max, &op_ret.entries, &more); 
   if (ret < 0) {
-    CLS_LOG(0, "ERROR: %s(): list_plain_entries retured ret=%d", __func__, ret);
+    CLS_LOG(0, "ERROR: %s(): list_plain_entries returned ret=%d", __func__, ret);
     return ret;
   }
   int count = ret;
@@ -2510,7 +2510,7 @@ static int rgw_bi_list_op(cls_method_context_t hctx, bufferlist *in, bufferlist
   if (!more) {
     ret = list_instance_entries(hctx, op.name, op.marker, max - count, &op_ret.entries, &more);
     if (ret < 0) {
-      CLS_LOG(0, "ERROR: %s(): list_instance_entries retured ret=%d", __func__, ret);
+      CLS_LOG(0, "ERROR: %s(): list_instance_entries returned ret=%d", __func__, ret);
       return ret;
     }
 
@@ -2520,7 +2520,7 @@ static int rgw_bi_list_op(cls_method_context_t hctx, bufferlist *in, bufferlist
   if (!more) {
     ret = list_olh_entries(hctx, op.name, op.marker, max - count, &op_ret.entries, &more);
     if (ret < 0) {
-      CLS_LOG(0, "ERROR: %s(): list_olh_entries retured ret=%d", __func__, ret);
+      CLS_LOG(0, "ERROR: %s(): list_olh_entries returned ret=%d", __func__, ret);
       return ret;
     }
 
diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index b1d245e4271..8b18c05bb7a 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -1509,7 +1509,7 @@ OPTION(throttler_perf_counter, OPT_BOOL) // enable/disable throttler perf counte
 
 /* The following are tunables for torrent data */
 OPTION(rgw_torrent_flag, OPT_BOOL)    // produce torrent function flag
-OPTION(rgw_torrent_tracker, OPT_STR)    // torrent field annouce and annouce list
+OPTION(rgw_torrent_tracker, OPT_STR)    // torrent field announce and announce list
 OPTION(rgw_torrent_createby, OPT_STR)    // torrent field created by
 OPTION(rgw_torrent_comment, OPT_STR)    // torrent field comment
 OPTION(rgw_torrent_encoding, OPT_STR)    // torrent field encoding
diff --git a/src/common/options.cc b/src/common/options.cc
index 25f70032848..aced1b52d8f 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -5570,7 +5570,7 @@ std::vector<Option> get_rgw_options() {
     .set_default(0)
     .set_description("HTTP return code override for object creation")
     .set_long_description(
-        "If not zero, this is the HTTP return code that will be returned on a succesful S3 "
+        "If not zero, this is the HTTP return code that will be returned on a successful S3 "
         "object creation."),
 
     Option("rgw_resolve_cname", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
@@ -5864,7 +5864,7 @@ std::vector<Option> get_rgw_options() {
     .set_description("Length of time to aggregate metadata changes")
     .set_long_description(
         "Length of time (in milliseconds) in which the master zone aggregates all the "
-        "metadata changes that occured, before sending notifications to all the other "
+        "metadata changes that occurred, before sending notifications to all the other "
         "zones."),
 
     Option("rgw_run_sync_thread", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
@@ -6014,7 +6014,7 @@ std::vector<Option> get_rgw_options() {
 
     Option("rgw_torrent_tracker", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("")
-    .set_description("Torrent field annouce and annouce list"),
+    .set_description("Torrent field announce and announce list"),
 
     Option("rgw_torrent_createby", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("")
diff --git a/src/java/native/libcephfs_jni.cc b/src/java/native/libcephfs_jni.cc
index 79a2d778dde..74ef8dcdd86 100644
--- a/src/java/native/libcephfs_jni.cc
+++ b/src/java/native/libcephfs_jni.cc
@@ -265,7 +265,7 @@ static void handle_error(JNIEnv *env, int rc)
 /*
  * Cast a jlong to ceph_mount_info. Each JNI function is expected to pass in
  * the class instance variable instance_ptr. Passing a parameter is faster
- * than reaching back into Java via an upcall to retreive this pointer.
+ * than reaching back into Java via an upcall to retrieve this pointer.
  */
 static inline struct ceph_mount_info *get_ceph_mount(jlong j_mntp)
 {
diff --git a/src/journal/JournalPlayer.cc b/src/journal/JournalPlayer.cc
index c038b8dac64..51180218080 100644
--- a/src/journal/JournalPlayer.cc
+++ b/src/journal/JournalPlayer.cc
@@ -502,7 +502,7 @@ void JournalPlayer::prune_tag(uint64_t tag_tid) {
 
   // avoid watch delay when pruning stale tags from journal objects
   if (pruned) {
-    ldout(m_cct, 15) << __func__ << ": reseting refetch state to immediate"
+    ldout(m_cct, 15) << __func__ << ": resetting refetch state to immediate"
                      << dendl;
     for (auto &player_pair : m_object_players) {
       ObjectPlayerPtr object_player(player_pair.second);
diff --git a/src/librbd/image/OpenRequest.cc b/src/librbd/image/OpenRequest.cc
index 009541e2f24..b5e7415a4c4 100644
--- a/src/librbd/image/OpenRequest.cc
+++ b/src/librbd/image/OpenRequest.cc
@@ -175,7 +175,7 @@ Context *OpenRequest<I>::handle_v2_get_name(int *result) {
     *result = cls_client::dir_get_name_finish(&it, &m_image_ctx->name);
   }
   if (*result < 0 && *result != -ENOENT) {
-    lderr(cct) << "failed to retreive name: "
+    lderr(cct) << "failed to retrieve name: "
                << cpp_strerror(*result) << dendl;
     send_close_image(*result);
   } else if (*result == -ENOENT) {
@@ -224,7 +224,7 @@ Context *OpenRequest<I>::handle_v2_get_name_from_trash(int *result) {
       ldout(cct, 5) << "failed to retrieve name for image id "
                     << m_image_ctx->id << dendl;
     } else {
-      lderr(cct) << "failed to retreive name from trash: "
+      lderr(cct) << "failed to retrieve name from trash: "
                  << cpp_strerror(*result) << dendl;
     }
     send_close_image(*result);
@@ -266,7 +266,7 @@ Context *OpenRequest<I>::handle_v2_get_initial_metadata(int *result) {
       &it, &m_image_ctx->object_prefix, &m_image_ctx->order, &m_image_ctx->features);
   }
   if (*result < 0) {
-    lderr(cct) << "failed to retreive initial metadata: "
+    lderr(cct) << "failed to retrieve initial metadata: "
                << cpp_strerror(*result) << dendl;
     send_close_image(*result);
     return nullptr;
diff --git a/src/librbd/mirror/DisableRequest.cc b/src/librbd/mirror/DisableRequest.cc
index 2d9bb371eb5..7968284792a 100644
--- a/src/librbd/mirror/DisableRequest.cc
+++ b/src/librbd/mirror/DisableRequest.cc
@@ -72,7 +72,7 @@ Context *DisableRequest<I>::handle_get_mirror_image(int *result) {
       ldout(cct, 5) << this << " " << __func__
                     << ": mirroring is not supported by OSD" << dendl;
     } else {
-      lderr(cct) << "failed to retreive mirror image: " << cpp_strerror(*result)
+      lderr(cct) << "failed to retrieve mirror image: " << cpp_strerror(*result)
                  << dendl;
     }
     return m_on_finish;
diff --git a/src/librbd/mirror/EnableRequest.cc b/src/librbd/mirror/EnableRequest.cc
index a3ab8ad5c19..431a2085e7a 100644
--- a/src/librbd/mirror/EnableRequest.cc
+++ b/src/librbd/mirror/EnableRequest.cc
@@ -73,7 +73,7 @@ Context *EnableRequest<I>::handle_get_mirror_image(int *result) {
   }
 
   if (*result != -ENOENT) {
-    lderr(m_cct) << "failed to retreive mirror image: " << cpp_strerror(*result)
+    lderr(m_cct) << "failed to retrieve mirror image: " << cpp_strerror(*result)
                  << dendl;
     return m_on_finish;
   }
diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index d3aba6af290..e261e4ecc03 100644
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -1739,7 +1739,7 @@ CDentry *CDir::_load_dentry(
         dn->link_remote(dn->get_linkage(), in);
         dout(12) << "_fetched  got remote link " << ino << " which we have " << *in << dendl;
       } else {
-        dout(12) << "_fetched  got remote link " << ino << " (dont' have it)" << dendl;
+        dout(12) << "_fetched  got remote link " << ino << " (don't have it)" << dendl;
       }
     }
   } 
diff --git a/src/msg/async/PosixStack.cc b/src/msg/async/PosixStack.cc
index e966621c7ad..9a2ceab6b85 100644
--- a/src/msg/async/PosixStack.cc
+++ b/src/msg/async/PosixStack.cc
@@ -73,7 +73,7 @@ class PosixConnectedSocketImpl final : public ConnectedSocketImpl {
   }
 
   // return the sent length
-  // < 0 means error occured
+  // < 0 means error occurred
   static ssize_t do_sendmsg(int fd, struct msghdr &msg, unsigned len, bool more)
   {
     size_t sent = 0;
diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index c8f90f67f9e..0863cbc7fb7 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -3788,7 +3788,7 @@ void BlueStore::_set_compression()
 
   if (comp_mode == Compressor::COMP_NONE) {
     dout(10) << __func__ << " compression mode set to 'none', "
-             << "ignore other compression setttings" << dendl;
+             << "ignore other compression settings" << dendl;
     return;
   }
 
diff --git a/src/os/bluestore/NVMEDevice.cc b/src/os/bluestore/NVMEDevice.cc
index 3289a4e8540..0852d82466a 100644
--- a/src/os/bluestore/NVMEDevice.cc
+++ b/src/os/bluestore/NVMEDevice.cc
@@ -509,7 +509,7 @@ class NVMEManager {
 
     // only support one device per osd now!
     assert(shared_driver_datas.empty());
-    // index 0 is occured by master thread
+    // index 0 is occurred by master thread
     shared_driver_datas.push_back(new SharedDriverData(shared_driver_datas.size()+1, sn_tag, c, ns));
     *driver = shared_driver_datas.back();
   }
diff --git a/src/os/bluestore/bluestore_tool.cc b/src/os/bluestore/bluestore_tool.cc
index f8fbaeb0af7..94f3fd2e7d4 100644
--- a/src/os/bluestore/bluestore_tool.cc
+++ b/src/os/bluestore/bluestore_tool.cc
@@ -151,9 +151,9 @@ BlueFS *open_bluefs(
   return fs;
 }
 
-void infering_bluefs_devices(vector<string>& devs, std::string& path)
+void inferring_bluefs_devices(vector<string>& devs, std::string& path)
 {
-  cout << "infering bluefs devices from bluestore path" << std::endl;
+  cout << "inferring bluefs devices from bluestore path" << std::endl;
   for (auto fn : {"block", "block.wal", "block.db"}) {
     string p = path + "/" + fn;
     struct stat st;
@@ -254,7 +254,7 @@ int main(int argc, char **argv)
       exit(EXIT_FAILURE);
     }
     if (devs.empty())
-      infering_bluefs_devices(devs, path);
+      inferring_bluefs_devices(devs, path);
   }
   if (action == "bluefs-export" || action == "bluefs-log-dump") {
     if (path.empty()) {
@@ -265,14 +265,14 @@ int main(int argc, char **argv)
       cerr << "must specify out-dir to export bluefs" << std::endl;
       exit(EXIT_FAILURE);
     }
-    infering_bluefs_devices(devs, path);
+    inferring_bluefs_devices(devs, path);
   }
   if (action == "bluefs-bdev-sizes" || action == "bluefs-bdev-expand") {
     if (path.empty()) {
       cerr << "must specify bluestore path" << std::endl;
       exit(EXIT_FAILURE);
     }
-    infering_bluefs_devices(devs, path);
+    inferring_bluefs_devices(devs, path);
   }
 
   vector<const char*> args;
diff --git a/src/pybind/rados/rados.pyx b/src/pybind/rados/rados.pyx
index 8870c789eb6..017b2e027ff 100644
--- a/src/pybind/rados/rados.pyx
+++ b/src/pybind/rados/rados.pyx
@@ -3260,7 +3260,7 @@ returned %d, but should return zero on success." % (self.name, ret))
     @requires(('write_op', WriteOp), ('oid', str_type), ('mtime', opt(int)), ('flags', opt(int)))
     def operate_write_op(self, write_op, oid, mtime=0, flags=LIBRADOS_OPERATION_NOFLAG):
         """
-        excute the real write operation
+        execute the real write operation
         :para write_op: write operation object
         :type write_op: WriteOp
         :para oid: object name
@@ -3286,7 +3286,7 @@ returned %d, but should return zero on success." % (self.name, ret))
     @requires(('write_op', WriteOp), ('oid', str_type), ('oncomplete', opt(Callable)), ('onsafe', opt(Callable)), ('mtime', opt(int)), ('flags', opt(int)))
     def operate_aio_write_op(self, write_op, oid, oncomplete=None, onsafe=None, mtime=0, flags=LIBRADOS_OPERATION_NOFLAG):
         """
-        excute the real write operation asynchronously
+        execute the real write operation asynchronously
         :para write_op: write operation object
         :type write_op: WriteOp
         :para oid: object name
@@ -3328,7 +3328,7 @@ returned %d, but should return zero on success." % (self.name, ret))
     @requires(('read_op', ReadOp), ('oid', str_type), ('flag', opt(int)))
     def operate_read_op(self, read_op, oid, flag=LIBRADOS_OPERATION_NOFLAG):
         """
-        excute the real read operation
+        execute the real read operation
         :para read_op: read operation object
         :type read_op: ReadOp
         :para oid: object name
@@ -3350,7 +3350,7 @@ returned %d, but should return zero on success." % (self.name, ret))
     @requires(('read_op', ReadOp), ('oid', str_type), ('oncomplete', opt(Callable)), ('onsafe', opt(Callable)), ('flag', opt(int)))
     def operate_aio_read_op(self, read_op, oid, oncomplete=None, onsafe=None, flag=LIBRADOS_OPERATION_NOFLAG):
         """
-        excute the real read operation
+        execute the real read operation
         :para read_op: read operation object
         :type read_op: ReadOp
         :para oid: object name
diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx
index 65c2e328feb..e2ba0f7978c 100644
--- a/src/pybind/rbd/rbd.pyx
+++ b/src/pybind/rbd/rbd.pyx
@@ -3157,7 +3157,7 @@ written." % (self.name, ret, length))
 
     def aio_flush(self, oncomplete):
         """
-        Asyncronously wait until all writes are fully flushed if caching is
+        Asynchronously wait until all writes are fully flushed if caching is
         enabled.
         """
 
diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
index 432c3c8c512..2a76a84c6a6 100644
--- a/src/test/objectstore/store_test.cc
+++ b/src/test/objectstore/store_test.cc
@@ -1762,7 +1762,7 @@ TEST_P(StoreTestSpecificAUSize, BluestoreFragmentedBlobTest) {
     t.write(cid, hoid, 0, 0x30000, bl);
     t.zero(cid, hoid, 0, 0x10000);
     t.zero(cid, hoid, 0x20000, 0x10000);
-    cerr << "Rewrite an object and create two holes at the begining and the end" << std::endl;
+    cerr << "Rewrite an object and create two holes at the beginning and the end" << std::endl;
     r = queue_transaction(store, ch, std::move(t));
     ASSERT_EQ(r, 0);
 
diff --git a/src/tools/ceph_monstore_tool.cc b/src/tools/ceph_monstore_tool.cc
index ec573fab26a..961490ba7de 100644
--- a/src/tools/ceph_monstore_tool.cc
+++ b/src/tools/ceph_monstore_tool.cc
@@ -878,7 +878,7 @@ int main(int argc, char **argv) {
       ("version,v", po::value<unsigned>(&v),
        "map version to obtain")
       ("readable,r", po::value<bool>(&readable)->default_value(false),
-       "print the map infomation in human readable format")
+       "print the map information in human readable format")
       ;
     // this is going to be a positional argument; we don't want to show
     // it as an option during --help, but we do want to have it captured
diff --git a/src/tools/monmaptool.cc b/src/tools/monmaptool.cc
index 067e2fa5926..85012201364 100644
--- a/src/tools/monmaptool.cc
+++ b/src/tools/monmaptool.cc
@@ -157,7 +157,7 @@ bool handle_features(list<feature_op_t>& lst, MonMap &m)
         target.unset_feature(f.feature);
       }
     } else {
-      cerr << "unknow feature operation type '" << f.op << "'" << std::endl; 
+      cerr << "unknown feature operation type '" << f.op << "'" << std::endl;
     }
   }
   return modified;
diff --git a/src/tools/rbd/action/Journal.cc b/src/tools/rbd/action/Journal.cc
index e216a0a13ae..734831d2286 100644
--- a/src/tools/rbd/action/Journal.cc
+++ b/src/tools/rbd/action/Journal.cc
@@ -674,7 +674,7 @@ public:
       return false;
     }
     if (r != entry_size) {
-      std::cerr << "rbd: error reading from stdin: trucated"
+      std::cerr << "rbd: error reading from stdin: truncated"
 		<< std::endl;
       r = -EINVAL;
       return false;
diff --git a/src/tools/rbd/action/Kernel.cc b/src/tools/rbd/action/Kernel.cc
index b134a674187..cbcff9c76a3 100644
--- a/src/tools/rbd/action/Kernel.cc
+++ b/src/tools/rbd/action/Kernel.cc
@@ -326,7 +326,7 @@ static int do_kernel_map(const char *poolname, const char *imgname,
 
   r = krbd_is_mapped(krbd, poolname, imgname, snapname, &devnode);
   if (r < 0) {
-    std::cerr << "rbd: warning: can't get image map infomation: "
+    std::cerr << "rbd: warning: can't get image map information: "
 	      << cpp_strerror(r) << std::endl;
   } else if (r > 0) {
     std::cerr << "rbd: warning: image already mapped as " << devnode
diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
index 1ef12b481d0..c4b6fda1255 100644
--- a/src/tools/rbd_nbd/rbd-nbd.cc
+++ b/src/tools/rbd_nbd/rbd-nbd.cc
@@ -448,7 +448,7 @@ std::ostream &operator<<(std::ostream &os, const NBDServer::IOContext &ctx) {
     os << " TRIM ";
     break;
   default:
-    os << " UNKNOW(" << ctx.command << ") ";
+    os << " UNKNOWN(" << ctx.command << ") ";
     break;
   }
 
-- 
2.39.5