Skip to content

Commit

Permalink
Merge pull request #4938 from andrwng/nonfunctional
Browse files Browse the repository at this point in the history
non-functional changes spotted in review post-merge
  • Loading branch information
dotnwat committed May 26, 2022
2 parents 335e449 + 561271b commit 6bdabfa
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/v/cluster/topics_frontend.cc
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ ss::future<std::error_code> topics_frontend::finish_moving_partition_replicas(
ss::future<result<model::offset>> 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);
});
}

Expand Down
2 changes: 1 addition & 1 deletion src/v/raft/replicate_entries_stm.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/v/raft/state_machine.cc
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ ss::future<> state_machine::write_last_applied(model::offset o) {
return _raft->write_last_applied(o);
}

ss::future<result<model::offset>> state_machine::insert_linerizable_barrier(
ss::future<result<model::offset>> 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&) {
Expand Down
2 changes: 1 addition & 1 deletion src/v/raft/state_machine.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class state_machine {
* details see paragraph 6.4 of Raft protocol dissertation.
*/
ss::future<result<model::offset>>
insert_linerizable_barrier(model::timeout_clock::time_point);
insert_linearizable_barrier(model::timeout_clock::time_point);

protected:
void set_next(model::offset offset);
Expand Down
2 changes: 1 addition & 1 deletion src/v/utils/delta_for.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 TVal, class DeltaStep = details::delta_xor>
class deltafor_decoder {
Expand Down
2 changes: 1 addition & 1 deletion src/v/v8_engine/internal/script.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<char> data);

// Throw c++ exception from v8::TryCatch
Expand Down
2 changes: 1 addition & 1 deletion tools/rpcgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 6bdabfa

Please sign in to comment.