From bb860f12d2e0d137f2957bf620c207f739c074e7 Mon Sep 17 00:00:00 2001 From: zhouxin Date: Tue, 1 Jul 2025 10:19:46 -0600 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=99=E8=AF=AF=E7=A0=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 周鑫 Change-Id: I2fd4a962b5d9c894be25c5de3a7c4070a9a2c4d0 --- utils/filemgmt_libfs/include/fs_error.h | 22 ++++++++++++++++------ utils/filemgmt_libn/include/n_error.h | 23 +++++++++++++++++------ 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/utils/filemgmt_libfs/include/fs_error.h b/utils/filemgmt_libfs/include/fs_error.h index 94525eec3..ebb21299f 100644 --- a/utils/filemgmt_libfs/include/fs_error.h +++ b/utils/filemgmt_libfs/include/fs_error.h @@ -158,7 +158,9 @@ enum ErrCodeSuffixOfDistributedFile { E_NETWORK_ERR, E_BATTERY_WARNING, E_EXCEED_MAX_LIMIT, - E_DATABASE_FAILED + E_INNER_ERROR, + E_OTHER_TASK_RUNNING, + E_VERSION_FILE_NO_EXIST, }; enum CommonErrCode { @@ -271,7 +273,8 @@ static inline std::unordered_map> errCodeTa { EBADFD, { FILEIO_SYS_CAP_TAG + E_BADFD, "File descriptor in bad state" } }, { ERESTART, { FILEIO_SYS_CAP_TAG + E_RESTART, "Interrupted system call should be restarted" } }, { EDQUOT, { FILEIO_SYS_CAP_TAG + E_DQUOT, "Quota exceeded" } }, - { UNKNOWN_ERR, { FILEIO_SYS_CAP_TAG + E_UKERR, "Unknown error" } }, + { UNKNOWN_ERR, { FILEIO_SYS_CAP_TAG + E_UKERR, "Unknown error. Possible causes: 1.Insufficient memory." + "2.Memory operation error. 3.Null pointer. 4.Failed to obtain expected resources." } }, { ENOLCK, { FILEIO_SYS_CAP_TAG + E_NOLCK, "No record locks available" } }, { ENETUNREACH, { FILEIO_SYS_CAP_TAG + E_NETUNREACH, "Network is unreachable" } }, { ECONNECTIONFAIL, { FILEIO_SYS_CAP_TAG + E_CONNECTION_FAIL, "Connection failed" } }, @@ -321,7 +324,8 @@ static inline std::unordered_map> errCodeTa { FILEIO_SYS_CAP_TAG + E_RESTART, { FILEIO_SYS_CAP_TAG + E_RESTART, "Interrupted system call should be restarted" } }, { FILEIO_SYS_CAP_TAG + E_DQUOT, { FILEIO_SYS_CAP_TAG + E_DQUOT, "Quota exceeded" } }, - { FILEIO_SYS_CAP_TAG + E_UKERR, { FILEIO_SYS_CAP_TAG + E_UKERR, "Unknown error" } }, + { FILEIO_SYS_CAP_TAG + E_UKERR, { FILEIO_SYS_CAP_TAG + E_UKERR, "Unknown error. Possible causes:" + "1.Insufficient memory. 2.Memory operation error. 3.Null pointer. 4.Failed to obtain expected resources." } }, { FILEIO_SYS_CAP_TAG + E_NOLCK, { FILEIO_SYS_CAP_TAG + E_NOLCK, "No record locks available" } }, { FILEIO_SYS_CAP_TAG + E_NETUNREACH, { FILEIO_SYS_CAP_TAG + E_NETUNREACH, "Network is unreachable" } }, { FILEIO_SYS_CAP_TAG + E_CONNECTION_FAIL, { FILEIO_SYS_CAP_TAG + E_CONNECTION_FAIL, "Connection failed" } }, @@ -351,7 +355,8 @@ static inline std::unordered_map> errCodeTa { USER_FILE_MANAGER_SYS_CAP_TAG + E_FILE_TYPE, "File type is not allow in the directory" } }, { USER_FILE_MANAGER_SYS_CAP_TAG + E_FILE_KEY, { USER_FILE_MANAGER_SYS_CAP_TAG + E_FILE_KEY, "Member not exist" } }, { USER_FILE_MANAGER_SYS_CAP_TAG + E_INPUT, { USER_FILE_MANAGER_SYS_CAP_TAG + E_INPUT, "Wrong input parameter" } }, - { STORAGE_SERVICE_SYS_CAP_TAG + E_IPCSS, { STORAGE_SERVICE_SYS_CAP_TAG + E_IPCSS, "IPC error" } }, + { STORAGE_SERVICE_SYS_CAP_TAG + E_IPCSS, { STORAGE_SERVICE_SYS_CAP_TAG + E_IPCSS, + "IPC error. Possible causes: 1.IPC failed or timed out. 2.Failed to load the service" } }, { STORAGE_SERVICE_SYS_CAP_TAG + E_NOTSUPPORTEDFS, { STORAGE_SERVICE_SYS_CAP_TAG + E_NOTSUPPORTEDFS, "Not supported filesystem" } }, { STORAGE_SERVICE_SYS_CAP_TAG + E_MOUNT, { STORAGE_SERVICE_SYS_CAP_TAG + E_MOUNT, "Failed to mount" } }, @@ -407,8 +412,13 @@ static inline std::unordered_map> errCodeTa { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + E_BATTERY_WARNING, "Battery level warning" } }, { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + E_EXCEED_MAX_LIMIT, { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + E_EXCEED_MAX_LIMIT, "Exceed the maximum limit" } }, - { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + E_DATABASE_FAILED, - { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + E_DATABASE_FAILED, "Database operation failed" } }, + { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + E_INNER_ERROR, { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + + E_INNER_ERROR, "Inner error. Possible causes: 1.Failed to access the database or execute the SQL statement." + "2.System error, such as a null pointer, insufficient memory or a JS engine exception." } }, + { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + E_OTHER_TASK_RUNNING, { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + + E_OTHER_TASK_RUNNING, "The same task is already in progress" } }, + { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + E_VERSION_FILE_NO_EXIST, { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + + E_VERSION_FILE_NO_EXIST, "The version file specified to replace the original file does not exist." } }, }; class FsError { diff --git a/utils/filemgmt_libn/include/n_error.h b/utils/filemgmt_libn/include/n_error.h index e4f624e2b..616855141 100644 --- a/utils/filemgmt_libn/include/n_error.h +++ b/utils/filemgmt_libn/include/n_error.h @@ -160,7 +160,9 @@ enum ErrCodeSuffixOfDistributedFile { E_NETWORK_ERR, E_BATTERY_WARNING, E_EXCEED_MAX_LIMIT, - E_DATABASE_FAILED + E_INNER_ERROR, + E_OTHER_TASK_RUNNING, + E_VERSION_FILE_NO_EXIST, }; enum CommonErrCode { @@ -273,7 +275,8 @@ static inline std::unordered_map> errCodeTa { EBADFD, { FILEIO_SYS_CAP_TAG + E_BADFD, "File descriptor in bad state" } }, { ERESTART, { FILEIO_SYS_CAP_TAG + E_RESTART, "Interrupted system call should be restarted" } }, { EDQUOT, { FILEIO_SYS_CAP_TAG + E_DQUOT, "Quota exceeded" } }, - { UNKROWN_ERR, { FILEIO_SYS_CAP_TAG + E_UKERR, "Unknown error" } }, + { UNKROWN_ERR, { FILEIO_SYS_CAP_TAG + E_UKERR, "Unknown error. Possible causes: 1.Insufficient memory." + "2.Memory operation error. 3.Null pointer. 4.Failed to obtain expected resources." } }, { ENOLCK, { FILEIO_SYS_CAP_TAG + E_NOLCK, "No record locks available" } }, { ENETUNREACH, { FILEIO_SYS_CAP_TAG + E_NETUNREACH, "Network is unreachable" } }, { ECONNECTIONFAIL, { FILEIO_SYS_CAP_TAG + E_CONNECTION_FAIL, "Connection failed" } }, @@ -324,7 +327,8 @@ static inline std::unordered_map> errCodeTa { FILEIO_SYS_CAP_TAG + E_RESTART, { FILEIO_SYS_CAP_TAG + E_RESTART, "Interrupted system call should be restarted" } }, { FILEIO_SYS_CAP_TAG + E_DQUOT, { FILEIO_SYS_CAP_TAG + E_DQUOT, "Quota exceeded" } }, - { FILEIO_SYS_CAP_TAG + E_UKERR, { FILEIO_SYS_CAP_TAG + E_UKERR, "Unknown error" } }, + { FILEIO_SYS_CAP_TAG + E_UKERR, { FILEIO_SYS_CAP_TAG + E_UKERR, "Unknown error. Possible causes:" + "1.Insufficient memory. 2.Memory operation error. 3.Null pointer. 4.Failed to obtain expected resources." } }, { FILEIO_SYS_CAP_TAG + E_NOLCK, { FILEIO_SYS_CAP_TAG + E_NOLCK, "No record locks available" } }, { FILEIO_SYS_CAP_TAG + E_NETUNREACH, { FILEIO_SYS_CAP_TAG + E_NETUNREACH, "Network is unreachable" } }, { FILEIO_SYS_CAP_TAG + E_CONNECTION_FAIL, { FILEIO_SYS_CAP_TAG + E_CONNECTION_FAIL, "Connection failed" } }, @@ -357,7 +361,8 @@ static inline std::unordered_map> errCodeTa "Member not exist" } }, { USER_FILE_MANAGER_SYS_CAP_TAG + E_INPUT, { USER_FILE_MANAGER_SYS_CAP_TAG + E_INPUT, "Wrong input parameter" } }, - { STORAGE_SERVICE_SYS_CAP_TAG + E_IPCSS, { STORAGE_SERVICE_SYS_CAP_TAG + E_IPCSS, "IPC error" } }, + { STORAGE_SERVICE_SYS_CAP_TAG + E_IPCSS, { STORAGE_SERVICE_SYS_CAP_TAG + E_IPCSS, + "IPC error. Possible causes: 1.IPC failed or timed out. 2.Failed to load the service" } }, { STORAGE_SERVICE_SYS_CAP_TAG + E_NOTSUPPORTEDFS, { STORAGE_SERVICE_SYS_CAP_TAG + E_NOTSUPPORTEDFS, "Not supported filesystem" } }, { STORAGE_SERVICE_SYS_CAP_TAG + E_MOUNT, { STORAGE_SERVICE_SYS_CAP_TAG + E_MOUNT, "Failed to mount" } }, @@ -412,8 +417,14 @@ static inline std::unordered_map> errCodeTa E_BATTERY_WARNING, "Battery level warning" } }, { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + E_EXCEED_MAX_LIMIT, { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + E_EXCEED_MAX_LIMIT, "Exceed the maximum limit" } }, - { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + E_DATABASE_FAILED, { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + - E_DATABASE_FAILED, "Database operation failed" } }, + { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + E_INNER_ERROR, { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + + E_INNER_ERROR, "Inner error. Possible causes: 1.Failed to access the database or execute the SQL statement." + "2.System error, such as a null pointer, insufficient memory or a JS engine exception." } }, + { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + E_OTHER_TASK_RUNNING, { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + + E_OTHER_TASK_RUNNING, "The same task is already in progress" } }, + { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + E_VERSION_FILE_NO_EXIST, { DISTRIBUTEDFILE_SERVICE_SYS_CAP_TAG + + E_VERSION_FILE_NO_EXIST, "The version file specified to replace the original file does not exist." } }, + }; class NError { -- Gitee