1
0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-30 07:23:07 +03:00

Review fixes

* Move resetting is_bf_immutable_ into trasaction::cleanup()
  to ensure that it is reset to false regardless how the
  transaction terminates.
* Removed redundant lock()/unlock() methods from
  mock_client_state.
This commit is contained in:
Teemu Ollakka
2023-05-16 19:16:55 +03:00
parent b76e94f84a
commit e238c0d240
2 changed files with 1 additions and 4 deletions

View File

@ -648,7 +648,6 @@ int wsrep::transaction::after_commit()
} }
assert(ret == 0); assert(ret == 0);
state(lock, s_committed); state(lock, s_committed);
is_bf_immutable_ = false;
debug_log_state("after_commit_leave"); debug_log_state("after_commit_leave");
return ret; return ret;
} }
@ -828,7 +827,6 @@ int wsrep::transaction::after_statement()
state() == s_must_abort || state() == s_must_abort ||
state() == s_cert_failed || state() == s_cert_failed ||
state() == s_must_replay); state() == s_must_replay);
assert(not is_bf_immutable_);
if (state() == s_executing && if (state() == s_executing &&
streaming_context_.fragment_size() && streaming_context_.fragment_size() &&
@ -2110,6 +2108,7 @@ void wsrep::transaction::cleanup()
client_service_.cleanup_transaction(); client_service_.cleanup_transaction();
apply_error_buf_.clear(); apply_error_buf_.clear();
xid_.clear(); xid_.clear();
is_bf_immutable_ = false;
debug_log_state("cleanup_leave"); debug_log_state("cleanup_leave");
} }

View File

@ -49,8 +49,6 @@ namespace wsrep
(void)client_service().bf_rollback(); (void)client_service().bf_rollback();
} }
} }
void lock() { mutex_.lock(); }
void unlock() { mutex_.unlock(); }
private: private:
wsrep::default_mutex mutex_; wsrep::default_mutex mutex_;
wsrep::default_condition_variable cond_; wsrep::default_condition_variable cond_;