From 66972f75953fc3e53fac2c7b1c33dc04bf6bfe0a Mon Sep 17 00:00:00 2001 From: wxhwang Date: Fri, 2 Dec 2022 10:05:45 +0000 Subject: [PATCH] define 2 error codes --- src/share/ob_errno.cpp | 26 ++++++++++++++++++++++++++ src/share/ob_errno.def | 2 ++ src/share/ob_errno.h | 6 ++++++ 3 files changed, 34 insertions(+) diff --git a/src/share/ob_errno.cpp b/src/share/ob_errno.cpp index 713c67c87..1e8a6ff91 100644 --- a/src/share/ob_errno.cpp +++ b/src/share/ob_errno.cpp @@ -19269,6 +19269,30 @@ static const _error _error_OB_ESI_SESSION_NOT_EXIST = { .oracle_str_error = "ORA-00600: internal error code, arguments: -9090, obesi process session not exist", .oracle_str_user_error = "ORA-00600: internal error code, arguments: -9090, obesi process session not exist" }; +static const _error _error_OB_ALREADY_IN_ARCHIVE_MODE = { + .error_name = "OB_ALREADY_IN_ARCHIVE_MODE", + .error_cause = "Internal Error", + .error_solution = "Contact OceanBase Support", + .mysql_errno = -1, + .sqlstate = "HY000", + .str_error = "Already in ARCHIVELOG mode", + .str_user_error = "Already in ARCHIVELOG mode", + .oracle_errno = 600, + .oracle_str_error = "ORA-00600: internal error code, arguments: -9091, Already in ARCHIVELOG mode", + .oracle_str_user_error = "ORA-00600: internal error code, arguments: -9091, Already in ARCHIVELOG mode" +}; +static const _error _error_OB_ALREADY_IN_NOARCHIVE_MODE = { + .error_name = "OB_ALREADY_IN_NOARCHIVE_MODE", + .error_cause = "Internal Error", + .error_solution = "Contact OceanBase Support", + .mysql_errno = -1, + .sqlstate = "HY000", + .str_error = "Already in NOARCHIVELOG mode", + .str_user_error = "Already in NOARCHIVELOG mode", + .oracle_errno = 600, + .oracle_str_error = "ORA-00600: internal error code, arguments: -9092, Already in NOARCHIVELOG mode", + .oracle_str_user_error = "ORA-00600: internal error code, arguments: -9092, Already in NOARCHIVELOG mode" +}; static const _error _error_OB_NO_SUCH_FILE_OR_DIRECTORY = { .error_name = "OB_NO_SUCH_FILE_OR_DIRECTORY", .error_cause = "Internal Error", @@ -23592,6 +23616,8 @@ struct ObStrErrorInit _errors[-OB_BACKUP_MAJOR_NOT_COVER_MINOR] = &_error_OB_BACKUP_MAJOR_NOT_COVER_MINOR; _errors[-OB_BACKUP_ADVANCE_CHECKPOINT_TIMEOUT] = &_error_OB_BACKUP_ADVANCE_CHECKPOINT_TIMEOUT; _errors[-OB_ESI_SESSION_NOT_EXIST] = &_error_OB_ESI_SESSION_NOT_EXIST; + _errors[-OB_ALREADY_IN_ARCHIVE_MODE] = &_error_OB_ALREADY_IN_ARCHIVE_MODE; + _errors[-OB_ALREADY_IN_NOARCHIVE_MODE] = &_error_OB_ALREADY_IN_NOARCHIVE_MODE; _errors[-OB_NO_SUCH_FILE_OR_DIRECTORY] = &_error_OB_NO_SUCH_FILE_OR_DIRECTORY; _errors[-OB_FILE_OR_DIRECTORY_EXIST] = &_error_OB_FILE_OR_DIRECTORY_EXIST; _errors[-OB_FILE_OR_DIRECTORY_PERMISSION_DENIED] = &_error_OB_FILE_OR_DIRECTORY_PERMISSION_DENIED; diff --git a/src/share/ob_errno.def b/src/share/ob_errno.def index f1a39d0c9..d1874fe05 100644 --- a/src/share/ob_errno.def +++ b/src/share/ob_errno.def @@ -1777,6 +1777,8 @@ DEFINE_ERROR(OB_BACKUP_ADVANCE_CHECKPOINT_TIMEOUT, -9086, -1, "HY000", "backup a DEFINE_ERROR(OB_ESI_SESSION_NOT_EXIST, -9090, -1, "HY000", "obesi process session not exist"); +DEFINE_ERROR(OB_ALREADY_IN_ARCHIVE_MODE, -9091, -1, "HY000", "Already in ARCHIVELOG mode"); +DEFINE_ERROR(OB_ALREADY_IN_NOARCHIVE_MODE, -9092, -1, "HY000", "Already in NOARCHIVELOG mode"); // end of backup and restore error codes 9001 ~ 9099 //////////////////////////////////////////////////////////////// diff --git a/src/share/ob_errno.h b/src/share/ob_errno.h index ca6e1b8a2..dc9cb0aec 100644 --- a/src/share/ob_errno.h +++ b/src/share/ob_errno.h @@ -1373,6 +1373,8 @@ constexpr int OB_BACKUP_FORMAT_FILE_NOT_MATCH = -9081; constexpr int OB_BACKUP_MAJOR_NOT_COVER_MINOR = -9085; constexpr int OB_BACKUP_ADVANCE_CHECKPOINT_TIMEOUT = -9086; constexpr int OB_ESI_SESSION_NOT_EXIST = -9090; +constexpr int OB_ALREADY_IN_ARCHIVE_MODE = -9091; +constexpr int OB_ALREADY_IN_NOARCHIVE_MODE = -9092; constexpr int OB_NO_SUCH_FILE_OR_DIRECTORY = -9100; constexpr int OB_FILE_OR_DIRECTORY_EXIST = -9101; constexpr int OB_FILE_OR_DIRECTORY_PERMISSION_DENIED = -9102; @@ -3205,6 +3207,8 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219; #define OB_BACKUP_MAJOR_NOT_COVER_MINOR__USER_ERROR_MSG "backup major sstable range not cover minor sstable" #define OB_BACKUP_ADVANCE_CHECKPOINT_TIMEOUT__USER_ERROR_MSG "backup advance checkpoint by flush timeout" #define OB_ESI_SESSION_NOT_EXIST__USER_ERROR_MSG "obesi process session not exist" +#define OB_ALREADY_IN_ARCHIVE_MODE__USER_ERROR_MSG "Already in ARCHIVELOG mode" +#define OB_ALREADY_IN_NOARCHIVE_MODE__USER_ERROR_MSG "Already in NOARCHIVELOG mode" #define OB_NO_SUCH_FILE_OR_DIRECTORY__USER_ERROR_MSG "no such file or directory" #define OB_FILE_OR_DIRECTORY_EXIST__USER_ERROR_MSG "file or directory already exist" #define OB_FILE_OR_DIRECTORY_PERMISSION_DENIED__USER_ERROR_MSG "file or directory permission denied" @@ -5038,6 +5042,8 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219; #define OB_BACKUP_MAJOR_NOT_COVER_MINOR__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9085, backup major sstable range not cover minor sstable" #define OB_BACKUP_ADVANCE_CHECKPOINT_TIMEOUT__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9086, backup advance checkpoint by flush timeout" #define OB_ESI_SESSION_NOT_EXIST__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9090, obesi process session not exist" +#define OB_ALREADY_IN_ARCHIVE_MODE__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9091, Already in ARCHIVELOG mode" +#define OB_ALREADY_IN_NOARCHIVE_MODE__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9092, Already in NOARCHIVELOG mode" #define OB_NO_SUCH_FILE_OR_DIRECTORY__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9100, no such file or directory" #define OB_FILE_OR_DIRECTORY_EXIST__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9101, file or directory already exist" #define OB_FILE_OR_DIRECTORY_PERMISSION_DENIED__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9102, file or directory permission denied" -- GitLab