From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 23 Jun 2022 01:24:32 +0000 (-0400) Subject: rbd: fix spelling errors X-Git-Tag: v19.0.0~1333^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=965ee91d3fee5b0852dbfd3d8cbcd0f9a0756a41;p=ceph.git rbd: fix spelling errors * acquire * are * asynchronous * attempt * bootstrap * concurrent * consume * couldn't * cumulative * disable * disabling * disaster * disconnected * endianness * entries * exclusive * filesystem * flag * generic * github * image * information * initiating * latency * limitations * metadata * modify * namespace * noautoconsole * ourselves * prefetch * propagate * protection * recorder * recover * release * replicated * reserved * selection * sentinel * several * snapshot * source * specifying * suppress * synchronize * the * transfer * triggering * unknown * validation * version * visible * write log entries Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- diff --git a/qa/tasks/qemu.py b/qa/tasks/qemu.py index 6533026b4abb8..336d2a0fe671a 100644 --- a/qa/tasks/qemu.py +++ b/qa/tasks/qemu.py @@ -654,7 +654,7 @@ def task(ctx, config): action: create / clone / none (optional, defaults to create) image_name: (optional) parent_name: (if action == clone), - type: filesystem / block (optional, defaults to fileystem) + type: filesystem / block (optional, defaults to filesystem) image_url: (optional), image_size: (optional) encryption_format: luks1 / luks2 / none (optional, defaults to none) diff --git a/qa/tasks/rbd_fio.py b/qa/tasks/rbd_fio.py index 959d07d49ae0e..2eff607fd245b 100644 --- a/qa/tasks/rbd_fio.py +++ b/qa/tasks/rbd_fio.py @@ -87,7 +87,7 @@ def run_rbd_map(remote, image, iodepth): def run_fio(remote, config, rbd_test_dir): """ create fio config file with options based on above config - get the fio from github, generate binary, and use it to run on + get the fio from GitHub, generate binary, and use it to run on the generated fio config file """ fio_config=NamedTemporaryFile(mode='w', prefix='fio_rbd_', dir='/tmp/', delete=False) diff --git a/qa/workunits/rbd/concurrent.sh b/qa/workunits/rbd/concurrent.sh index abaad75f58182..da6c8e577baff 100755 --- a/qa/workunits/rbd/concurrent.sh +++ b/qa/workunits/rbd/concurrent.sh @@ -26,7 +26,7 @@ # the background. # # An iteration of the test consists of performing some number of -# passes, initating each pass as a background job, and finally +# passes, initiating each pass as a background job, and finally # sleeping for a variable delay. The delay is initially a specified # value, but each iteration shortens that proportionally, such that # the last iteration will not delay at all. diff --git a/qa/workunits/rbd/image_read.sh b/qa/workunits/rbd/image_read.sh index ddca8356ef6b7..63367147dc065 100755 --- a/qa/workunits/rbd/image_read.sh +++ b/qa/workunits/rbd/image_read.sh @@ -219,7 +219,7 @@ function parseargs() { echo " object order is ${OBJECT_ORDER}, so" \ "objects are ${OBJECT_SIZE} bytes" echo " page size is ${PAGE_SIZE} bytes, so" \ - "there are are ${OBJECT_PAGES} pages in an object" + "there are ${OBJECT_PAGES} pages in an object" echo " derived image size is ${IMAGE_SIZE} MB, so" \ "there are ${IMAGE_OBJECTS} objects in an image" if [ "${TEST_CLONES}" = true ]; then diff --git a/qa/workunits/windows/libvirt_vm/setup.sh b/qa/workunits/windows/libvirt_vm/setup.sh index 51e91ec42b1ae..001958a58090b 100755 --- a/qa/workunits/windows/libvirt_vm/setup.sh +++ b/qa/workunits/windows/libvirt_vm/setup.sh @@ -77,7 +77,7 @@ sudo virt-install \ --network network=default,model=virtio \ --controller type=virtio-serial \ --channel unix,target_type=virtio,name=org.qemu.guest_agent.0 \ - --noautoconsol + --noautoconsole export SSH_USER="administrator" export SSH_KNOWN_HOSTS_FILE="${DIR}/known_hosts" diff --git a/qa/workunits/windows/test_rbd_wnbd.py b/qa/workunits/windows/test_rbd_wnbd.py index f22810e2ea14a..db14234a2b5f0 100644 --- a/qa/workunits/windows/test_rbd_wnbd.py +++ b/qa/workunits/windows/test_rbd_wnbd.py @@ -900,7 +900,7 @@ if __name__ == '__main__': try: test_cls = TESTS[args.test_name] except KeyError: - raise CephTestException("Unkown test: {}".format(args.test_name)) + raise CephTestException("Unknown test: {}".format(args.test_name)) runner = TestRunner( test_cls, diff --git a/src/cls/rbd/cls_rbd.cc b/src/cls/rbd/cls_rbd.cc index b4efc23ceb60b..7ed55e1230bae 100644 --- a/src/cls/rbd/cls_rbd.cc +++ b/src/cls/rbd/cls_rbd.cc @@ -1134,7 +1134,7 @@ int get_protection_status(cls_method_context_t hctx, bufferlist *in, } /** - * set the proctection status of a snapshot + * set the protection status of a snapshot * * Input: * @param snapid (uint64_t) which snapshot to set the status of @@ -3002,7 +3002,7 @@ static int dir_remove_image_helper(cls_method_context_t hctx, * Rename an image in the directory, updating both indexes * atomically. This can't be done from the client calling * dir_add_image and dir_remove_image in one transaction because the - * results of the first method are not visibale to later steps. + * results of the first method are not visible to later steps. * * Input: * @param src original name of the image @@ -6800,7 +6800,7 @@ int mirror_image_snapshot_unlink_peer(cls_method_context_t hctx, bufferlist *in, /** * Input: * @param snap_id: snapshot id - * @param complete: true if shapshot fully copied/complete + * @param complete: true if snapshot fully copied/complete * @param last_copied_object_number: last copied object number * * Output: diff --git a/src/common/options/rbd-mirror.yaml.in b/src/common/options/rbd-mirror.yaml.in index 93c059ff227a1..ba7681d04d353 100644 --- a/src/common/options/rbd-mirror.yaml.in +++ b/src/common/options/rbd-mirror.yaml.in @@ -111,7 +111,7 @@ options: - name: rbd_mirror_image_policy_rebalance_timeout type: float level: advanced - desc: number of seconds policy should be idle before trigerring reshuffle (rebalance) + desc: number of seconds policy should be idle before triggering reshuffle (rebalance) of images default: 0 services: diff --git a/src/include/rbd/librbd.h b/src/include/rbd/librbd.h index 7ae20e4dd583b..50901cb8a82d1 100644 --- a/src/include/rbd/librbd.h +++ b/src/include/rbd/librbd.h @@ -905,7 +905,7 @@ CEPH_RBD_API int rbd_snap_rename(rbd_image_t image, const char *snapname, */ CEPH_RBD_API int rbd_snap_protect(rbd_image_t image, const char *snap_name); /** - * Allow a snaphshot to be deleted. + * Allow a snapshot to be deleted. * * @param snap_name which snapshot to unprotect * @returns 0 on success, negative error code on failure diff --git a/src/journal/JournalRecorder.cc b/src/journal/JournalRecorder.cc index 0304ae777a96c..d2b0c3dc970cd 100644 --- a/src/journal/JournalRecorder.cc +++ b/src/journal/JournalRecorder.cc @@ -189,9 +189,9 @@ void JournalRecorder::flush(Context *on_safe) { ceph::ref_t JournalRecorder::get_object(uint8_t splay_offset) { ceph_assert(ceph_mutex_is_locked(m_lock)); - const auto& object_recoder = m_object_ptrs.at(splay_offset); - ceph_assert(object_recoder); - return object_recoder; + const auto& object_recorder = m_object_ptrs.at(splay_offset); + ceph_assert(object_recorder); + return object_recorder; } void JournalRecorder::close_and_advance_object_set(uint64_t object_set) { diff --git a/src/journal/ObjectRecorder.h b/src/journal/ObjectRecorder.h index 5c5f88c86db96..a4d75b3a7e38d 100644 --- a/src/journal/ObjectRecorder.h +++ b/src/journal/ObjectRecorder.h @@ -146,7 +146,7 @@ private: ceph::condition_variable m_in_flight_callbacks_cond; uint64_t m_in_flight_bytes = 0; - bool send_appends(bool force, ceph::ref_t flush_sentinal); + bool send_appends(bool force, ceph::ref_t flush_sentinel); void handle_append_flushed(uint64_t tid, int r); void append_overflowed(); diff --git a/src/librbd/api/Migration.cc b/src/librbd/api/Migration.cc index 957c872ac5515..ae95a7191c8c9 100644 --- a/src/librbd/api/Migration.cc +++ b/src/librbd/api/Migration.cc @@ -1787,7 +1787,7 @@ int Migration::enable_mirroring( // When relinking children we should be careful as it my be interrupted // at any moment by some reason and we may end up in an inconsistent // state, which we have to be able to fix with "migration abort". Below -// are all possible states during migration (P1 - sourse parent, P2 - +// are all possible states during migration (P1 - source parent, P2 - // destination parent, C - child): // // P1 P2 P1 P2 P1 P2 P1 P2 diff --git a/src/librbd/cache/ObjectCacherObjectDispatch.cc b/src/librbd/cache/ObjectCacherObjectDispatch.cc index 822a053e1431c..91d720abe90aa 100644 --- a/src/librbd/cache/ObjectCacherObjectDispatch.cc +++ b/src/librbd/cache/ObjectCacherObjectDispatch.cc @@ -207,7 +207,7 @@ bool ObjectCacherObjectDispatch::read( on_dispatched = util::create_async_context_callback(*m_image_ctx, on_dispatched); - // embed the RBD-internal read flags in the genenric RADOS op_flags and + // embed the RBD-internal read flags in the generic RADOS op_flags and op_flags = ((op_flags & ~ObjectCacherWriteback::READ_FLAGS_MASK) | ((read_flags << ObjectCacherWriteback::READ_FLAGS_SHIFT) & ObjectCacherWriteback::READ_FLAGS_MASK)); diff --git a/src/librbd/cache/WriteAroundObjectDispatch.cc b/src/librbd/cache/WriteAroundObjectDispatch.cc index fafb73f409ae3..bb3edb75b1fe0 100644 --- a/src/librbd/cache/WriteAroundObjectDispatch.cc +++ b/src/librbd/cache/WriteAroundObjectDispatch.cc @@ -402,7 +402,7 @@ void WriteAroundObjectDispatch::handle_in_flight_io_complete( } // complete flushes that were waiting on in-flight IO - // (and propogate any IO error to first flush) + // (and propagate any IO error to first flush) for (auto& it : finished_flushes) { ldout(cct, 20) << "completing flush: tid=" << it.first << ", " << "r=" << pending_flush_error << dendl; @@ -447,7 +447,7 @@ void WriteAroundObjectDispatch::handle_in_flight_flush_complete( m_lock.unlock(); // complete flushes that were waiting on in-flight IO - // (and propogate any IO errors) + // (and propagate any IO errors) for (auto& it : finished_flushes) { ldout(cct, 20) << "completing flush: tid=" << it.first << dendl; it.second->complete(pending_flush_error); diff --git a/src/librbd/cache/pwl/AbstractWriteLog.cc b/src/librbd/cache/pwl/AbstractWriteLog.cc index 1e784f6b56696..b6af9b2ec2d27 100644 --- a/src/librbd/cache/pwl/AbstractWriteLog.cc +++ b/src/librbd/cache/pwl/AbstractWriteLog.cc @@ -259,7 +259,7 @@ void AbstractWriteLog::perf_start(std::string name) { plb.add_u64_counter(l_librbd_pwl_cmp, "cmp", "Compare and Write requests"); plb.add_u64_counter(l_librbd_pwl_cmp_bytes, "cmp_bytes", "Compare and Write bytes compared/written"); - plb.add_time_avg(l_librbd_pwl_cmp_latency, "cmp_lat", "Compare and Write latecy"); + plb.add_time_avg(l_librbd_pwl_cmp_latency, "cmp_lat", "Compare and Write latency"); plb.add_u64_counter(l_librbd_pwl_cmp_fails, "cmp_fails", "Compare and Write compare fails"); plb.add_u64_counter(l_librbd_pwl_internal_flush, "internal_flush", "Flush RWL (write back to OSD)"); @@ -517,7 +517,7 @@ void AbstractWriteLog::pwl_init(Context *on_finish, DeferredContexts &later) if ((!m_cache_state->present) && (access(m_log_pool_name.c_str(), F_OK) == 0)) { ldout(cct, 5) << "There's an existing pool file " << m_log_pool_name - << ", While there's no cache in the image metatata." << dendl; + << ", While there's no cache in the image metadata." << dendl; if (remove(m_log_pool_name.c_str()) != 0) { lderr(cct) << "failed to remove the pool file " << m_log_pool_name << dendl; @@ -1752,7 +1752,7 @@ void AbstractWriteLog::process_writeback_dirty_entries() { std::lock_guard locker(m_lock); while (flushed < IN_FLIGHT_FLUSH_WRITE_LIMIT) { if (m_shutting_down) { - ldout(cct, 5) << "Flush during shutdown supressed" << dendl; + ldout(cct, 5) << "Flush during shutdown suppressed" << dendl; /* Do flush complete only when all flush ops are finished */ all_clean = !m_flush_ops_in_flight; break; diff --git a/src/librbd/cache/pwl/AbstractWriteLog.h b/src/librbd/cache/pwl/AbstractWriteLog.h index ffe299c37d3e3..30f466cf07cd5 100644 --- a/src/librbd/cache/pwl/AbstractWriteLog.h +++ b/src/librbd/cache/pwl/AbstractWriteLog.h @@ -298,7 +298,7 @@ protected: mutable ceph::mutex m_log_retire_lock; /* Hold a read lock on m_entry_reader_lock to add readers to log entry * bufs. Hold a write lock to prevent readers from being added (e.g. when - * removing log entrys from the map). No lock required to remove readers. */ + * removing log entries from the map). No lock required to remove readers. */ mutable RWLock m_entry_reader_lock; /* Hold m_log_append_lock while appending or retiring log entries. */ mutable ceph::mutex m_log_append_lock; diff --git a/src/librbd/cache/pwl/LogEntry.h b/src/librbd/cache/pwl/LogEntry.h index ecaca0b7b70d6..0a4afe3e22813 100644 --- a/src/librbd/cache/pwl/LogEntry.h +++ b/src/librbd/cache/pwl/LogEntry.h @@ -162,7 +162,7 @@ protected: buffer::ptr cache_bp; buffer::list cache_bl; std::atomic bl_refs = {0}; /* The refs held on cache_bp by cache_bl */ - /* Used in WriteLogEntry::get_cache_bl() to syncronize between threads making entries readable */ + /* Used in WriteLogEntry::get_cache_bl() to synchronize between threads making entries readable */ mutable ceph::mutex m_entry_bl_lock; virtual void init_cache_bp() {} diff --git a/src/librbd/cache/pwl/LogMap.cc b/src/librbd/cache/pwl/LogMap.cc index b3e7022b08b17..8804e38516787 100644 --- a/src/librbd/cache/pwl/LogMap.cc +++ b/src/librbd/cache/pwl/LogMap.cc @@ -250,7 +250,7 @@ LogMapEntries LogMap::find_map_entries_locked(const BlockExtent &block_ext * represent the entire block extent of the GenericWriteLogEntry, and the * WriteLogMapEntry is added to the set. * - * The set must not contain overlapping WriteLogMapEntrys. WriteLogMapEntrys + * The set must not contain overlapping write log entries. Entries * in the set that overlap with one being added are adjusted (shrunk, split, * or removed) before the new entry is added. * diff --git a/src/librbd/crypto/luks/LoadRequest.cc b/src/librbd/crypto/luks/LoadRequest.cc index b5e16f10016b2..25843b5ff63f7 100644 --- a/src/librbd/crypto/luks/LoadRequest.cc +++ b/src/librbd/crypto/luks/LoadRequest.cc @@ -238,7 +238,7 @@ void LoadRequest::read_volume_key() { if (r != 0) { auto keyslots_end_offset = m_header.get_data_offset(); if (m_offset < keyslots_end_offset) { - // perhaps we did not feed the the necessary keyslot, retry + // perhaps we did not feed the necessary keyslot, retry auto ctx = create_context_callback< LoadRequest, &LoadRequest::handle_read_keyslots>(this); read(keyslots_end_offset, ctx); diff --git a/src/librbd/deep_copy/ObjectCopyRequest.cc b/src/librbd/deep_copy/ObjectCopyRequest.cc index e8b42b68f7dee..4c380c642c152 100644 --- a/src/librbd/deep_copy/ObjectCopyRequest.cc +++ b/src/librbd/deep_copy/ObjectCopyRequest.cc @@ -574,7 +574,7 @@ void ObjectCopyRequest::merge_write_ops() { for (auto& [write_read_snap_ids, read_op] : m_read_ops) { auto src_snap_seq = write_read_snap_ids.first; - // convert the the resulting sparse image extent map to an interval ... + // convert the resulting sparse image extent map to an interval ... auto& image_data_interval = m_dst_data_interval[src_snap_seq]; for (auto [image_offset, image_length] : read_op.image_extent_map) { image_data_interval.union_insert(image_offset, image_length); diff --git a/src/librbd/deep_copy/Utils.cc b/src/librbd/deep_copy/Utils.cc index c2dd25020e43b..23aad8ec4060e 100644 --- a/src/librbd/deep_copy/Utils.cc +++ b/src/librbd/deep_copy/Utils.cc @@ -36,7 +36,7 @@ void compute_snap_map(CephContext* cct, ++dst_snap_id_it; } - // we should only have the HEAD revision in the the last snap seq + // we should only have the HEAD revision in the last snap seq ceph_assert(snap_ids.empty() || snap_ids[0] != CEPH_NOSNAP); snap_ids.insert(snap_ids.begin(), it.second); diff --git a/src/librbd/exclusive_lock/ImageDispatch.cc b/src/librbd/exclusive_lock/ImageDispatch.cc index f53b3692a1b1c..92544148c57a1 100644 --- a/src/librbd/exclusive_lock/ImageDispatch.cc +++ b/src/librbd/exclusive_lock/ImageDispatch.cc @@ -29,7 +29,7 @@ template ImageDispatch::ImageDispatch(I* image_ctx) : m_image_ctx(image_ctx), m_lock(ceph::make_shared_mutex( - util::unique_lock_name("librbd::exclusve_lock::ImageDispatch::m_lock", + util::unique_lock_name("librbd::exclusive_lock::ImageDispatch::m_lock", this))) { } diff --git a/src/librbd/image/OpenRequest.h b/src/librbd/image/OpenRequest.h index 0fe218a398289..30352d18ac4fd 100644 --- a/src/librbd/image/OpenRequest.h +++ b/src/librbd/image/OpenRequest.h @@ -55,7 +55,7 @@ private: * V2_GET_CREATE_TIMESTAMP | * | | * v | - * V2_GET_ACCESS_MODIFIY_TIMESTAMP | + * V2_GET_ACCESS_MODIFY_TIMESTAMP | * | | * v | * V2_GET_DATA_POOL --------------> REFRESH diff --git a/src/librbd/image/ValidatePoolRequest.cc b/src/librbd/image/ValidatePoolRequest.cc index 6f2872e256291..17641086ce284 100644 --- a/src/librbd/image/ValidatePoolRequest.cc +++ b/src/librbd/image/ValidatePoolRequest.cc @@ -34,7 +34,7 @@ ValidatePoolRequest::ValidatePoolRequest(librados::IoCtx& io_ctx, Context *on_finish) : m_cct(reinterpret_cast(io_ctx.cct())), m_on_finish(on_finish) { - // validatation should occur in default namespace + // validation should occur in default namespace m_io_ctx.dup(io_ctx); m_io_ctx.set_namespace(""); } diff --git a/src/librbd/io/ObjectRequest.cc b/src/librbd/io/ObjectRequest.cc index 6d246cdf33fef..827f551d1f79d 100644 --- a/src/librbd/io/ObjectRequest.cc +++ b/src/librbd/io/ObjectRequest.cc @@ -1008,7 +1008,7 @@ void ObjectListSnapsRequest::handle_list_from_parent(int r) { } // the write/read snapshot id key is not useful for parent images so - // map the the special-case INITIAL_WRITE_READ_SNAP_IDS key + // map the special-case INITIAL_WRITE_READ_SNAP_IDS key *m_snapshot_delta = {}; auto& intervals = (*m_snapshot_delta)[INITIAL_WRITE_READ_SNAP_IDS]; for (auto& [key, image_extents] : m_parent_snapshot_delta) { diff --git a/src/librbd/io/RefreshImageDispatch.cc b/src/librbd/io/RefreshImageDispatch.cc index 5199f01d85d8f..4af3f368311e0 100644 --- a/src/librbd/io/RefreshImageDispatch.cc +++ b/src/librbd/io/RefreshImageDispatch.cc @@ -131,7 +131,7 @@ bool RefreshImageDispatch::flush( ldout(cct, 20) << "tid=" << tid << dendl; // The refresh state machine can initiate a flush and it can - // enable the exclusive-lock which will also attmept to flush. + // enable the exclusive-lock which will also attempt to flush. if (flush_source == FLUSH_SOURCE_REFRESH || flush_source == FLUSH_SOURCE_EXCLUSIVE_LOCK_SKIP_REFRESH || flush_source == FLUSH_SOURCE_SHUTDOWN) { diff --git a/src/librbd/librbd.cc b/src/librbd/librbd.cc index 54a2d02051eb6..1272d95dd7e5c 100644 --- a/src/librbd/librbd.cc +++ b/src/librbd/librbd.cc @@ -2401,7 +2401,7 @@ namespace librbd { return exists; } - // A safer verion of snap_exists. + // A safer version of snap_exists. int Image::snap_exists2(const char *snap_name, bool *exists) { ImageCtx *ictx = (ImageCtx *)ctx; diff --git a/src/librbd/migration/HttpClient.cc b/src/librbd/migration/HttpClient.cc index 90d5723ed84cb..2475ff00c368f 100644 --- a/src/librbd/migration/HttpClient.cc +++ b/src/librbd/migration/HttpClient.cc @@ -389,7 +389,7 @@ private: // receive the response for this request m_parser.emplace(); if (work->header_only()) { - // HEAD requests don't trasfer data but the parser still cares about max + // HEAD requests don't transfer data but the parser still cares about max // content-length m_header_parser.emplace(); m_header_parser->body_limit(std::numeric_limits::max()); diff --git a/src/librbd/migration/QCOWFormat.cc b/src/librbd/migration/QCOWFormat.cc index cedf9aa20f02c..300bb712335ee 100644 --- a/src/librbd/migration/QCOWFormat.cc +++ b/src/librbd/migration/QCOWFormat.cc @@ -70,7 +70,7 @@ void LookupTable::decode() { return; } - // translate the lookup table (big-endian -> CPU endianess) + // translate the lookup table (big-endian -> CPU endianness) for (auto idx = 0UL; idx < size; ++idx) { cluster_offsets[idx] = big_to_native(cluster_offsets[idx]); } diff --git a/src/librbd/operation/DisableFeaturesRequest.h b/src/librbd/operation/DisableFeaturesRequest.h index 719a033990918..dda1a161af73a 100644 --- a/src/librbd/operation/DisableFeaturesRequest.h +++ b/src/librbd/operation/DisableFeaturesRequest.h @@ -56,7 +56,7 @@ private: * v * STATE_ACQUIRE_EXCLUSIVE_LOCK (skip if not * | required) - * | (disbling journaling) + * | (disabling journaling) * \-------------------\ * | | * | V @@ -92,8 +92,8 @@ private: * STATE_NOTIFY_UPDATE * | * v - * STATE_REALEASE_EXCLUSIVE_LOCK (skip if not - * | required) + * STATE_RELEASE_EXCLUSIVE_LOCK (skip if not + * | required) * | (unblock writes) * v * diff --git a/src/librbd/operation/SnapshotRemoveRequest.h b/src/librbd/operation/SnapshotRemoveRequest.h index 17638a52917e7..226015fde9434 100644 --- a/src/librbd/operation/SnapshotRemoveRequest.h +++ b/src/librbd/operation/SnapshotRemoveRequest.h @@ -43,7 +43,7 @@ public: * v (skip if disabled/in-use) * REMOVE_OBJECT_MAP * | - * v (skip if not mirror snpashot) + * v (skip if not mirror snapshot) * REMOVE_IMAGE_STATE * | * v (skip if in-use) diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx index f2d22b4a16cba..61b96366c5272 100644 --- a/src/pybind/rbd/rbd.pyx +++ b/src/pybind/rbd/rbd.pyx @@ -480,7 +480,7 @@ cdef class Completion(object): def get_return_value(self): """ - Get the return value of an asychronous operation + Get the return value of an asynchronous operation The return value is set when the operation is complete. @@ -2127,7 +2127,7 @@ class RBD(object): :param name: the name of the image :type name: str :param snapshot: which snapshot to read from - :type snaphshot: str + :type snapshot: str :param read_only: whether to open the image in read-only mode :type read_only: bool :param image_id: the id of the image @@ -2809,7 +2809,7 @@ cdef class Image(object): :param name: the name of the image :type name: str :param snapshot: which snapshot to read from - :type snaphshot: str + :type snapshot: str :param read_only: whether to open the image in read-only mode :type read_only: bool :param image_id: the id of the image diff --git a/src/test/journal/test_JournalPlayer.cc b/src/test/journal/test_JournalPlayer.cc index 63d2d0a30d6c7..33e72912dd21f 100644 --- a/src/test/journal/test_JournalPlayer.cc +++ b/src/test/journal/test_JournalPlayer.cc @@ -955,7 +955,7 @@ TYPED_TEST(TestJournalPlayer, LiveReplayRefetchRemoveEmpty) { ASSERT_EQ(expected_entries, entries); } -TYPED_TEST(TestJournalPlayer, PrefechShutDown) { +TYPED_TEST(TestJournalPlayer, PrefetchShutDown) { std::string oid = this->get_temp_oid(); ASSERT_EQ(0, this->create(oid)); diff --git a/src/test/librbd/cache/test_mock_ParentCacheObjectDispatch.cc b/src/test/librbd/cache/test_mock_ParentCacheObjectDispatch.cc index 05e56f52066eb..747ed8a7ff764 100644 --- a/src/test/librbd/cache/test_mock_ParentCacheObjectDispatch.cc +++ b/src/test/librbd/cache/test_mock_ParentCacheObjectDispatch.cc @@ -274,7 +274,7 @@ TEST_F(TestMockParentCacheObjectDispatch, test_initialization_fail_at_register) delete mock_parent_image_cache; } -TEST_F(TestMockParentCacheObjectDispatch, test_disble_interface) { +TEST_F(TestMockParentCacheObjectDispatch, test_disable_interface) { librbd::ImageCtx* ictx; ASSERT_EQ(0, open_image(m_image_name, &ictx)); MockParentImageCacheImageCtx mock_image_ctx(*ictx); diff --git a/src/test/librbd/deep_copy/test_mock_MetadataCopyRequest.cc b/src/test/librbd/deep_copy/test_mock_MetadataCopyRequest.cc index ba59e3cdb7c59..c5759179e5e64 100644 --- a/src/test/librbd/deep_copy/test_mock_MetadataCopyRequest.cc +++ b/src/test/librbd/deep_copy/test_mock_MetadataCopyRequest.cc @@ -55,7 +55,7 @@ struct GetMetadataRequest { GetMetadataRequest* GetMetadataRequest::s_instance = nullptr; -} // namspace image +} // namespace image } // namespace librbd // template definitions diff --git a/src/test/librbd/fsx.cc b/src/test/librbd/fsx.cc index b8be4708e2d01..13f052248b37e 100644 --- a/src/test/librbd/fsx.cc +++ b/src/test/librbd/fsx.cc @@ -1,7 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:8; indent-tabs-mode:t -*- // vim: ts=8 sw=8 smarttab /* - * Copyright (C) 1991, NeXT Computer, Inc. All Rights Reserverd. + * Copyright (C) 1991, NeXT Computer, Inc. All Rights Reserved. * * File: fsx.cc * Author: Avadis Tevanian, Jr. @@ -103,7 +103,7 @@ int logcount = 0; /* total ops */ * When mapped read/writes are disabled, they are simply converted to normal * reads and writes. When fallocate/fpunch calls are disabled, they are * converted to OP_SKIPPED. Hence OP_SKIPPED needs to have a number higher than - * the operation selction matrix, as does the OP_CLOSEOPEN which is an + * the operation selection matrix, as does the OP_CLOSEOPEN which is an * operation modifier rather than an operation in itself. * * Because of the "lite" version, we also need to have different "maximum @@ -159,7 +159,7 @@ unsigned long debugstart = 0; /* -D flag */ int flush_enabled = 0; /* -f flag */ int deep_copy = 0; /* -g flag */ int holebdy = 1; /* -h flag */ -bool journal_replay = false; /* -j flah */ +bool journal_replay = false; /* -j flag */ int keep_on_success = 0; /* -k flag */ int do_fsync = 0; /* -y flag */ unsigned long maxfilelen = 256 * 1024; /* -l flag */ diff --git a/src/test/librbd/test_librbd.cc b/src/test/librbd/test_librbd.cc index 8c7eb2ba4ca8b..1cc79e601bdaa 100644 --- a/src/test/librbd/test_librbd.cc +++ b/src/test/librbd/test_librbd.cc @@ -12476,7 +12476,7 @@ TEST_F(TestLibRBD, WriteZeroesThickProvision) { ASSERT_EQ(0, image.close()); } -TEST_F(TestLibRBD, ConcurentOperations) +TEST_F(TestLibRBD, ConcurrentOperations) { REQUIRE_FEATURE(RBD_FEATURE_EXCLUSIVE_LOCK); diff --git a/src/test/rbd_mirror/mock/MockBaseRequest.h b/src/test/rbd_mirror/mock/MockBaseRequest.h index c85eab43455f2..04bb5745b3c01 100644 --- a/src/test/rbd_mirror/mock/MockBaseRequest.h +++ b/src/test/rbd_mirror/mock/MockBaseRequest.h @@ -21,6 +21,6 @@ struct MockBaseRequest : public BaseRequest { }; } // namespace mirror -} // namepace rbd +} // namespace rbd #endif // CEPH_MOCK_BASE_REQUEST_H diff --git a/src/test/rbd_mirror/test_mock_InstanceWatcher.cc b/src/test/rbd_mirror/test_mock_InstanceWatcher.cc index f57654b367659..1467caa5dda01 100644 --- a/src/test/rbd_mirror/test_mock_InstanceWatcher.cc +++ b/src/test/rbd_mirror/test_mock_InstanceWatcher.cc @@ -362,7 +362,7 @@ TEST_F(TestMockInstanceWatcher, ImageAcquireRelease) { expect_acquire_lock(mock_managed_lock, 0); ASSERT_EQ(0, instance_watcher2->init()); - // Acquire Image on the the same instance + // Acquire Image on the same instance EXPECT_CALL(mock_instance_replayer1, acquire_image(instance_watcher1, "gid", _)) .WillOnce(WithArg<2>(CompleteContext(0))); @@ -378,7 +378,7 @@ TEST_F(TestMockInstanceWatcher, ImageAcquireRelease) { instance_watcher1->notify_image_acquire(instance_id2, "gid", &on_acquire2); ASSERT_EQ(0, on_acquire2.wait()); - // Release Image on the the same instance + // Release Image on the same instance EXPECT_CALL(mock_instance_replayer1, release_image("gid", _)) .WillOnce(WithArg<1>(CompleteContext(0))); C_SaferCond on_release1; diff --git a/src/tools/rbd/action/MirrorPool.cc b/src/tools/rbd/action/MirrorPool.cc index b714c3babadec..5c58ea8ef7efc 100644 --- a/src/tools/rbd/action/MirrorPool.cc +++ b/src/tools/rbd/action/MirrorPool.cc @@ -1724,7 +1724,7 @@ Shell::Action action_bootstrap_create( {"mirror", "pool", "peer", "bootstrap", "create"}, {}, "Create a peer bootstrap token to import in a remote cluster", "", &get_peer_bootstrap_create_arguments, &execute_peer_bootstrap_create); -Shell::Action action_bootstreap_import( +Shell::Action action_bootstrap_import( {"mirror", "pool", "peer", "bootstrap", "import"}, {}, "Import a peer bootstrap token created from a remote cluster", "", &get_peer_bootstrap_import_arguments, &execute_peer_bootstrap_import); diff --git a/src/tools/rbd/action/Perf.cc b/src/tools/rbd/action/Perf.cc index b39beac9148e4..788162c66264a 100644 --- a/src/tools/rbd/action/Perf.cc +++ b/src/tools/rbd/action/Perf.cc @@ -604,7 +604,7 @@ int execute_iostat(const po::variables_map &vm, auto f = formatter.get(); if (iterations > 1 && f != nullptr) { - std::cerr << "rbd: specifing iterations is not valid with formatted output" + std::cerr << "rbd: specifying iterations is not valid with formatted output" << std::endl; return -EINVAL; } diff --git a/src/tools/rbd_mirror/PoolReplayer.cc b/src/tools/rbd_mirror/PoolReplayer.cc index 8a04219da0686..71c58ad8ee046 100644 --- a/src/tools/rbd_mirror/PoolReplayer.cc +++ b/src/tools/rbd_mirror/PoolReplayer.cc @@ -705,7 +705,7 @@ void PoolReplayer::update_namespace_replayers() { for (auto &name : mirroring_namespaces) { auto it = m_namespace_replayers.find(name); if (it == m_namespace_replayers.end()) { - // acuire leader for this namespace replayer failed + // acquire leader for this namespace replayer failed continue; } it->second->handle_instances_added(instance_ids); diff --git a/src/tools/rbd_mirror/RemotePoolPoller.cc b/src/tools/rbd_mirror/RemotePoolPoller.cc index 8bfb35d4af1ef..b9b88010d5dbc 100644 --- a/src/tools/rbd_mirror/RemotePoolPoller.cc +++ b/src/tools/rbd_mirror/RemotePoolPoller.cc @@ -138,14 +138,14 @@ void RemotePoolPoller::handle_mirror_peer_ping(int r) { dout(10) << "r=" << r << dendl; if (r == -EOPNOTSUPP) { - // older OSD that doesn't support snaphot-based mirroring, so no need + // older OSD that doesn't support snapshot-based mirroring, so no need // to query remote peers dout(10) << "remote peer does not support snapshot-based mirroring" << dendl; notify_listener(); return; } else if (r < 0) { - // we can still see if we can perform a peer list and find outselves + // we can still see if we can perform a peer list and find ourselves derr << "failed to ping remote mirror peer: " << cpp_strerror(r) << dendl; } diff --git a/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc b/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc index 20560038ca7d9..432e8d99698b0 100644 --- a/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc +++ b/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc @@ -540,7 +540,7 @@ void Replayer::handle_close_local_image(int r) { std::unique_lock locker{m_lock}; if (r < 0) { - derr << "error closing local iamge: " << cpp_strerror(r) << dendl; + derr << "error closing local image: " << cpp_strerror(r) << dendl; handle_replay_error(r, "failed to close local image"); } diff --git a/src/tools/rbd_recover_tool/README b/src/tools/rbd_recover_tool/README index d289c11caac2a..c0774494a7471 100644 --- a/src/tools/rbd_recover_tool/README +++ b/src/tools/rbd_recover_tool/README @@ -10,11 +10,11 @@ and rbd images can not be accessed. In this case, a tool to recover rbd image is 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. - but, there are some limitions: + but, there are some limitations: -need ssh service and unobstructed network -osd data must be accessed on local disk -clone image is not supported, while snapshot is supported --only support relicated pool +-only support replicated pool before you run this tool, you should make sure that: 1). all processes (ceph-osd, ceph-mon, ceph-mds) are shutdown @@ -64,7 +64,7 @@ osd_host: all osd node hostname #generated by admin_job, user ignore it -usage: -rbd-recovert-tool +rbd-recover-tool : database #generating offline database: hobject path, node hostname, pg_epoch and image metadata list #list all images from offline database diff --git a/src/tools/rbd_recover_tool/common_h b/src/tools/rbd_recover_tool/common_h index f2df662ad692b..d2a7a8522079e 100644 --- a/src/tools/rbd_recover_tool/common_h +++ b/src/tools/rbd_recover_tool/common_h @@ -191,7 +191,7 @@ function init_env_admin() exit fi lines=$(($lines + 1)) - # in case : there are servral hostnames on the same node + # in case : there are several hostnames on the same node # just need output of `hostname` local hostname_alias= hostname_alias=`ssh $ssh_option $node "hostname" 2>/dev/null /[@[]] show image metadata: image format, rbd id, size, order, snapseq In addition, for image with snapshots, - this will list all snapshot infomations" + this will list all snapshot information" echo "$cmd_name recover /[@[]] [] all snapshots share one image head, to economize disk space so there is only one snapshot at any time, diff --git a/src/tools/rbd_wnbd/rbd_wnbd.cc b/src/tools/rbd_wnbd/rbd_wnbd.cc index 2e8f3ee0434bc..fd78841e0567f 100644 --- a/src/tools/rbd_wnbd/rbd_wnbd.cc +++ b/src/tools/rbd_wnbd/rbd_wnbd.cc @@ -419,7 +419,7 @@ int map_device_using_suprocess(std::string arguments, int timeout_ms) case WAIT_OBJECT_0: if (!GetOverlappedResult(pipe_handle, &connect_o, &bytes_read, TRUE)) { err = GetLastError(); - derr << "Couln't establish a connection with the child process. " + derr << "Couldn't establish a connection with the child process. " << "Error: " << win32_strerror(err) << dendl; exit_code = -ECHILD; goto clean_process; @@ -1086,13 +1086,13 @@ Unmap options: --soft-disconnect-timeout Soft disconnect timeout in seconds. The soft disconnect operation uses PnP to notify the Windows storage stack that the device is going to - be disconnectd. Storage drivers can block this + be disconnected. Storage drivers can block this operation if there are pending operations, unflushed caches or open handles. Default: 15 Service options: --hard-disconnect Skip attempting a soft disconnect - --soft-disconnect-timeout Cummulative soft disconnect timeout in seconds, + --soft-disconnect-timeout Cumulative soft disconnect timeout in seconds, used when disconnecting existing mappings. A hard disconnect will be issued when hitting the timeout --service-thread-count The number of workers used when mapping or