From 92c6c8a32fc290e167aa1a79a2c0dec9c01e79db Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 14 Jan 2025 09:15:52 +0800 Subject: [PATCH] ent,main: fix misspellings these misspellings are identified by codespell. they are either in comment or logging messages. let's fix them. Signed-off-by: Kefu Chai --- ent/encryption/encrypted_file_impl.cc | 2 +- ent/encryption/encryption.cc | 2 +- ent/encryption/encryption_config.cc | 2 +- ent/encryption/gcp_host.cc | 6 +++--- ent/encryption/kmip_host.cc | 4 ++-- main.cc | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ent/encryption/encrypted_file_impl.cc b/ent/encryption/encrypted_file_impl.cc index 7c3cf86d49..db6853fb35 100644 --- a/ent/encryption/encrypted_file_impl.cc +++ b/ent/encryption/encrypted_file_impl.cc @@ -45,7 +45,7 @@ static inline bool is_aligned(size_t n, size_t a) { * * Since all writes are assumed to be done by us, and must be aligned, * we can assume in turn that any resizing should be made by our truncate - * method. If we attept to truncate to a size not a multiple of our + * method. If we attempt to truncate to a size not a multiple of our * _key_ block size (typically 16), we add the same size to the actual * truncation size. * On read we then check the file size. If we're reading from a file diff --git a/ent/encryption/encryption.cc b/ent/encryption/encryption.cc index 0031b06843..2ca120af33 100644 --- a/ent/encryption/encryption.cc +++ b/ent/encryption/encryption.cc @@ -966,7 +966,7 @@ future> register_extensions(const db::co // modify schemas for tables holding sensitive data to use encryption w. key described // by the opts. - // since schemas are duplicated across shards, we must call to each shard and augument + // since schemas are duplicated across shards, we must call to each shard and augment // them all. // Since we are in pre-init phase, this should be safe. f = f.then([opts = *opts, &exts] { diff --git a/ent/encryption/encryption_config.cc b/ent/encryption/encryption_config.cc index 46e819025d..3940ffa731 100644 --- a/ent/encryption/encryption_config.cc +++ b/ent/encryption/encryption_config.cc @@ -83,7 +83,7 @@ Actual connection can be either an explicit endpoint (:), or selecte If aws_use_ec2_region is true, regions is instead queried from EC2 metadata. -Authentication can be explicit with aws_access_key_id and aws_secret_access_key. Either secret or both can be ommitted +Authentication can be explicit with aws_access_key_id and aws_secret_access_key. Either secret or both can be omitted in which case the provider will try to read them from AWS credentials in ~/.aws/credentials If aws_use_ec2_credentials is true, authentication is instead queried from EC2 metadata. diff --git a/ent/encryption/gcp_host.cc b/ent/encryption/gcp_host.cc index 23b2c39644..1faca24e70 100644 --- a/ent/encryption/gcp_host.cc +++ b/ent/encryption/gcp_host.cc @@ -581,7 +581,7 @@ future encryption::gcp_host::impl::send_request(std::string_view u rjson::value v; co_await send_request(uri, std::move(body), content_type, [&](const http::reply& rep, std::string_view s) { if (rep._status != http::reply::status_type::ok) { - gcp_log.trace("Got unexpected reponse ({})", rep._status); + gcp_log.trace("Got unexpected response ({})", rep._status); for (auto& [k, v] : rep._headers) { gcp_log.trace("{}: {}", k, v); } @@ -660,7 +660,7 @@ future<> encryption::gcp_host::impl::send_request(std::string_view uri, std::str auto&lh = handler; auto lin = std::move(in); auto result = co_await util::read_entire_stream_contiguous(lin); - gcp_log.trace("Got reponse {}: {}", int(rep._status), result); + gcp_log.trace("Got response {}: {}", int(rep._status), result); lh(rep, result); }); @@ -874,7 +874,7 @@ future encryption::gcp_host::impl:: * I.e. something like: * mykeyring:mykey:e56sadfafa3324ff=/wfsdfwssdf * - * The actual data key can be retreived by doing a KMS "Decrypt" of the data blob part + * The actual data key can be retrieved by doing a KMS "Decrypt" of the data blob part * using the KMS key referenced by the key ID. This gives back actual key data that can * be used to create a symmetric_key with algo, length etc as specified by metadata. * diff --git a/ent/encryption/kmip_host.cc b/ent/encryption/kmip_host.cc index 1e2bf5dd0b..bb467d8882 100644 --- a/ent/encryption/kmip_host.cc +++ b/ent/encryption/kmip_host.cc @@ -334,7 +334,7 @@ future<> kmip_host::impl::connection::connect() { return seastar::net::dns::resolve_name(name).then([this, cred, port](seastar::net::inet_address addr) { return seastar::tls::connect(cred, seastar::ipv4_addr{addr, uint16_t(port)}).then([this](seastar::connected_socket s) { kmip_log.debug("Successfully connected {}", _host); - // #998 Set keepalive to try avoiding connection going stale inbetween commands. + // #998 Set keepalive to try avoiding connection going stale in between commands. s.set_keepalive_parameters(net::tcp_keepalive_params{60s, 60s, 10}); s.set_keepalive(true); _input = s.input(); @@ -564,7 +564,7 @@ future kmip_host::impl::do_cmd(KMIP_CMD* cmd, con_ptr cp, Func& f, bool ret release(cmd, cp, retain_connection_after_command); return make_ready_future(res); default: - // error. connection is dicarded. close it. + // error. connection is discarded. close it. return cp->close().then_wrapped([cp, res](auto f) { // ignore any exception thrown from the close. // ensure we provide the kmip error instead. diff --git a/main.cc b/main.cc index fbc7ac992e..ebad2fa7f3 100644 --- a/main.cc +++ b/main.cc @@ -2480,7 +2480,7 @@ int main(int ac, char** av) { } // We have to override p11-kit config path before p11-kit initialization. - // And the initialization will invoke on seastar initalization, so it has to + // And the initialization will invoke on seastar initialization, so it has to // be before app.run() // #3583 - need to potentially ensure this for tools as well, since at least // sstable* might need crypto libraries.