From: Shengjing Zhu <i@zhsj.me>
Date: Sat, 10 Mar 2018 14:36:31 +0000 (+0800)
Subject: fix various spelling errors
X-Git-Tag: archive/raspbian/12.2.11+dfsg1-2+rpi1^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2d391ae5c999dcb6d086fd6221949657f35d59ca;p=ceph.git

fix various spelling errors

Forwarded: https://github.com/ceph/ceph/pull/20831

Gbp-Pq: Name 0010-fix-various-spelling-errors.patch
---

diff --git a/doc/man/8/ceph-bluestore-tool.rst b/doc/man/8/ceph-bluestore-tool.rst
index f5e5fe2b8..4bb108212 100644
--- a/doc/man/8/ceph-bluestore-tool.rst
+++ b/doc/man/8/ceph-bluestore-tool.rst
@@ -97,7 +97,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/doc/man/8/ceph-detect-init.rst b/doc/man/8/ceph-detect-init.rst
index c409a949d..cbfcbeb2c 100644
--- a/doc/man/8/ceph-detect-init.rst
+++ b/doc/man/8/ceph-detect-init.rst
@@ -34,7 +34,7 @@ Options
 
 .. option:: --default INIT
 
-   If the init system of the host operating system is unkown, return
+   If the init system of the host operating system is unknown, return
    the value of *INIT* instead of failing with an error.
 
 .. option:: --verbose
diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index f61047d98..deeaf3a86 100644
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -257,7 +257,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
@@ -398,7 +398,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 75d236d10..5349296f6 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 fba47d460..935f58b2f 100644
--- a/src/cls/rgw/cls_rgw.cc
+++ b/src/cls/rgw/cls_rgw.cc
@@ -2532,7 +2532,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;
@@ -2542,7 +2542,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;
     }
 
@@ -2552,7 +2552,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 828697758..2f5caa906 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -1558,7 +1558,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 231a7651b..6c1826710 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -5186,7 +5186,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)
@@ -5494,7 +5494,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)
@@ -5639,7 +5639,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 080ec3cbd..600ba4fdd 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 73c672b31..c78993249 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 531a820c0..c2c5f07fa 100644
--- a/src/librbd/image/OpenRequest.cc
+++ b/src/librbd/image/OpenRequest.cc
@@ -181,7 +181,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) {
@@ -231,7 +231,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);
@@ -273,7 +273,7 @@ Context *OpenRequest<I>::handle_v2_get_immutable_metadata(int *result) {
       &it, &m_image_ctx->object_prefix, &m_image_ctx->order);
   }
   if (*result < 0) {
-    lderr(cct) << "failed to retreive immutable metadata: "
+    lderr(cct) << "failed to retrieve immutable metadata: "
                << cpp_strerror(*result) << dendl;
     send_close_image(*result);
   } else {
diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index bd77bb439..7436b9626 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -1354,7 +1354,7 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) {
       r = cls_client::dir_get_id(&io_ctx, RBD_DIRECTORY, image_name, &image_id);
       if (r < 0) {
         if (r != -ENOENT) {
-          ldout(cct, 2) << "error reading image id from dirctory: "
+          ldout(cct, 2) << "error reading image id from directory: "
                         << cpp_strerror(-r) << dendl;
         }
         return r;
diff --git a/src/librbd/mirror/DisableRequest.cc b/src/librbd/mirror/DisableRequest.cc
index 3cfe73a25..8359e379d 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 3a94096eb..a1d6aff7e 100644
--- a/src/librbd/mirror/EnableRequest.cc
+++ b/src/librbd/mirror/EnableRequest.cc
@@ -108,7 +108,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 c3ffbc796..7fa8d803a 100644
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -1740,7 +1740,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 916930509..21b999b0d 100644
--- a/src/msg/async/PosixStack.cc
+++ b/src/msg/async/PosixStack.cc
@@ -75,7 +75,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 6d601aaac..5902c6bd9 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -3856,7 +3856,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 a5fc53ab8..dd96c685d 100644
--- a/src/os/bluestore/NVMEDevice.cc
+++ b/src/os/bluestore/NVMEDevice.cc
@@ -628,7 +628,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 746ba8222..5efdcec7e 100644
--- a/src/os/bluestore/bluestore_tool.cc
+++ b/src/os/bluestore/bluestore_tool.cc
@@ -236,7 +236,7 @@ int main(int argc, char **argv)
       exit(EXIT_FAILURE);
     }
     if (devs.empty()) {
-      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;
@@ -255,7 +255,7 @@ int main(int argc, char **argv)
       cerr << "must specify out-dir to export bluefs" << std::endl;
       exit(EXIT_FAILURE);
     }
-    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;
@@ -269,7 +269,7 @@ int main(int argc, char **argv)
       cerr << "must specify bluestore path" << std::endl;
       exit(EXIT_FAILURE);
     }
-    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;
diff --git a/src/pybind/rados/rados.pyx b/src/pybind/rados/rados.pyx
index 431f5a9f8..ea7d66144 100644
--- a/src/pybind/rados/rados.pyx
+++ b/src/pybind/rados/rados.pyx
@@ -3312,7 +3312,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
@@ -3338,7 +3338,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
@@ -3380,7 +3380,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
@@ -3402,7 +3402,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 0013ae27b..e754218ef 100644
--- a/src/pybind/rbd/rbd.pyx
+++ b/src/pybind/rbd/rbd.pyx
@@ -2659,7 +2659,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 326c9785d..a30b4f904 100644
--- a/src/test/objectstore/store_test.cc
+++ b/src/test/objectstore/store_test.cc
@@ -1724,7 +1724,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 = apply_transaction(store, &osr, std::move(t));
     ASSERT_EQ(r, 0);
 
diff --git a/src/test/osd/TestOSDMap.cc b/src/test/osd/TestOSDMap.cc
index 251ae4d99..0d650f937 100644
--- a/src/test/osd/TestOSDMap.cc
+++ b/src/test/osd/TestOSDMap.cc
@@ -207,7 +207,7 @@ TEST_F(OSDMapTest, Features) {
   ASSERT_TRUE(features & CEPH_FEATURE_CRUSH_TUNABLES2);
   ASSERT_TRUE(features & CEPH_FEATURE_CRUSH_TUNABLES3);
   ASSERT_TRUE(features & CEPH_FEATURE_CRUSH_V2);
-  ASSERT_FALSE(features & CEPH_FEATURE_OSD_ERASURE_CODES);  // dont' need this
+  ASSERT_FALSE(features & CEPH_FEATURE_OSD_ERASURE_CODES);  // don't need this
   ASSERT_TRUE(features & CEPH_FEATURE_OSDHASHPSPOOL);
   ASSERT_TRUE(features & CEPH_FEATURE_OSD_PRIMARY_AFFINITY);
 
diff --git a/src/tools/ceph_monstore_tool.cc b/src/tools/ceph_monstore_tool.cc
index 0ad652d61..4b4c21775 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 0972faf18..6867a9588 100644
--- a/src/tools/monmaptool.cc
+++ b/src/tools/monmaptool.cc
@@ -158,7 +158,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 20868721e..55a96dded 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_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
index aefdbd36e..d7d8e73f0 100644
--- a/src/tools/rbd_nbd/rbd-nbd.cc
+++ b/src/tools/rbd_nbd/rbd-nbd.cc
@@ -437,7 +437,7 @@ std::ostream &operator<<(std::ostream &os, const NBDServer::IOContext &ctx) {
     os << " TRIM ";
     break;
   default:
-    os << " UNKNOW(" << ctx.command << ") ";
+    os << " UNKNOWN(" << ctx.command << ") ";
     break;
   }