Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
937a2164
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
937a2164
编写于
12月 09, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
TD-2381
上级
cc68a4ef
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
13 addition
and
16 deletion
+13
-16
src/common/src/tglobal.c
src/common/src/tglobal.c
+4
-4
src/dnode/src/dnodeMWrite.c
src/dnode/src/dnodeMWrite.c
+2
-2
src/dnode/src/dnodePeer.c
src/dnode/src/dnodePeer.c
+2
-2
src/dnode/src/dnodeVMgmt.c
src/dnode/src/dnodeVMgmt.c
+2
-2
src/util/src/tconfig.c
src/util/src/tconfig.c
+0
-3
src/wal/src/walWrite.c
src/wal/src/walWrite.c
+3
-3
未找到文件。
src/common/src/tglobal.c
浏览文件 @
937a2164
...
@@ -203,10 +203,10 @@ int32_t tsVersion = 0;
...
@@ -203,10 +203,10 @@ int32_t tsVersion = 0;
// log
// log
int32_t
tsNumOfLogLines
=
10000000
;
int32_t
tsNumOfLogLines
=
10000000
;
int32_t
mDebugFlag
=
13
5
;
int32_t
mDebugFlag
=
13
1
;
int32_t
sdbDebugFlag
=
13
5
;
int32_t
sdbDebugFlag
=
13
1
;
int32_t
dDebugFlag
=
135
;
int32_t
dDebugFlag
=
135
;
int32_t
vDebugFlag
=
13
5
;
int32_t
vDebugFlag
=
13
1
;
int32_t
cDebugFlag
=
131
;
int32_t
cDebugFlag
=
131
;
int32_t
jniDebugFlag
=
131
;
int32_t
jniDebugFlag
=
131
;
int32_t
odbcDebugFlag
=
131
;
int32_t
odbcDebugFlag
=
131
;
...
@@ -220,7 +220,7 @@ int32_t debugFlag = 0;
...
@@ -220,7 +220,7 @@ int32_t debugFlag = 0;
int32_t
sDebugFlag
=
135
;
int32_t
sDebugFlag
=
135
;
int32_t
wDebugFlag
=
135
;
int32_t
wDebugFlag
=
135
;
int32_t
tsdbDebugFlag
=
131
;
int32_t
tsdbDebugFlag
=
131
;
int32_t
cqDebugFlag
=
13
5
;
int32_t
cqDebugFlag
=
13
1
;
int32_t
(
*
monStartSystemFp
)()
=
NULL
;
int32_t
(
*
monStartSystemFp
)()
=
NULL
;
void
(
*
monStopSystemFp
)()
=
NULL
;
void
(
*
monStopSystemFp
)()
=
NULL
;
...
...
src/dnode/src/dnodeMWrite.c
浏览文件 @
937a2164
...
@@ -121,7 +121,7 @@ void dnodeDispatchToMWriteQueue(SRpcMsg *pMsg) {
...
@@ -121,7 +121,7 @@ void dnodeDispatchToMWriteQueue(SRpcMsg *pMsg) {
dnodeSendRedirectMsg
(
pMsg
,
true
);
dnodeSendRedirectMsg
(
pMsg
,
true
);
}
else
{
}
else
{
SMnodeMsg
*
pWrite
=
mnodeCreateMsg
(
pMsg
);
SMnodeMsg
*
pWrite
=
mnodeCreateMsg
(
pMsg
);
d
Debug
(
"msg:%p, app:%p type:%s is put into mwrite queue:%p"
,
pWrite
,
pWrite
->
rpcMsg
.
ahandle
,
d
Trace
(
"msg:%p, app:%p type:%s is put into mwrite queue:%p"
,
pWrite
,
pWrite
->
rpcMsg
.
ahandle
,
taosMsg
[
pWrite
->
rpcMsg
.
msgType
],
tsMWriteQueue
);
taosMsg
[
pWrite
->
rpcMsg
.
msgType
],
tsMWriteQueue
);
taosWriteQitem
(
tsMWriteQueue
,
TAOS_QTYPE_RPC
,
pWrite
);
taosWriteQitem
(
tsMWriteQueue
,
TAOS_QTYPE_RPC
,
pWrite
);
}
}
...
@@ -130,7 +130,7 @@ void dnodeDispatchToMWriteQueue(SRpcMsg *pMsg) {
...
@@ -130,7 +130,7 @@ void dnodeDispatchToMWriteQueue(SRpcMsg *pMsg) {
}
}
static
void
dnodeFreeMWriteMsg
(
SMnodeMsg
*
pWrite
)
{
static
void
dnodeFreeMWriteMsg
(
SMnodeMsg
*
pWrite
)
{
d
Debug
(
"msg:%p, app:%p type:%s is freed from mwrite queue:%p"
,
pWrite
,
pWrite
->
rpcMsg
.
ahandle
,
d
Trace
(
"msg:%p, app:%p type:%s is freed from mwrite queue:%p"
,
pWrite
,
pWrite
->
rpcMsg
.
ahandle
,
taosMsg
[
pWrite
->
rpcMsg
.
msgType
],
tsMWriteQueue
);
taosMsg
[
pWrite
->
rpcMsg
.
msgType
],
tsMWriteQueue
);
mnodeCleanupMsg
(
pWrite
);
mnodeCleanupMsg
(
pWrite
);
...
...
src/dnode/src/dnodePeer.c
浏览文件 @
937a2164
...
@@ -96,7 +96,7 @@ static void dnodeProcessReqMsgFromDnode(SRpcMsg *pMsg, SRpcEpSet *pEpSet) {
...
@@ -96,7 +96,7 @@ static void dnodeProcessReqMsgFromDnode(SRpcMsg *pMsg, SRpcEpSet *pEpSet) {
rspMsg
.
code
=
TSDB_CODE_APP_NOT_READY
;
rspMsg
.
code
=
TSDB_CODE_APP_NOT_READY
;
rpcSendResponse
(
&
rspMsg
);
rpcSendResponse
(
&
rspMsg
);
rpcFreeCont
(
pMsg
->
pCont
);
rpcFreeCont
(
pMsg
->
pCont
);
d
Debug
(
"RPC %p, msg:%s is ignored since dnode not running"
,
pMsg
->
handle
,
taosMsg
[
pMsg
->
msgType
]);
d
Trace
(
"RPC %p, msg:%s is ignored since dnode not running"
,
pMsg
->
handle
,
taosMsg
[
pMsg
->
msgType
]);
return
;
return
;
}
}
...
@@ -151,7 +151,7 @@ void dnodeCleanupClient() {
...
@@ -151,7 +151,7 @@ void dnodeCleanupClient() {
static
void
dnodeProcessRspFromDnode
(
SRpcMsg
*
pMsg
,
SRpcEpSet
*
pEpSet
)
{
static
void
dnodeProcessRspFromDnode
(
SRpcMsg
*
pMsg
,
SRpcEpSet
*
pEpSet
)
{
if
(
dnodeGetRunStatus
()
==
TSDB_RUN_STATUS_STOPPED
)
{
if
(
dnodeGetRunStatus
()
==
TSDB_RUN_STATUS_STOPPED
)
{
if
(
pMsg
==
NULL
||
pMsg
->
pCont
==
NULL
)
return
;
if
(
pMsg
==
NULL
||
pMsg
->
pCont
==
NULL
)
return
;
d
Debug
(
"msg:%p is ignored since dnode is stopping"
,
pMsg
);
d
Trace
(
"msg:%p is ignored since dnode is stopping"
,
pMsg
);
rpcFreeCont
(
pMsg
->
pCont
);
rpcFreeCont
(
pMsg
->
pCont
);
return
;
return
;
}
}
...
...
src/dnode/src/dnodeVMgmt.c
浏览文件 @
937a2164
...
@@ -126,14 +126,14 @@ static void *dnodeProcessMgmtQueue(void *param) {
...
@@ -126,14 +126,14 @@ static void *dnodeProcessMgmtQueue(void *param) {
}
}
pMsg
=
&
pMgmt
->
rpcMsg
;
pMsg
=
&
pMgmt
->
rpcMsg
;
d
Debug
(
"msg:%p, ahandle:%p type:%s will be processed"
,
pMgmt
,
pMsg
->
ahandle
,
taosMsg
[
pMsg
->
msgType
]);
d
Trace
(
"msg:%p, ahandle:%p type:%s will be processed"
,
pMgmt
,
pMsg
->
ahandle
,
taosMsg
[
pMsg
->
msgType
]);
if
(
dnodeProcessMgmtMsgFp
[
pMsg
->
msgType
])
{
if
(
dnodeProcessMgmtMsgFp
[
pMsg
->
msgType
])
{
rsp
.
code
=
(
*
dnodeProcessMgmtMsgFp
[
pMsg
->
msgType
])(
pMsg
);
rsp
.
code
=
(
*
dnodeProcessMgmtMsgFp
[
pMsg
->
msgType
])(
pMsg
);
}
else
{
}
else
{
rsp
.
code
=
TSDB_CODE_DND_MSG_NOT_PROCESSED
;
rsp
.
code
=
TSDB_CODE_DND_MSG_NOT_PROCESSED
;
}
}
d
Debug
(
"msg:%p, is processed, code:0x%x"
,
pMgmt
,
rsp
.
code
);
d
Trace
(
"msg:%p, is processed, code:0x%x"
,
pMgmt
,
rsp
.
code
);
if
(
rsp
.
code
!=
TSDB_CODE_DND_ACTION_IN_PROGRESS
)
{
if
(
rsp
.
code
!=
TSDB_CODE_DND_ACTION_IN_PROGRESS
)
{
rsp
.
handle
=
pMsg
->
handle
;
rsp
.
handle
=
pMsg
->
handle
;
rsp
.
pCont
=
NULL
;
rsp
.
pCont
=
NULL
;
...
...
src/util/src/tconfig.c
浏览文件 @
937a2164
...
@@ -240,9 +240,6 @@ void taosReadGlobalLogCfg() {
...
@@ -240,9 +240,6 @@ void taosReadGlobalLogCfg() {
int
olen
,
vlen
;
int
olen
,
vlen
;
char
fileName
[
PATH_MAX
]
=
{
0
};
char
fileName
[
PATH_MAX
]
=
{
0
};
mDebugFlag
=
135
;
sdbDebugFlag
=
135
;
wordexp_t
full_path
;
wordexp_t
full_path
;
if
(
0
!=
wordexp
(
configDir
,
&
full_path
,
0
))
{
if
(
0
!=
wordexp
(
configDir
,
&
full_path
,
0
))
{
printf
(
"
\n
config file: %s wordexp fail! reason:%s
\n
"
,
configDir
,
strerror
(
errno
));
printf
(
"
\n
config file: %s wordexp fail! reason:%s
\n
"
,
configDir
,
strerror
(
errno
));
...
...
src/wal/src/walWrite.c
浏览文件 @
937a2164
...
@@ -166,14 +166,14 @@ int32_t walRestore(void *handle, void *pVnode, FWalWrite writeFp) {
...
@@ -166,14 +166,14 @@ int32_t walRestore(void *handle, void *pVnode, FWalWrite writeFp) {
char
walName
[
WAL_FILE_LEN
];
char
walName
[
WAL_FILE_LEN
];
snprintf
(
walName
,
sizeof
(
pWal
->
name
),
"%s/%s%"
PRId64
,
pWal
->
path
,
WAL_PREFIX
,
fileId
);
snprintf
(
walName
,
sizeof
(
pWal
->
name
),
"%s/%s%"
PRId64
,
pWal
->
path
,
WAL_PREFIX
,
fileId
);
w
Debug
(
"vgId:%d, file:%s, will be restored"
,
pWal
->
vgId
,
walName
);
w
Info
(
"vgId:%d, file:%s, will be restored"
,
pWal
->
vgId
,
walName
);
int32_t
code
=
walRestoreWalFile
(
pWal
,
pVnode
,
writeFp
,
walName
,
fileId
);
int32_t
code
=
walRestoreWalFile
(
pWal
,
pVnode
,
writeFp
,
walName
,
fileId
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
wError
(
"vgId:%d, file:%s, failed to restore since %s"
,
pWal
->
vgId
,
walName
,
tstrerror
(
code
));
wError
(
"vgId:%d, file:%s, failed to restore since %s"
,
pWal
->
vgId
,
walName
,
tstrerror
(
code
));
continue
;
continue
;
}
}
w
Debug
(
"vgId:%d, file:%s, restore success"
,
pWal
->
vgId
,
walName
);
w
Info
(
"vgId:%d, file:%s, restore success"
,
pWal
->
vgId
,
walName
);
count
++
;
count
++
;
}
}
...
@@ -326,7 +326,7 @@ static int32_t walRestoreWalFile(SWal *pWal, void *pVnode, FWalWrite writeFp, ch
...
@@ -326,7 +326,7 @@ static int32_t walRestoreWalFile(SWal *pWal, void *pVnode, FWalWrite writeFp, ch
offset
=
offset
+
sizeof
(
SWalHead
)
+
pHead
->
len
;
offset
=
offset
+
sizeof
(
SWalHead
)
+
pHead
->
len
;
w
Debug
(
"vgId:%d, restore wal, fileId:%"
PRId64
" hver:%"
PRIu64
" wver:%"
PRIu64
" len:%d"
,
pWal
->
vgId
,
w
Trace
(
"vgId:%d, restore wal, fileId:%"
PRId64
" hver:%"
PRIu64
" wver:%"
PRIu64
" len:%d"
,
pWal
->
vgId
,
fileId
,
pHead
->
version
,
pWal
->
version
,
pHead
->
len
);
fileId
,
pHead
->
version
,
pWal
->
version
,
pHead
->
len
);
pWal
->
version
=
pHead
->
version
;
pWal
->
version
=
pHead
->
version
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录