Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Turbo码先生
redis
提交
4b8d8826
R
redis
项目概览
Turbo码先生
/
redis
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
redis
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4b8d8826
编写于
6月 16, 2020
作者:
A
antirez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use cluster connections too, to limit maxclients.
See #7401.
上级
62fc7f4f
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
23 addition
and
8 deletion
+23
-8
src/cluster.c
src/cluster.c
+7
-0
src/cluster.h
src/cluster.h
+1
-0
src/networking.c
src/networking.c
+15
-8
未找到文件。
src/cluster.c
浏览文件 @
4b8d8826
...
...
@@ -691,6 +691,13 @@ void clusterAcceptHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
}
}
/* Return the approximated number of sockets we are using in order to
* take the cluster bus connections. */
unsigned
long
getClusterConnectionsCount
(
void
)
{
return
server
.
cluster_enabled
?
(
dictSize
(
server
.
cluster
->
nodes
)
*
2
)
:
0
;
}
/* -----------------------------------------------------------------------------
* Key space handling
* -------------------------------------------------------------------------- */
...
...
src/cluster.h
浏览文件 @
4b8d8826
...
...
@@ -283,5 +283,6 @@ typedef struct {
clusterNode
*
getNodeByQuery
(
client
*
c
,
struct
redisCommand
*
cmd
,
robj
**
argv
,
int
argc
,
int
*
hashslot
,
int
*
ask
);
int
clusterRedirectBlockedClientIfNeeded
(
client
*
c
);
void
clusterRedirectClient
(
client
*
c
,
clusterNode
*
n
,
int
hashslot
,
int
error_code
);
unsigned
long
getClusterConnectionsCount
(
void
);
#endif
/* __CLUSTER_H */
src/networking.c
浏览文件 @
4b8d8826
...
...
@@ -892,17 +892,24 @@ static void acceptCommonHandler(connection *conn, int flags, char *ip) {
client
*
c
;
UNUSED
(
ip
);
/* Admission control will happen before a client is created and connAccept()
/* Limit the number of connections we take at the same time.
*
* Admission control will happen before a client is created and connAccept()
* called, because we don't want to even start transport-level negotiation
* if rejected.
*/
if
(
listLength
(
server
.
clients
)
>=
server
.
maxclients
)
{
char
*
err
=
"-ERR max number of clients reached
\r\n
"
;
* if rejected. */
if
(
listLength
(
server
.
clients
)
+
getClusterConnectionsCount
()
>=
server
.
maxclients
)
{
char
*
err
;
if
(
server
.
cluster_enabled
)
err
=
"-ERR max number of clients reached
\r\n
"
;
else
err
=
"-ERR max number of clients + cluster "
"connections reached
\r\n
"
;
/* That's a best effort error message, don't check write errors.
* Note that for TLS connections, no handshake was done yet so nothing is written
* and the connection will just drop.
*/
* Note that for TLS connections, no handshake was done yet so nothing
* is written and the connection will just drop. */
if
(
connWrite
(
conn
,
err
,
strlen
(
err
))
==
-
1
)
{
/* Nothing to do, Just to avoid the warning... */
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录