Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
王长生-AnH
TDengine
提交
c877418d
T
TDengine
项目概览
王长生-AnH
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c877418d
编写于
7月 17, 2020
作者:
dengyihao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
support multi thread update mnode and dnode
上级
f8818e5b
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
72 addition
and
35 deletion
+72
-35
src/client/inc/tsclient.h
src/client/inc/tsclient.h
+1
-1
src/client/src/tscServer.c
src/client/src/tscServer.c
+53
-25
src/client/src/tscSql.c
src/client/src/tscSql.c
+1
-1
src/client/src/tscSystem.c
src/client/src/tscSystem.c
+2
-1
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+10
-7
src/inc/trpc.h
src/inc/trpc.h
+5
-0
未找到文件。
src/client/inc/tsclient.h
浏览文件 @
c877418d
...
...
@@ -457,7 +457,7 @@ extern void * tscQhandle;
extern
int
tscKeepConn
[];
extern
int
tsInsertHeadSize
;
extern
int
tscNumOfThreads
;
extern
SRpcIpSet
tscMgmtIpSet
;
extern
SRpc
Cor
IpSet
tscMgmtIpSet
;
extern
int
(
*
tscBuildMsg
[
TSDB_SQL_MAX
])(
SSqlObj
*
pSql
,
SSqlInfo
*
pInfo
);
...
...
src/client/src/tscServer.c
浏览文件 @
c877418d
...
...
@@ -29,7 +29,7 @@
#define TSC_MGMT_VNODE 999
SRpcIpSet
tscMgmtIpSet
;
SRpc
Cor
IpSet
tscMgmtIpSet
;
SRpcIpSet
tscDnodeIpSet
;
int
(
*
tscBuildMsg
[
TSDB_SQL_MAX
])(
SSqlObj
*
pSql
,
SSqlInfo
*
pInfo
)
=
{
0
};
...
...
@@ -44,6 +44,42 @@ void tscSaveSubscriptionProgress(void* sub);
static
int32_t
minMsgSize
()
{
return
tsRpcHeadSize
+
100
;
}
static
void
tscDumpMgmtIpSet
(
SRpcIpSet
*
ipSet
)
{
taosCorBeginRead
(
&
tscMgmtIpSet
.
version
);
*
ipSet
=
tscMgmtIpSet
.
ipSet
;
taosCorEndRead
(
&
tscMgmtIpSet
.
version
);
}
bool
tscIpSetIsEqual
(
SRpcIpSet
*
s1
,
SRpcIpSet
*
s2
)
{
if
(
s1
->
numOfIps
!=
s2
->
numOfIps
||
s1
->
inUse
!=
s1
->
inUse
)
{
return
false
;
}
for
(
int32_t
i
=
0
;
i
<
s1
->
numOfIps
;
i
++
)
{
if
(
s1
->
port
[
i
]
!=
s2
->
port
[
i
]
||
strncmp
(
s1
->
fqdn
[
i
],
s2
->
fqdn
[
i
],
TSDB_FQDN_LEN
)
!=
0
)
return
false
;
}
return
true
;
}
void
tscSetMgmtIpList
(
SRpcIpSet
*
pIpSet
)
{
// no need to update if equal
SRpcIpSet
dump
;
tscDumpMgmtIpSet
(
&
dump
);
if
(
tscIpSetIsEqual
(
&
dump
,
pIpSet
))
{
return
;
}
taosCorBeginWrite
(
&
tscMgmtIpSet
.
version
);
SRpcIpSet
*
mgmtIpSet
=
&
tscMgmtIpSet
.
ipSet
;
mgmtIpSet
->
numOfIps
=
pIpSet
->
numOfIps
;
mgmtIpSet
->
inUse
=
pIpSet
->
inUse
;
for
(
int32_t
i
=
0
;
i
<
mgmtIpSet
->
numOfIps
;
++
i
)
{
mgmtIpSet
->
port
[
i
]
=
htons
(
pIpSet
->
port
[
i
]);
strncpy
(
mgmtIpSet
->
fqdn
[
i
],
pIpSet
->
fqdn
[
i
],
TSDB_FQDN_LEN
);
}
taosCorEndWrite
(
&
tscMgmtIpSet
.
version
);
}
static
void
tscSetDnodeIpList
(
SSqlObj
*
pSql
,
SCMVgroupInfo
*
pVgroupInfo
)
{
SRpcIpSet
*
pIpList
=
&
pSql
->
ipList
;
pIpList
->
inUse
=
0
;
...
...
@@ -60,31 +96,17 @@ static void tscSetDnodeIpList(SSqlObj* pSql, SCMVgroupInfo* pVgroupInfo) {
}
void
tscPrintMgmtIp
()
{
if
(
tscMgmtIpSet
.
numOfIps
<=
0
)
{
tscError
(
"invalid mnode IP list:%d"
,
tscMgmtIpSet
.
numOfIps
);
SRpcIpSet
dump
;
tscDumpMgmtIpSet
(
&
dump
);
if
(
dump
.
numOfIps
<=
0
)
{
tscError
(
"invalid mnode IP list:%d"
,
dump
.
numOfIps
);
}
else
{
for
(
int
i
=
0
;
i
<
tscMgmtIpSet
.
numOfIps
;
++
i
)
{
tscDebug
(
"mnode index:%d %s:%d"
,
i
,
tscMgmtIpSet
.
fqdn
[
i
],
tscMgmtIpSet
.
port
[
i
]);
for
(
int
i
=
0
;
i
<
dump
.
numOfIps
;
++
i
)
{
tscDebug
(
"mnode index:%d %s:%d"
,
i
,
dump
.
fqdn
[
i
],
dump
.
port
[
i
]);
}
}
}
void
tscSetMgmtIpList
(
SRpcIpSet
*
pIpList
)
{
tscMgmtIpSet
.
numOfIps
=
pIpList
->
numOfIps
;
tscMgmtIpSet
.
inUse
=
pIpList
->
inUse
;
for
(
int32_t
i
=
0
;
i
<
tscMgmtIpSet
.
numOfIps
;
++
i
)
{
tscMgmtIpSet
.
port
[
i
]
=
htons
(
pIpList
->
port
[
i
]);
}
}
void
tscUpdateIpSet
(
void
*
ahandle
,
SRpcIpSet
*
pIpSet
)
{
tscMgmtIpSet
=
*
pIpSet
;
tscDebug
(
"mnode IP list is changed for ufp is called, numOfIps:%d inUse:%d"
,
tscMgmtIpSet
.
numOfIps
,
tscMgmtIpSet
.
inUse
);
for
(
int32_t
i
=
0
;
i
<
tscMgmtIpSet
.
numOfIps
;
++
i
)
{
tscDebug
(
"index:%d fqdn:%s port:%d"
,
i
,
tscMgmtIpSet
.
fqdn
[
i
],
tscMgmtIpSet
.
port
[
i
]);
}
}
/*
* For each management node, try twice at least in case of poor network situation.
* If the client start to connect to a non-management node from the client, and the first retry may fail due to
...
...
@@ -95,7 +117,9 @@ void tscUpdateIpSet(void *ahandle, SRpcIpSet *pIpSet) {
UNUSED_FUNC
static
int32_t
tscGetMgmtConnMaxRetryTimes
()
{
int32_t
factor
=
2
;
return
tscMgmtIpSet
.
numOfIps
*
factor
;
SRpcIpSet
dump
;
tscDumpMgmtIpSet
(
&
dump
);
return
dump
.
numOfIps
*
factor
;
}
void
tscProcessHeartBeatRsp
(
void
*
param
,
TAOS_RES
*
tres
,
int
code
)
{
...
...
@@ -185,7 +209,9 @@ int tscSendMsgToServer(SSqlObj *pSql) {
// set the mgmt ip list
if
(
pSql
->
cmd
.
command
>=
TSDB_SQL_MGMT
)
{
pSql
->
ipList
=
tscMgmtIpSet
;
SRpcIpSet
dump
;
tscDumpMgmtIpSet
(
&
dump
);
pSql
->
ipList
=
dump
;
}
memcpy
(
pMsg
,
pSql
->
cmd
.
payload
,
pSql
->
cmd
.
payloadLen
);
...
...
@@ -239,7 +265,7 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcIpSet *pIpSet) {
if
(
pCmd
->
command
<
TSDB_SQL_MGMT
)
{
if
(
pIpSet
)
pSql
->
ipList
=
*
pIpSet
;
}
else
{
if
(
pIpSet
)
tsc
MgmtIpSet
=
*
pIpSet
;
if
(
pIpSet
)
tsc
SetMgmtIpList
(
pIpSet
);
}
if
(
rpcMsg
->
pCont
==
NULL
)
{
...
...
@@ -421,7 +447,9 @@ int tscProcessSql(SSqlObj *pSql) {
return
pSql
->
res
.
code
;
}
}
else
if
(
pCmd
->
command
<
TSDB_SQL_LOCAL
)
{
pSql
->
ipList
=
tscMgmtIpSet
;
SRpcIpSet
dump
;
tscDumpMgmtIpSet
(
&
dump
);
pSql
->
ipList
=
dump
;
}
else
{
// local handler
return
(
*
tscProcessMsgRsp
[
pCmd
->
command
])(
pSql
);
}
...
...
src/client/src/tscSql.c
浏览文件 @
c877418d
...
...
@@ -63,7 +63,7 @@ SSqlObj *taosConnectImpl(const char *ip, const char *user, const char *pass, con
if
(
ip
)
{
if
(
tscSetMgmtIpListFromCfg
(
ip
,
NULL
)
<
0
)
return
NULL
;
if
(
port
)
tscMgmtIpSet
.
port
[
0
]
=
port
;
if
(
port
)
tscMgmtIpSet
.
ipSet
.
port
[
0
]
=
port
;
}
void
*
pDnodeConn
=
NULL
;
...
...
src/client/src/tscSystem.c
浏览文件 @
c877418d
...
...
@@ -41,7 +41,8 @@ int tscNumOfThreads;
static
pthread_once_t
tscinit
=
PTHREAD_ONCE_INIT
;
void
taosInitNote
(
int
numOfNoteLines
,
int
maxNotes
,
char
*
lable
);
void
tscUpdateIpSet
(
void
*
ahandle
,
SRpcIpSet
*
pIpSet
);
//void tscUpdateIpSet(void *ahandle, SRpcIpSet *pIpSet);
void
tscCheckDiskUsage
(
void
*
UNUSED_PARAM
(
para
),
void
*
UNUSED_PARAM
(
param
))
{
taosGetDisk
();
...
...
src/client/src/tscUtil.c
浏览文件 @
c877418d
...
...
@@ -2146,16 +2146,19 @@ char* strdup_throw(const char* str) {
}
int
tscSetMgmtIpListFromCfg
(
const
char
*
first
,
const
char
*
second
)
{
tscMgmtIpSet
.
numOfIps
=
0
;
tscMgmtIpSet
.
inUse
=
0
;
// init mgmt ip set
tscMgmtIpSet
.
version
=
0
;
SRpcIpSet
*
mgmtIpSet
=
&
(
tscMgmtIpSet
.
ipSet
);
mgmtIpSet
->
numOfIps
=
0
;
mgmtIpSet
->
inUse
=
0
;
if
(
first
&&
first
[
0
]
!=
0
)
{
if
(
strlen
(
first
)
>=
TSDB_EP_LEN
)
{
terrno
=
TSDB_CODE_TSC_INVALID_FQDN
;
return
-
1
;
}
taosGetFqdnPortFromEp
(
first
,
tscMgmtIpSet
.
fqdn
[
tscMgmtIpSet
.
numOfIps
],
&
tscMgmtIpSet
.
port
[
tscMgmtIpSet
.
numOfIps
]
);
tscMgmtIpSet
.
numOfIps
++
;
taosGetFqdnPortFromEp
(
first
,
mgmtIpSet
->
fqdn
[
mgmtIpSet
->
numOfIps
],
&
(
mgmtIpSet
->
port
[
mgmtIpSet
->
numOfIps
])
);
mgmtIpSet
->
numOfIps
++
;
}
if
(
second
&&
second
[
0
]
!=
0
)
{
...
...
@@ -2163,11 +2166,11 @@ int tscSetMgmtIpListFromCfg(const char *first, const char *second) {
terrno
=
TSDB_CODE_TSC_INVALID_FQDN
;
return
-
1
;
}
taosGetFqdnPortFromEp
(
second
,
tscMgmtIpSet
.
fqdn
[
tscMgmtIpSet
.
numOfIps
],
&
tscMgmtIpSet
.
port
[
tscMgmtIpSet
.
numOfIps
]
);
tscMgmtIpSet
.
numOfIps
++
;
taosGetFqdnPortFromEp
(
second
,
mgmtIpSet
->
fqdn
[
mgmtIpSet
->
numOfIps
],
&
(
mgmtIpSet
->
port
[
mgmtIpSet
->
numOfIps
])
);
mgmtIpSet
->
numOfIps
++
;
}
if
(
tscMgmtIpSet
.
numOfIps
==
0
)
{
if
(
mgmtIpSet
->
numOfIps
==
0
)
{
terrno
=
TSDB_CODE_TSC_INVALID_FQDN
;
return
-
1
;
}
...
...
src/inc/trpc.h
浏览文件 @
c877418d
...
...
@@ -35,6 +35,11 @@ typedef struct SRpcIpSet {
char
fqdn
[
TSDB_MAX_REPLICA
][
TSDB_FQDN_LEN
];
}
SRpcIpSet
;
typedef
struct
SRpcCorIpSet
{
int32_t
version
;
SRpcIpSet
ipSet
;
}
SRpcCorIpSet
;
typedef
struct
SRpcConnInfo
{
uint32_t
clientIp
;
uint16_t
clientPort
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录