From 3daae395f24b0991eec9a180a4387e0f5ea0c6aa Mon Sep 17 00:00:00 2001 From: obdev Date: Tue, 13 Sep 2022 09:34:26 +0000 Subject: [PATCH] fix WhiteScan bug --- src/observer/ob_server.cpp | 3 ++- src/observer/ob_server.h | 2 +- src/share/allocator/ob_fifo_arena.cpp | 4 ++-- src/share/allocator/ob_gmemstore_allocator.h | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/observer/ob_server.cpp b/src/observer/ob_server.cpp index 33a74ccb3..6b125e7db 100644 --- a/src/observer/ob_server.cpp +++ b/src/observer/ob_server.cpp @@ -1829,7 +1829,8 @@ int ObServer::get_network_speed_from_config_file(int64_t &network_speed) nic_rate_file_exist = 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; if (OB_UNLIKELY(0 != ferror(fp))) { diff --git a/src/observer/ob_server.h b/src/observer/ob_server.h index 43c10118d..2997054a5 100644 --- a/src/observer/ob_server.h +++ b/src/observer/ob_server.h @@ -141,7 +141,7 @@ class ObRefreshTime { class ObCTASCleanUp { 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() {} diff --git a/src/share/allocator/ob_fifo_arena.cpp b/src/share/allocator/ob_fifo_arena.cpp index 88f7ce30f..90413f44c 100644 --- a/src/share/allocator/ob_fifo_arena.cpp +++ b/src/share/allocator/ob_fifo_arena.cpp @@ -47,7 +47,7 @@ void ObFifoArena::ObWriteThrottleInfo::reset() ATOMIC_SET(&period_throttled_count_, 0); ATOMIC_SET(&period_throttled_time_, 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() @@ -149,7 +149,7 @@ void ObFifoArena::shrink_cached_page(int64_t nway) if (NULL != ref) { // There may be concurrent removal, no need to pay attention to the return value UNUSED(ATOMIC_BCAS(paddr, page, NULL)); - ATOMIC_FAA(&retired_, page->hold()); + IGNORE_RETURN ATOMIC_FAA(&retired_, page->hold()); release_ref(ref); } } diff --git a/src/share/allocator/ob_gmemstore_allocator.h b/src/share/allocator/ob_gmemstore_allocator.h index 144c3aae8..d208770a8 100644 --- a/src/share/allocator/ob_gmemstore_allocator.h +++ b/src/share/allocator/ob_gmemstore_allocator.h @@ -97,7 +97,7 @@ public: { return get_size(); } - void* alloc(int64_t size) + void* alloc(const int64_t size) { return NULL == host_ ? NULL : host_->alloc(*this, size); } -- GitLab