Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
iSulad
提交
fdb0b168
I
iSulad
项目概览
openeuler
/
iSulad
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
iSulad
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fdb0b168
编写于
7月 18, 2020
作者:
L
lifeng68
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
quota: return error msg when set Illegal quota size
Signed-off-by:
N
lifeng68
<
lifeng68@huawei.com
>
上级
3853ce4f
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
22 addition
and
4 deletion
+22
-4
src/daemon/modules/image/oci/storage/layer_store/graphdriver/overlay2/driver_overlay2.c
...torage/layer_store/graphdriver/overlay2/driver_overlay2.c
+22
-4
未找到文件。
src/daemon/modules/image/oci/storage/layer_store/graphdriver/overlay2/driver_overlay2.c
浏览文件 @
fdb0b168
...
...
@@ -40,6 +40,7 @@
#include "utils_string.h"
#include "utils_timestamp.h"
#include "selinux_label.h"
#include "err_msg.h"
struct
io_read_wrapper
;
...
...
@@ -740,6 +741,7 @@ static int set_layer_quota(const char *dir, const json_map_string_string *opts,
ret
=
util_parse_byte_size_string
(
opts
->
values
[
i
],
&
converted
);
if
(
ret
!=
0
)
{
ERROR
(
"Invalid size: '%s': %s"
,
opts
->
values
[
i
],
strerror
(
-
ret
));
isulad_set_error_message
(
"Invalid quota size: '%s': %s"
,
opts
->
values
[
i
],
strerror
(
-
ret
));
ret
=
-
1
;
goto
out
;
}
...
...
@@ -747,12 +749,22 @@ static int set_layer_quota(const char *dir, const json_map_string_string *opts,
break
;
}
else
{
ERROR
(
"Unknown option %s"
,
opts
->
keys
[
i
]);
isulad_set_error_message
(
"Unknown storage option %s"
,
opts
->
keys
[
i
]);
ret
=
-
1
;
goto
out
;
}
}
if
(
quota
>
0
&&
quota
<
4096
)
{
ERROR
(
"Illegal storage quota size %lu, 4096 at least"
,
quota
);
isulad_set_error_message
(
"Illegal storage quota size %lu, 4096 at least"
,
quota
);
ret
=
-
1
;
goto
out
;
}
if
(
quota
>
0
)
{
ret
=
driver
->
quota_ctrl
->
set_quota
(
dir
,
driver
->
quota_ctrl
,
quota
);
}
out:
return
ret
;
...
...
@@ -807,13 +819,17 @@ out:
return
ret
;
}
static
int
app
ly
_quota_opts
(
struct
driver_create_opts
*
ori_opts
,
uint64_t
quota
)
static
int
app
end_default
_quota_opts
(
struct
driver_create_opts
*
ori_opts
,
uint64_t
quota
)
{
int
ret
=
0
;
int
nret
=
0
;
size_t
i
=
0
;
char
tmp
[
50
]
=
{
0
};
//tmp to hold unit64
if
(
quota
==
0
)
{
return
0
;
}
nret
=
snprintf
(
tmp
,
sizeof
(
tmp
),
"%llu"
,
(
unsigned
long
long
)
quota
);
if
(
nret
<
0
||
(
size_t
)
nret
>=
sizeof
(
tmp
))
{
ERROR
(
"Failed to make quota string"
);
...
...
@@ -859,11 +875,13 @@ int overlay2_create_rw(const char *id, const char *parent, const struct graphdri
if
(
create_opts
->
storage_opt
!=
NULL
&&
create_opts
->
storage_opt
->
len
!=
0
&&
!
driver
->
support_quota
)
{
ERROR
(
"--storage-opt is supported only for overlay over xfs or ext4 with 'pquota' mount option"
);
isulad_set_error_message
(
"--storage-opt is supported only for overlay over xfs or ext4 with 'pquota' mount option"
);
ret
=
-
1
;
goto
out
;
}
if
(
driver
->
support_quota
&&
app
ly
_quota_opts
(
create_opts
,
driver
->
overlay_opts
->
default_quota
)
!=
0
)
{
if
(
driver
->
support_quota
&&
app
end_default
_quota_opts
(
create_opts
,
driver
->
overlay_opts
->
default_quota
)
!=
0
)
{
ret
=
-
1
;
goto
out
;
}
...
...
@@ -1824,7 +1842,7 @@ out:
static
void
free_overlay_options
(
struct
overlay_options
*
opts
)
{
if
(
opts
==
NULL
)
{
return
;
return
;
}
free
((
char
*
)
opts
->
mount_options
);
opts
->
mount_options
=
NULL
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录