diff --git a/deps/oblib/src/lib/wait_event/ob_wait_event.h b/deps/oblib/src/lib/wait_event/ob_wait_event.h index 36b8ae8f8..0e63e1dc6 100644 --- a/deps/oblib/src/lib/wait_event/ob_wait_event.h +++ b/deps/oblib/src/lib/wait_event/ob_wait_event.h @@ -156,6 +156,7 @@ WAIT_EVENT_DEF(INNER_SESSION_IDLE_WAIT, 30001, "inner session wait to be called" // CONFIGURATION WAIT_EVENT_DEF(WAIT_REFRESH_SCHEMA, 30100, "sleep: wait refresh schema", "sleep_interval", "schema_version", "", CONFIGURATION, true, true) WAIT_EVENT_DEF(PALF_THROTTLING, 30101, "palf throttling sleep", "sleep_interval", "", "", USER_IO, false, true) +WAIT_EVENT_DEF(SLOG_NORMAL_RETRY_SLEEP, 30102, "sleep: slog has io error and retrying", "sleep_interval", "", "", CONCURRENCY, true, true) // END. DO NOT MODIFY. WAIT_EVENT_DEF(WAIT_EVENT_DEF_END, 99999, "event end", "", "", "", OTHER, false, true) diff --git a/src/share/redolog/ob_log_file_handler.cpp b/src/share/redolog/ob_log_file_handler.cpp index c228a58ec..6023df2d1 100644 --- a/src/share/redolog/ob_log_file_handler.cpp +++ b/src/share/redolog/ob_log_file_handler.cpp @@ -307,7 +307,7 @@ int ObLogFileHandler::unlink(const char* file_path) while (OB_SUCC(ret)) { if (OB_FAIL(THE_IO_DEVICE->unlink(file_path)) && OB_NO_SUCH_FILE_OR_DIRECTORY != ret) { LOG_WARN("unlink failed", K(ret), K(file_path)); - ob_usleep(static_cast(UNLINK_RETRY_INTERVAL_US)); + ob_usleep(UNLINK_RETRY_INTERVAL_US); ret = OB_SUCCESS; } else if (OB_NO_SUCH_FILE_OR_DIRECTORY == ret) { ret = OB_SUCCESS; @@ -358,7 +358,7 @@ int ObLogFileHandler::normal_retry_write(void *buf, int64_t size, int64_t offset if (REACH_TIME_INTERVAL(LOG_INTERVAL_US)) { LOG_WARN("fail to aio_write", K(ret), K(io_info), K(retry_cnt)); } else { - ob_usleep(static_cast(SLEEP_TIME_US)); + ob_usleep(SLEEP_TIME_US); } } } while (OB_FAIL(ret)); @@ -381,7 +381,7 @@ int ObLogFileHandler::open(const char *file_path, const int flags, const mode_t LOG_WARN("failed to open file", K(ret), K(file_path), K(errno), KERRMSG); if (OB_TIMEOUT == ret || OB_EAGAIN == ret) { ret = OB_SUCCESS; - ob_usleep(static_cast(ObLogDefinition::RETRY_SLEEP_TIME_IN_US)); + ob_usleep(ObLogDefinition::RETRY_SLEEP_TIME_IN_US); } } else { break;