Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
cd1b8703
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cd1b8703
编写于
12月 22, 2022
作者:
A
Alex Duan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(query): modify error describe
上级
ced76efd
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
16 addition
and
16 deletion
+16
-16
include/libs/qcom/query.h
include/libs/qcom/query.h
+1
-1
include/util/taoserror.h
include/util/taoserror.h
+2
-2
source/client/src/clientImpl.c
source/client/src/clientImpl.c
+5
-5
source/dnode/mgmt/node_mgmt/src/dmTransport.c
source/dnode/mgmt/node_mgmt/src/dmTransport.c
+1
-1
source/dnode/mnode/impl/src/mndTrans.c
source/dnode/mnode/impl/src/mndTrans.c
+1
-1
source/libs/function/src/udfd.c
source/libs/function/src/udfd.c
+1
-1
source/libs/scheduler/inc/schInt.h
source/libs/scheduler/inc/schInt.h
+1
-1
source/libs/transport/src/transCli.c
source/libs/transport/src/transCli.c
+3
-3
source/util/src/terror.c
source/util/src/terror.c
+1
-1
未找到文件。
include/libs/qcom/query.h
浏览文件 @
cd1b8703
...
...
@@ -268,7 +268,7 @@ extern int32_t (*queryProcessMsgRsp[TDMT_MAX])(void* output, char* msg, int32_t
((_code) == TSDB_CODE_SYN_NOT_LEADER || (_code) == TSDB_CODE_SYN_RESTORING || (_code) == TSDB_CODE_SYN_INTERNAL_ERROR)
#define SYNC_OTHER_LEADER_REDIRECT_ERROR(_code) ((_code) == TSDB_CODE_MNODE_NOT_FOUND)
#define NO_RET_REDIRECT_ERROR(_code) ((_code) == TSDB_CODE_RPC_BROKEN_LINK || (_code) == TSDB_CODE_RPC_NETWORK_UNAVAIL || (_code) == TSDB_CODE_RPC_
VGROUP
_NOT_CONNECTED)
#define NO_RET_REDIRECT_ERROR(_code) ((_code) == TSDB_CODE_RPC_BROKEN_LINK || (_code) == TSDB_CODE_RPC_NETWORK_UNAVAIL || (_code) == TSDB_CODE_RPC_
SOMENODE
_NOT_CONNECTED)
#define NEED_REDIRECT_ERROR(_code) \
(NO_RET_REDIRECT_ERROR(_code) || SYNC_UNKNOWN_LEADER_REDIRECT_ERROR(_code) || \
...
...
include/util/taoserror.h
浏览文件 @
cd1b8703
...
...
@@ -65,8 +65,8 @@ int32_t* taosGetErrno();
#define TSDB_CODE_RPC_PORT_EADDRINUSE TAOS_DEF_ERROR_CODE(0, 0x0017) //
#define TSDB_CODE_RPC_BROKEN_LINK TAOS_DEF_ERROR_CODE(0, 0x0018) //
#define TSDB_CODE_RPC_TIMEOUT TAOS_DEF_ERROR_CODE(0, 0x0019) //
#define TSDB_CODE_RPC_
VGROUP_NOT_CONNECTED
TAOS_DEF_ERROR_CODE(0, 0x0020) // "Vgroup could not be connected"
#define TSDB_CODE_RPC_
VGROUP_BROKEN_LINK
TAOS_DEF_ERROR_CODE(0, 0x0021) //
#define TSDB_CODE_RPC_
SOMENODE_NOT_CONNECTED
TAOS_DEF_ERROR_CODE(0, 0x0020) // "Vgroup could not be connected"
#define TSDB_CODE_RPC_
SOMENODE_BROKEN_LINK
TAOS_DEF_ERROR_CODE(0, 0x0021) //
//common & util
#define TSDB_CODE_OPS_NOT_SUPPORT TAOS_DEF_ERROR_CODE(0, 0x0100) //
...
...
source/client/src/clientImpl.c
浏览文件 @
cd1b8703
...
...
@@ -1430,16 +1430,16 @@ void processMsgFromServer(void* parent, SRpcMsg* pMsg, SEpSet* pEpSet) {
case
TDMT_VND_SUBMIT
+
1
:
case
TDMT_SCH_QUERY
+
1
:
case
TDMT_SCH_MERGE_QUERY
+
1
:
// uniform to one error code: TSDB_CODE_RPC_
VGROUP
_NOT_CONNECTED
if
(
pMsg
->
code
==
TSDB_CODE_RPC_
VGROUP
_BROKEN_LINK
)
{
pMsg
->
code
=
TSDB_CODE_RPC_
VGROUP
_NOT_CONNECTED
;
// uniform to one error code: TSDB_CODE_RPC_
SOMENODE
_NOT_CONNECTED
if
(
pMsg
->
code
==
TSDB_CODE_RPC_
SOMENODE
_BROKEN_LINK
)
{
pMsg
->
code
=
TSDB_CODE_RPC_
SOMENODE
_NOT_CONNECTED
;
}
break
;
default:
// restore origin code
if
(
pMsg
->
code
==
TSDB_CODE_RPC_
VGROUP
_NOT_CONNECTED
)
{
if
(
pMsg
->
code
==
TSDB_CODE_RPC_
SOMENODE
_NOT_CONNECTED
)
{
pMsg
->
code
=
TSDB_CODE_RPC_NETWORK_UNAVAIL
;
}
else
if
(
pMsg
->
code
==
TSDB_CODE_RPC_
VGROUP
_BROKEN_LINK
)
{
}
else
if
(
pMsg
->
code
==
TSDB_CODE_RPC_
SOMENODE
_BROKEN_LINK
)
{
pMsg
->
code
=
TSDB_CODE_RPC_BROKEN_LINK
;
}
break
;
...
...
source/dnode/mgmt/node_mgmt/src/dmTransport.c
浏览文件 @
cd1b8703
...
...
@@ -233,7 +233,7 @@ static inline void dmReleaseHandle(SRpcHandleInfo *pHandle, int8_t type) { rpcRe
static
bool
rpcRfp
(
int32_t
code
,
tmsg_t
msgType
)
{
if
(
code
==
TSDB_CODE_RPC_NETWORK_UNAVAIL
||
code
==
TSDB_CODE_RPC_BROKEN_LINK
||
code
==
TSDB_CODE_MNODE_NOT_FOUND
||
code
==
TSDB_CODE_RPC_
VGROUP
_NOT_CONNECTED
||
code
==
TSDB_CODE_RPC_
SOMENODE
_NOT_CONNECTED
||
code
==
TSDB_CODE_SYN_NOT_LEADER
||
code
==
TSDB_CODE_SYN_RESTORING
||
code
==
TSDB_CODE_VND_STOPPED
||
code
==
TSDB_CODE_APP_IS_STARTING
||
code
==
TSDB_CODE_APP_IS_STOPPING
)
{
if
(
msgType
==
TDMT_SCH_QUERY
||
msgType
==
TDMT_SCH_MERGE_QUERY
||
msgType
==
TDMT_SCH_FETCH
||
...
...
source/dnode/mnode/impl/src/mndTrans.c
浏览文件 @
cd1b8703
...
...
@@ -957,7 +957,7 @@ static void mndTransSendRpcRsp(SMnode *pMnode, STrans *pTrans) {
for
(
int32_t
i
=
0
;
i
<
size
;
++
i
)
{
SRpcHandleInfo
*
pInfo
=
taosArrayGet
(
pTrans
->
pRpcArray
,
i
);
if
(
pInfo
->
handle
!=
NULL
)
{
if
(
code
==
TSDB_CODE_RPC_NETWORK_UNAVAIL
||
code
==
TSDB_CODE_RPC_
VGROUP
_NOT_CONNECTED
)
{
if
(
code
==
TSDB_CODE_RPC_NETWORK_UNAVAIL
||
code
==
TSDB_CODE_RPC_
SOMENODE
_NOT_CONNECTED
)
{
code
=
TSDB_CODE_MND_TRANS_NETWORK_UNAVAILL
;
}
if
(
i
!=
0
&&
code
==
0
)
{
...
...
source/libs/function/src/udfd.c
浏览文件 @
cd1b8703
...
...
@@ -606,7 +606,7 @@ int32_t udfdLoadUdf(char *udfName, SUdf *udf) {
}
static
bool
udfdRpcRfp
(
int32_t
code
,
tmsg_t
msgType
)
{
if
(
code
==
TSDB_CODE_RPC_NETWORK_UNAVAIL
||
code
==
TSDB_CODE_RPC_BROKEN_LINK
||
code
==
TSDB_CODE_SYN_NOT_LEADER
||
code
==
TSDB_CODE_RPC_
VGROUP
_NOT_CONNECTED
||
code
==
TSDB_CODE_RPC_
SOMENODE
_NOT_CONNECTED
||
code
==
TSDB_CODE_SYN_RESTORING
||
code
==
TSDB_CODE_MNODE_NOT_FOUND
||
code
==
TSDB_CODE_APP_IS_STARTING
||
code
==
TSDB_CODE_APP_IS_STOPPING
)
{
if
(
msgType
==
TDMT_SCH_QUERY
||
msgType
==
TDMT_SCH_MERGE_QUERY
||
msgType
==
TDMT_SCH_FETCH
||
...
...
source/libs/scheduler/inc/schInt.h
浏览文件 @
cd1b8703
...
...
@@ -375,7 +375,7 @@ extern SSchedulerMgmt schMgmt;
#define SCH_JOB_NEED_WAIT(_job) (!SCH_IS_QUERY_JOB(_job))
#define SCH_JOB_NEED_DROP(_job) (SCH_IS_QUERY_JOB(_job))
#define SCH_IS_EXPLAIN_JOB(_job) (EXPLAIN_MODE_ANALYZE == (_job)->attr.explainMode)
#define SCH_NETWORK_ERR(_code) ((_code) == TSDB_CODE_RPC_BROKEN_LINK || (_code) == TSDB_CODE_RPC_NETWORK_UNAVAIL || (_code) == TSDB_CODE_RPC_
VGROUP
_NOT_CONNECTED)
#define SCH_NETWORK_ERR(_code) ((_code) == TSDB_CODE_RPC_BROKEN_LINK || (_code) == TSDB_CODE_RPC_NETWORK_UNAVAIL || (_code) == TSDB_CODE_RPC_
SOMENODE
_NOT_CONNECTED)
#define SCH_MERGE_TASK_NETWORK_ERR(_task, _code, _len) \
(SCH_NETWORK_ERR(_code) && (((_len) > 0) || (!SCH_IS_DATA_BIND_TASK(_task)) || (_task)->redirectCtx.inRedirect))
#define SCH_REDIRECT_MSGTYPE(_msgType) \
...
...
source/libs/transport/src/transCli.c
浏览文件 @
cd1b8703
...
...
@@ -1665,7 +1665,7 @@ int cliAppCb(SCliConn* pConn, STransMsg* pResp, SCliMsg* pMsg) {
if
(
pCtx
->
retryCode
!=
TSDB_CODE_SUCCESS
)
{
int32_t
code
=
pResp
->
code
;
// return internal code app
if
(
code
==
TSDB_CODE_RPC_NETWORK_UNAVAIL
||
code
==
TSDB_CODE_RPC_BROKEN_LINK
||
code
==
TSDB_CODE_RPC_
VGROUP
_NOT_CONNECTED
)
{
if
(
code
==
TSDB_CODE_RPC_NETWORK_UNAVAIL
||
code
==
TSDB_CODE_RPC_BROKEN_LINK
||
code
==
TSDB_CODE_RPC_
SOMENODE
_NOT_CONNECTED
)
{
pResp
->
code
=
pCtx
->
retryCode
;
}
}
...
...
@@ -1673,9 +1673,9 @@ int cliAppCb(SCliConn* pConn, STransMsg* pResp, SCliMsg* pMsg) {
// check whole vnodes is offline on this vgroup
if
(
pCtx
->
epsetRetryCnt
>=
pCtx
->
epSet
.
numOfEps
||
pCtx
->
retryStep
>
0
)
{
if
(
pResp
->
code
==
TSDB_CODE_RPC_NETWORK_UNAVAIL
)
{
pResp
->
code
=
TSDB_CODE_RPC_
VGROUP
_NOT_CONNECTED
;
pResp
->
code
=
TSDB_CODE_RPC_
SOMENODE
_NOT_CONNECTED
;
}
else
if
(
pResp
->
code
==
TSDB_CODE_RPC_BROKEN_LINK
)
{
pResp
->
code
=
TSDB_CODE_RPC_
VGROUP
_BROKEN_LINK
;
pResp
->
code
=
TSDB_CODE_RPC_
SOMENODE
_BROKEN_LINK
;
}
}
...
...
source/util/src/terror.c
浏览文件 @
cd1b8703
...
...
@@ -51,7 +51,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_RPC_FQDN_ERROR, "Unable to resolve FQD
TAOS_DEFINE_ERROR
(
TSDB_CODE_RPC_PORT_EADDRINUSE
,
"Port already in use"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_RPC_BROKEN_LINK
,
"Conn is broken"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_RPC_TIMEOUT
,
"Conn read timeout"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_RPC_
VGROUP_NOT_CONNECTED
,
"Vgroup could not be connected
"
)
TAOS_DEFINE_ERROR
(
TSDB_CODE_RPC_
SOMENODE_NOT_CONNECTED
,
"some vnode/qnode/mnode(s) out of service
"
)
//common & util
TAOS_DEFINE_ERROR
(
TSDB_CODE_TIME_UNSYNCED
,
"Client and server's time is not synchronized"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录