Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Turbo码先生
redis
提交
e3436dd9
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,发现更多精彩内容 >>
提交
e3436dd9
编写于
12月 19, 2014
作者:
A
antirez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix adjustOpenFilesLimit() logging to match real state.
Fixes issue #2225.
上级
efbf5a12
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
12 deletion
+12
-12
src/redis.c
src/redis.c
+12
-12
未找到文件。
src/redis.c
浏览文件 @
e3436dd9
...
...
@@ -1566,33 +1566,33 @@ void adjustOpenFilesLimit(void) {
/* Set the max number of files if the current limit is not enough
* for our needs. */
if
(
oldlimit
<
maxfiles
)
{
rlim_t
f
;
rlim_t
bestlimit
;
int
setrlimit_error
=
0
;
/* Try to set the file limit to match 'maxfiles' or at least
* to the higher value supported less than maxfiles. */
f
=
maxfiles
;
while
(
f
>
oldlimit
)
{
bestlimit
=
maxfiles
;
while
(
bestlimit
>
oldlimit
)
{
rlim_t
decr_step
=
16
;
limit
.
rlim_cur
=
f
;
limit
.
rlim_max
=
f
;
limit
.
rlim_cur
=
bestlimit
;
limit
.
rlim_max
=
bestlimit
;
if
(
setrlimit
(
RLIMIT_NOFILE
,
&
limit
)
!=
-
1
)
break
;
setrlimit_error
=
errno
;
/* We failed to set file limit to '
f
'. Try with a
/* We failed to set file limit to '
bestlimit
'. Try with a
* smaller limit decrementing by a few FDs per iteration. */
if
(
f
<
decr_step
)
break
;
f
-=
decr_step
;
if
(
bestlimit
<
decr_step
)
break
;
bestlimit
-=
decr_step
;
}
/* Assume that the limit we get initially is still valid if
* our last try was even lower. */
if
(
f
<
oldlimit
)
f
=
oldlimit
;
if
(
bestlimit
<
oldlimit
)
bestlimit
=
oldlimit
;
if
(
f
!=
maxfiles
)
{
if
(
bestlimit
<
maxfiles
)
{
int
old_maxclients
=
server
.
maxclients
;
server
.
maxclients
=
f
-
REDIS_MIN_RESERVED_FDS
;
server
.
maxclients
=
bestlimit
-
REDIS_MIN_RESERVED_FDS
;
if
(
server
.
maxclients
<
1
)
{
redisLog
(
REDIS_WARNING
,
"Your current 'ulimit -n' "
"of %llu is not enough for Redis to start. "
...
...
@@ -1613,7 +1613,7 @@ void adjustOpenFilesLimit(void) {
"maxclients has been reduced to %d to compensate for "
"low ulimit. "
"If you need higher maxclients increase 'ulimit -n'."
,
(
unsigned
long
long
)
old
limit
,
server
.
maxclients
);
(
unsigned
long
long
)
best
limit
,
server
.
maxclients
);
}
else
{
redisLog
(
REDIS_NOTICE
,
"Increased maximum number of open files "
"to %llu (it was originally set to %llu)."
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录