xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #29065 from taosdata/fix/create-db-log-and-return-code 

fix/create-db-log-and-return-code
This commit is contained in:
Shengliang Guan 2024-12-11 17:18:42 +08:00 committed by GitHub
parent 969f823da8 a6287ed24f
commit 448745754c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en/14-reference/09-error-code.md
View File

@ -251,6 +251,7 @@ This document details the server error codes that may be encountered when using
| 0x80000529 | Vnode is stopped | Vnode is closed | Report issue |
| 0x80000530 | Duplicate write request | Duplicate write request, internal error | Report issue |
| 0x80000531 | Vnode query is busy | Query is busy | Report issue |
| 0x80000540 | Vnode already exist but Dbid not match | Internal error | Report issue |
## tsdb

1
docs/zh/14-reference/09-error-code.md
View File

@ -261,6 +261,7 @@ description: TDengine 服务端的错误码列表和详细说明
| 0x80000529 | Vnode is stopped | Vnode 已经关闭 | 上报问题 |
| 0x80000530 | Duplicate write request | 重复写入请求，内部错误 | 上报问题 |
| 0x80000531 | Vnode query is busy | 查询忙碌 | 上报问题 |
| 0x80000540 | Vnode already exist but Dbid not match | 内部错误 | 上报问题 |
## tsdb

1
include/util/taoserror.h
View File

@ -565,6 +565,7 @@ int32_t taosGetErrSize();
#define TSDB_CODE_VND_ARB_NOT_SYNCED TAOS_DEF_ERROR_CODE(0, 0x0537) // internal
#define TSDB_CODE_VND_WRITE_DISABLED TAOS_DEF_ERROR_CODE(0, 0x0538) // internal
#define TSDB_CODE_VND_TTL_FLUSH_INCOMPLETION TAOS_DEF_ERROR_CODE(0, 0x0539) // internal
#define TSDB_CODE_VND_ALREADY_EXIST_BUT_NOT_MATCH TAOS_DEF_ERROR_CODE(0, 0x0540)
// tsdb
#define TSDB_CODE_TDB_INVALID_TABLE_ID TAOS_DEF_ERROR_CODE(0, 0x0600)

5
source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
View File

@ -378,12 +378,11 @@ int32_t vmProcessCreateVnodeReq(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) {
snprintf(path, TSDB_FILENAME_LEN, "vnode%svnode%d", TD_DIRSEP, vnodeCfg.vgId);
if (vnodeCreate(path, &vnodeCfg, diskPrimary, pMgmt->pTfs) < 0) {
dError("vgId:%d, failed to create vnode since %s", req.vgId, terrstr());
if ((code = vnodeCreate(path, &vnodeCfg, diskPrimary, pMgmt->pTfs)) < 0) {
dError("vgId:%d, failed to create vnode since %s", req.vgId, tstrerror(code));
vmReleaseVnode(pMgmt, pVnode);
vmCleanPrimaryDisk(pMgmt, req.vgId);
(void)tFreeSCreateVnodeReq(&req);
code = terrno != 0 ? terrno : -1;
return code;
}

2
source/dnode/mgmt/mgmt_vnode/src/vmInt.c
View File

@ -94,7 +94,7 @@ static void vmUnRegisterCreatingState(SVnodeMgmt *pMgmt, int32_t vgId) {
dTrace("vgId:%d, remove from creating Hash", vgId);
r = taosHashRemove(pMgmt->creatingHash, &vgId, sizeof(int32_t));
if (r != 0) {
dError("vgId:%d, failed to remove vnode from hash", vgId);
dError("vgId:%d, failed to remove vnode from creatingHash", vgId);
}
(void)taosThreadRwlockUnlock(&pMgmt->lock);

13
source/dnode/vnode/src/vnd/vnodeOpen.c
View File

@ -67,8 +67,17 @@ int32_t vnodeCreate(const char *path, SVnodeCfg *pCfg, int32_t diskPrimary, STfs
SVnodeInfo oldInfo = {0};
oldInfo.config = vnodeCfgDefault;
if (vnodeLoadInfo(dir, &oldInfo) == 0) {
vWarn("vgId:%d, vnode config info already exists at %s.", oldInfo.config.vgId, dir);
return (oldInfo.config.dbId == info.config.dbId) ? 0 : -1;
code = (oldInfo.config.dbId == info.config.dbId) ? 0 : TSDB_CODE_VND_ALREADY_EXIST_BUT_NOT_MATCH;
if (code == 0) {
vWarn("vgId:%d, vnode config info already exists at %s.", oldInfo.config.vgId, dir);
} else {
vError("vgId:%d, vnode config info already exists at %s. oldDbId:%" PRId64 "(%s) at cluster:%" PRId64
", newDbId:%" PRId64 "(%s) at cluser:%" PRId64 ", code:%s",
oldInfo.config.vgId, dir, oldInfo.config.dbId, oldInfo.config.dbname,
oldInfo.config.syncCfg.nodeInfo[oldInfo.config.syncCfg.myIndex].clusterId, info.config.dbId,
info.config.dbname, info.config.syncCfg.nodeInfo[info.config.syncCfg.myIndex].clusterId, tstrerror(code));
}
return code;
}
vInfo("vgId:%d, save config while create", info.config.vgId);

1
source/util/src/terror.c
View File

@ -443,6 +443,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_VND_ARB_NOT_SYNCED, "Vgroup peer is not sy
TAOS_DEFINE_ERROR(TSDB_CODE_VND_WRITE_DISABLED, "Vnode write is disabled for snapshot")
TAOS_DEFINE_ERROR(TSDB_CODE_VND_COLUMN_COMPRESS_ALREADY_EXIST,"Same with old param")
TAOS_DEFINE_ERROR(TSDB_CODE_VND_TTL_FLUSH_INCOMPLETION, "Failed to flush all ttl modification to tdb")
TAOS_DEFINE_ERROR(TSDB_CODE_VND_ALREADY_EXIST_BUT_NOT_MATCH, "Vnode already exist but Dbid not match")
// tsdb