fix WhiteScan bug
This commit is contained in:
@ -1829,7 +1829,8 @@ int ObServer::get_network_speed_from_config_file(int64_t &network_speed)
|
|||||||
nic_rate_file_exist = 1;
|
nic_rate_file_exist = 1;
|
||||||
}
|
}
|
||||||
memset(buf, 0, MAX_NIC_CONFIG_FILE_SIZE + 1);
|
memset(buf, 0, MAX_NIC_CONFIG_FILE_SIZE + 1);
|
||||||
fread(buf, 1, MAX_NIC_CONFIG_FILE_SIZE, fp);
|
// ignore return value of fread, because ferror can get fread state
|
||||||
|
IGNORE_RETURN fread(buf, 1, MAX_NIC_CONFIG_FILE_SIZE, fp);
|
||||||
char *prate = nullptr;
|
char *prate = nullptr;
|
||||||
|
|
||||||
if (OB_UNLIKELY(0 != ferror(fp))) {
|
if (OB_UNLIKELY(0 != ferror(fp))) {
|
||||||
|
|||||||
@ -141,7 +141,7 @@ class ObRefreshTime {
|
|||||||
|
|
||||||
class ObCTASCleanUp {
|
class ObCTASCleanUp {
|
||||||
public:
|
public:
|
||||||
explicit ObCTASCleanUp(ObServer* obs, bool drop_flag) : obs_(obs), drop_flag_(drop_flag)
|
explicit ObCTASCleanUp(ObServer* obs, bool drop_flag) : obs_(obs), drop_flag_(drop_flag), cleanup_rule_type_(0)
|
||||||
{}
|
{}
|
||||||
virtual ~ObCTASCleanUp()
|
virtual ~ObCTASCleanUp()
|
||||||
{}
|
{}
|
||||||
|
|||||||
@ -47,7 +47,7 @@ void ObFifoArena::ObWriteThrottleInfo::reset()
|
|||||||
ATOMIC_SET(&period_throttled_count_, 0);
|
ATOMIC_SET(&period_throttled_count_, 0);
|
||||||
ATOMIC_SET(&period_throttled_time_, 0);
|
ATOMIC_SET(&period_throttled_time_, 0);
|
||||||
ATOMIC_SET(&total_throttled_count_, 0);
|
ATOMIC_SET(&total_throttled_count_, 0);
|
||||||
ATOMIC_SET(&total_throttled_count_, 0);
|
ATOMIC_SET(&total_throttled_time_, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ObFifoArena::ObWriteThrottleInfo::reset_period_stat_info()
|
void ObFifoArena::ObWriteThrottleInfo::reset_period_stat_info()
|
||||||
@ -149,7 +149,7 @@ void ObFifoArena::shrink_cached_page(int64_t nway)
|
|||||||
if (NULL != ref) {
|
if (NULL != ref) {
|
||||||
// There may be concurrent removal, no need to pay attention to the return value
|
// There may be concurrent removal, no need to pay attention to the return value
|
||||||
UNUSED(ATOMIC_BCAS(paddr, page, NULL));
|
UNUSED(ATOMIC_BCAS(paddr, page, NULL));
|
||||||
ATOMIC_FAA(&retired_, page->hold());
|
IGNORE_RETURN ATOMIC_FAA(&retired_, page->hold());
|
||||||
release_ref(ref);
|
release_ref(ref);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -97,7 +97,7 @@ public:
|
|||||||
{
|
{
|
||||||
return get_size();
|
return get_size();
|
||||||
}
|
}
|
||||||
void* alloc(int64_t size)
|
void* alloc(const int64_t size)
|
||||||
{
|
{
|
||||||
return NULL == host_ ? NULL : host_->alloc(*this, size);
|
return NULL == host_ ? NULL : host_->alloc(*this, size);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user