Skip to content

Fix macOS compilation and remove io_submit health check #916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ep-12221 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix macOS compilation and remove io_submit health check #916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
634830a
fix mac compile,and remove io_submit health check
ep-12221 Jun 17, 2026
f4a2b53
remove doc changes
ep-12221 Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/oblib/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ else()
$<$<NOT:$<BOOL:${BUILD_EMBED_MODE}>>:${_LIB_PATH}/libarrow.a>
$<$<NOT:$<BOOL:${BUILD_EMBED_MODE}>>:${_LIB_PATH}/libparquet.a>
$<$<AND:$<NOT:$<BOOL:${BUILD_EMBED_MODE}>>,$<NOT:$<PLATFORM_ID:Darwin>>>:${_LIB_PATH}/libarrow_bundled_dependencies.a>
$<$<AND:$<NOT:$<BOOL:${BUILD_EMBED_MODE}>>,$<PLATFORM_ID:Darwin>>:-L/opt/homebrew/lib -lutf8proc -lthrift -lre2 -lbrotlicommon -lbrotlienc -lbrotlidec -lbz2 -llz4 -lzstd>
$<$<AND:$<NOT:$<BOOL:${BUILD_EMBED_MODE}>>,$<PLATFORM_ID:Darwin>>:-L/opt/homebrew/lib -lutf8proc -lthrift -lre2 -lbrotlicommon -lbrotlienc -lbrotlidec -lbz2 -llz4 -lzstd -lsnappy>
$<$<PLATFORM_ID:Linux>:-L${DEP_DIR}/var/usr/lib64 -L${DEP_DIR}/var/usr/lib -L${DEP_3RD_DIR}/usr/lib -L${DEP_3RD_DIR}/usr/lib64>
${LIBAIO_LINK_OPTION} $<$<NOT:$<BOOL:${ANDROID}>>:-lpthread> -ldl
$<$<BOOL:${ANDROID}>:-llog>
Expand Down
11 changes: 11 additions & 0 deletions src/share/io/ob_io_struct.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
#include "observer/ob_server.h"
#include "common/storage/ob_fd_simulator.h"

#if defined(__APPLE__)
#define OB_SKIP_BLOCKING_AIO_DETECT_READ
#endif


#ifdef _WIN32

Expand Down Expand Up @@ -2233,9 +2237,16 @@ int ObIOFaultDetector::set_detect_task_io_info_(

bool ObIOFaultDetector::is_supported_detect_read_(const uint64_t tenant_id, const ObIOFd &fd)
{
#ifdef OB_SKIP_BLOCKING_AIO_DETECT_READ
UNUSED(tenant_id);
UNUSED(fd);
// macOS AIO emulation runs pread/pwrite inside io_submit, so detect IO can block.
return false;
#else
bool bret = true;
int ret = OB_SUCCESS;
return bret;
#endif
}

void ObIOFaultDetector::record_io_timeout(const ObIOResult &result, const ObIORequest &req)
Expand Down
Loading