database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[enhancement](atomicstatus) use lock to make the status object more stable (#35476)

Browse Source 
1. In the past, if error code is not ok and then get status, the status
maybe ok. some dcheck maybe failed.

In this PR use std mutex to make this behavior stable.

If this is a relatively large or complex change, kick off the discussion
at [dev@doris.apache.org](mailto:dev@doris.apache.org) by explaining why
you chose the solution you did and what alternatives you considered,
etc...

---------

Co-authored-by: yiguolei <yiguolei@gmail.com>
This commit is contained in:
yiguolei
2024-05-28 12:49:58 +08:00
committed by yiguolei
parent 87c90094a7
commit 4e7e8d700f
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
be/src/common/status.h
View File

@ -552,27 +552,25 @@ class AtomicStatus {
public:
AtomicStatus() : error_st_(Status::OK()) {}
bool ok() const { return error_code_.load() == 0; }
bool ok() const { return error_code_.load(std::memory_order_acquire) == 0; }
bool update(const Status& new_status) {
// If new status is normal, or the old status is abnormal, then not need update
if (new_status.ok() || error_code_.load() != 0) {
if (new_status.ok() || error_code_.load(std::memory_order_acquire) != 0) {
return false;
}
int16_t expected_error_code = 0;
if (error_code_.compare_exchange_strong(expected_error_code, new_status.code(),
std::memory_order_acq_rel)) {
// lock here for read status, to avoid core during return error_st_
std::lock_guard l(mutex_);
error_st_ = new_status;
return true;
} else {
std::lock_guard l(mutex_);
if (error_code_.load(std::memory_order_acquire) != 0) {
return false;
}
error_st_ = new_status;
error_code_.store(new_status.code(), std::memory_order_release);
return true;
}
// will copy a new status object to avoid concurrency
Status status() {
// This stauts could only be called when ok==false
Status status() const {
std::lock_guard l(mutex_);
return error_st_;
}
@ -580,7 +578,7 @@ public:
private:
std::atomic_int16_t error_code_ = 0;
Status error_st_;
std::mutex mutex_;
mutable std::mutex mutex_;
AtomicStatus(const AtomicStatus&) = delete;
void operator=(const AtomicStatus&) = delete;