hcq/oceanbase
hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Change some log level

Browse Source
This commit is contained in:
JiahuaChen 2024-11-28 11:19:44 +00:00 committed by ob-robot
parent 03791b2a96
commit 830569e8e6
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/share/ob_io_device_helper.cpp
View File

@ -873,7 +873,7 @@ int ObIODeviceLocalFileOp::get_block_file_size(
LOG_WARN("fail to compute block file size", KR(ret), K(sstable_dir), K(reserved_size),
K(block_size), K(suggest_file_size), K(disk_percentage), K(block_file_size));
} else if (OB_FAIL(ObIODeviceLocalFileOp::check_disk_space_available(sstable_dir,
block_file_size, reserved_size, old_block_file_size))) {
block_file_size, reserved_size, old_block_file_size, (0 == block_file_size)))) {
LOG_WARN("fail to check disk space available", KR(ret), K(sstable_dir),
K(block_file_size), K(reserved_size), K(old_block_file_size));
}
@ -923,7 +923,8 @@ int ObIODeviceLocalFileOp::check_disk_space_available(
const char *sstable_dir,
const int64_t data_disk_size,
const int64_t reserved_size,
const int64_t used_disk_size)
const int64_t used_disk_size,
const bool need_report_user_error)
{
int ret = OB_SUCCESS;
struct statvfs svfs;
@ -939,11 +940,16 @@ int ObIODeviceLocalFileOp::check_disk_space_available(
SHARE_LOG(WARN, "Failed to get disk space ", K(ret), K(sstable_dir));
} else {
// check disk space availability for datafile_size, must satisfy datafile_size < used_disk_size + disk_free_space
int64_t free_space = std::max(0L, (int64_t)(svfs.f_bavail * svfs.f_bsize - reserved_size));
const int64_t free_space = std::max(0L, (int64_t)(svfs.f_bavail * svfs.f_bsize - reserved_size));
if (data_disk_size > used_disk_size + free_space) {
ret = OB_SERVER_OUTOF_DISK_SPACE;
LOG_DBA_ERROR(OB_SERVER_OUTOF_DISK_SPACE, "msg", "data file size is too large", K(ret),
K(free_space), K(used_disk_size), K(data_disk_size));
if (need_report_user_error) {
LOG_DBA_ERROR(OB_SERVER_OUTOF_DISK_SPACE, "msg", "data file size is too large", K(ret),
K(free_space), K(reserved_size), K(used_disk_size), K(data_disk_size));
} else {
LOG_DBA_WARN(OB_SERVER_OUTOF_DISK_SPACE, "msg", "data file size is too large", K(ret),
K(free_space), K(reserved_size), K(used_disk_size), K(data_disk_size));
}
}
}
return ret;

3
src/share/ob_io_device_helper.h
View File

@ -220,7 +220,8 @@ public:
static int check_disk_space_available(const char *sstable_dir,
const int64_t data_disk_size,
const int64_t reserved_size,
const int64_t used_disk_size);
const int64_t used_disk_size,
const bool need_report_user_error);
static int open_block_file(const char *store_dir,
const char *sstable_dir,

2
src/storage/tablet/ob_i_tablet_mds_interface.ipp
View File

@ -161,6 +161,8 @@ inline int ObITabletMdsInterface::get_mds_data_from_tablet(
if (OB_ITER_END == ret) {
ret = OB_SNAPSHOT_DISCARDED;
MDS_LOG(DEBUG, "read nothing from mds sstable", K(ret));
} else if (OB_EMPTY_RESULT == ret) {
// skip report warn log
} else {
MDS_LOG(WARN, "fail to read data from mds sstable", K(ret));
}