From 77418d2fdef7f22a45fdab72882ec19b949e75e4 Mon Sep 17 00:00:00 2001 From: Andrew Wong Date: Wed, 25 May 2022 17:56:21 -0700 Subject: [PATCH 1/2] core: fix more typos Follow-up to #4916 for some things found in review, and more. --- src/v/cluster/topics_frontend.cc | 2 +- src/v/raft/replicate_entries_stm.cc | 2 +- src/v/raft/state_machine.cc | 2 +- src/v/raft/state_machine.h | 2 +- src/v/utils/delta_for.h | 2 +- src/v/v8_engine/internal/script.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/v/cluster/topics_frontend.cc b/src/v/cluster/topics_frontend.cc index 0d4e15a510dd..04fdaeaa74c0 100644 --- a/src/v/cluster/topics_frontend.cc +++ b/src/v/cluster/topics_frontend.cc @@ -643,7 +643,7 @@ ss::future topics_frontend::finish_moving_partition_replicas( ss::future> topics_frontend::stm_linearizable_barrier( model::timeout_clock::time_point timeout) { return _stm.invoke_on(controller_stm_shard, [timeout](controller_stm& stm) { - return stm.insert_linerizable_barrier(timeout); + return stm.insert_linearizable_barrier(timeout); }); } diff --git a/src/v/raft/replicate_entries_stm.cc b/src/v/raft/replicate_entries_stm.cc index 9bf0ae30032d..c63749712b5f 100644 --- a/src/v/raft/replicate_entries_stm.cc +++ b/src/v/raft/replicate_entries_stm.cc @@ -233,7 +233,7 @@ inline bool replicate_entries_stm::should_skip_follower_request(vnode id) { if (it->second.last_received_append_entries_reply_timestamp < timeout) { vlog( _ctxlog.trace, - "Skipping sending append request to {} - didn't receive " + "Skipping sending append request to {} - didn't receive " "follower heartbeat", id); return true; diff --git a/src/v/raft/state_machine.cc b/src/v/raft/state_machine.cc index 98cb37392821..68856333e97b 100644 --- a/src/v/raft/state_machine.cc +++ b/src/v/raft/state_machine.cc @@ -144,7 +144,7 @@ ss::future<> state_machine::write_last_applied(model::offset o) { return _raft->write_last_applied(o); } -ss::future> state_machine::insert_linerizable_barrier( +ss::future> state_machine::insert_linearizable_barrier( model::timeout_clock::time_point timeout) { return ss::with_timeout(timeout, _raft->linearizable_barrier()) .handle_exception_type([](const ss::timed_out_error&) { diff --git a/src/v/raft/state_machine.h b/src/v/raft/state_machine.h index d25cc2292e62..92f4cf34649c 100644 --- a/src/v/raft/state_machine.h +++ b/src/v/raft/state_machine.h @@ -100,7 +100,7 @@ class state_machine { * details see paragraph 6.4 of Raft protocol dissertation. */ ss::future> - insert_linerizable_barrier(model::timeout_clock::time_point); + insert_linearizable_barrier(model::timeout_clock::time_point); protected: void set_next(model::offset offset); diff --git a/src/v/utils/delta_for.h b/src/v/utils/delta_for.h index eafa6179087e..14eeb0e279bb 100644 --- a/src/v/utils/delta_for.h +++ b/src/v/utils/delta_for.h @@ -666,7 +666,7 @@ class deltafor_encoder { * it can't be reset to read the sequence again. * * The initial_value and number of rows should match the corresponding - * encoder wich was used to compress the data. + * encoder which was used to compress the data. */ template class deltafor_decoder { diff --git a/src/v/v8_engine/internal/script.h b/src/v/v8_engine/internal/script.h index 352c48ac281e..6cc4bc29acce 100644 --- a/src/v/v8_engine/internal/script.h +++ b/src/v/v8_engine/internal/script.h @@ -104,7 +104,7 @@ class script { /// because js function can have inf loop or smth like that. /// We need to controle execution time for js function - /// \param buffer with data, wich js code can read and edit. + /// \param buffer with data, which js code can read and edit. void run_internal(ss::temporary_buffer data); // Throw c++ exception from v8::TryCatch From 561271b28caffba9f5851e4abd3ffd064353e38e Mon Sep 17 00:00:00 2001 From: Andrew Wong Date: Wed, 25 May 2022 18:03:58 -0700 Subject: [PATCH 2/2] rpc: remove unnecessary inline constexpr already implies inline, so this patch removes the inline tag. --- tools/rpcgen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/rpcgen.py b/tools/rpcgen.py index 965a9a815b36..c03fe0077789 100755 --- a/tools/rpcgen.py +++ b/tools/rpcgen.py @@ -58,7 +58,7 @@ class {{service_name}}_service : public rpc::service { class failure_probes; {%- for method in methods %} - inline static constexpr uint32_t {{method.name}}_method_id = {{method.id}}; + static constexpr uint32_t {{method.name}}_method_id = {{method.id}}; {%- endfor %} {{service_name}}_service(ss::scheduling_group sc, ss::smp_service_group ssg)