Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
iSulad
提交
f46b710e
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,体验更适合开发者的 AI 搜索 >>
提交
f46b710e
编写于
7月 03, 2020
作者:
L
lifeng68
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
CI: add cp and rename testcases
Signed-off-by:
N
lifeng68
<
lifeng68@huawei.com
>
上级
e2db1254
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
388 addition
and
6 deletion
+388
-6
CI/test_cases/container_cases/cp.bash
CI/test_cases/container_cases/cp.bash
+292
-0
CI/test_cases/container_cases/rename.bash
CI/test_cases/container_cases/rename.bash
+90
-0
src/daemon/modules/image/oci/oci_export.c
src/daemon/modules/image/oci/oci_export.c
+1
-1
src/daemon/modules/image/oci/oci_image.c
src/daemon/modules/image/oci/oci_image.c
+1
-1
src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/deviceset.c
...oci/storage/layer_store/graphdriver/devmapper/deviceset.c
+1
-1
src/daemon/modules/image/oci/storage/storage.c
src/daemon/modules/image/oci/storage/storage.c
+2
-2
src/daemon/modules/image/oci/storage/storage.h
src/daemon/modules/image/oci/storage/storage.h
+1
-1
未找到文件。
CI/test_cases/container_cases/cp.bash
0 → 100644
浏览文件 @
f46b710e
#!/bin/bash
#
# attributes: isulad basic container hook
# concurrent: NA
# spend time: 25
#######################################################################
##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved.
# - iSulad licensed under the Mulan PSL v2.
# - You can use this software according to the terms and conditions of the Mulan PSL v2.
# - You may obtain a copy of Mulan PSL v2 at:
# - http://license.coscl.org.cn/MulanPSL2
# - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
# - IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
# - PURPOSE.
# - See the Mulan PSL v2 for more details.
##- @Description:CI
##- @Author: lifeng
##- @Create: 2020-06-03
#######################################################################
declare
-r
curr_path
=
$(
dirname
$(
readlink
-f
"
$0
"
))
source
../helpers.bash
cpfiles
=
/tmp/subcmdcp
test_cp_file_from_container
()
{
local
ret
=
0
containername
=
$1
# cp from container
dstfile
=
$cpfiles
/passwd
rm
-rf
$dstfile
cd
$cpfiles
isula
cp
nonexists:etc
.
2>&1 |
grep
"No such container"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check noexists output"
&&
((
ret++
))
isula
cp
nonexists:etc
$containername
:
$cpfiles
2>&1 |
grep
"copying between containers is not supported"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check copying between containers output"
&&
((
ret++
))
isula
cp
$containername
:etc/passwd
.
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
if
[
!
-f
$dstfile
]
;
then
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check dstfile"
&&
((
ret++
))
fi
rm
-rf
$dstfile
dstfile
=
$cpfiles
/passwd_renamed
rm
-rf
$dstfile
isula
cp
$containername
:../etc/passwd passwd_renamed
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
if
[
!
-f
$dstfile
]
;
then
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check dstfile"
&&
((
ret++
))
fi
rm
-rf
$dstfile
isula
cp
$containername
:/etc/../etc/passwd/
$cpfiles
2>&1 |
grep
"Not a directory"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
cp
$containername
:/etc/nonexists
$cpfiles
2>&1 |
grep
"No such file or directory"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
dstfile
=
$cpfiles
/etc
rm
-rf
$dstfile
touch
$dstfile
isula
cp
$containername
:/etc
$dstfile
2>&1 |
grep
"cannot copy directory"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
rm
-rf
$dstfile
isula
cp
$containername
:/etc/passwd
$cpfiles
/nonexists/ 2>&1 |
grep
"no such directory"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
return
${
ret
}
}
test_cp_dir_from_container
()
{
local
ret
=
0
containername
=
$1
# cp from container
dstfile
=
$cpfiles
/etc
rm
-rf
$dstfile
cd
$cpfiles
isula
cp
$containername
:etc
.
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
if
[
!
-d
$dstfile
]
;
then
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check dstfile"
&&
((
ret++
))
fi
rm
-rf
$dstfile
dstfile
=
$cpfiles
/etc_renamed
rm
-rf
$dstfile
isula
cp
$containername
:../etc etc_renamed
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
if
[
!
-d
$dstfile
]
;
then
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check dstfile"
&&
((
ret++
))
fi
rm
-rf
$dstfile
dstfile
=
$cpfiles
/etcfiles
rm
-rf
$dstfile
mkdir
-p
$dstfile
isula
cp
$containername
:/etc/. etcfiles
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
if
[
!
-f
$dstfile
/passwd
]
;
then
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check dstfile"
&&
((
ret++
))
fi
rm
-rf
$dstfile
return
${
ret
}
}
test_cp_file_to_container
()
{
local
ret
=
0
containername
=
$1
# cp from container
dstfile
=
$cpfiles
/passwd
cd
/etc
isula
cp
passwd nonexists:
$dstfile
2>&1 |
grep
"No such container"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
cp
passwd
$containername
:./
$cpfiles
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
exec
$containername
/bin/sh
-c
"ls
$dstfile
"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
dstfile
=
$cpfiles
/passwd_renamed
isula
cp
../../../etc/passwd
$containername
:../
$dstfile
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
exec
$containername
/bin/sh
-c
"ls
$dstfile
"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
cp
./passwd
$containername
:/etc/passwd/ 2>&1 |
grep
"no such directory"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
cp
/etc/../etc/passwd
$containername
:/etc/passwd/nonexists 2>&1 |
grep
"extraction point is not a directory"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
cp
/etc/passwd
$containername
:
$cpfiles
/nonexists/ 2>&1 |
grep
"no such directory"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
cp
/etc/passwd
$containername
:
$cpfiles
/nonexists/nonexists 2>&1 |
grep
"No such file or directory"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
cp
/etc/nonexists
$containername
:
$cpfiles
2>&1 |
grep
"No such file or directory"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
rm
-rf
$dstfile
dstfile
=
$cpfiles
/etc
isula
exec
$containername
/bin/sh
-c
"rm -rf
$dstfile
; touch
$dstfile
"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
cp
/etc
$containername
:
$dstfile
2>&1 |
grep
"cannot copy directory"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
return
${
ret
}
}
test_cp_dir_to_container
()
{
local
ret
=
0
containername
=
$1
# cp from container
dstfile
=
$cpfiles
/etc
cd
/
isula
cp
.././etc
$containername
:
$cpfiles
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
exec
$containername
/bin/sh
-c
"ls
$dstfile
"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
dstfile
=
$cpfiles
/etc_renamed
isula
cp
./etc
$containername
:
$dstfile
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
exec
$containername
/bin/sh
-c
"ls
$dstfile
"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
dstfile
=
$cpfiles
/etcfiles
cd
/etc
isula
exec
$containername
/bin/sh
-c
"rm -rf
$dstfile
; mkdir -p
$dstfile
"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
cp
.
$containername
:
$dstfile
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
exec
$containername
/bin/sh
-c
"ls
$dstfile
/passwd"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
return
${
ret
}
}
test_cp_symlink_to_container
()
{
local
ret
=
0
containername
=
$1
cd
/tmp
rm
-rf
l1
ln
-s
../..
$cpfiles
/linkto l1
isula
cp
l1
$containername
:
$cpfiles
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
exec
$containername
ls
-al
$cpfiles
|
grep
"l1.*../..
$cpfiles
/linkto"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
cp
l1
$containername
:
$cpfiles
/l1
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
exec
$containername
ls
-al
$cpfiles
|
grep
"linkto.*../..
$cpfiles
/linkto"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
rm
-rf
l1
isula
exec
$containername
/bin/sh
-c
"cd
$cpfiles
; rm -rf t1 t2 target; ln -s ./t1 t2; ln -s target t1"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
cp
/etc/passwd
$containername
:
$cpfiles
/t2
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
exec
$containername
/bin/sh
-c
"cat
$cpfiles
/target | grep root"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
return
${
ret
}
}
test_cp_symlink_from_container
()
{
local
ret
=
0
containername
=
$1
cd
$cpfiles
rm
-rf
l1 l2
isula
exec
$containername
/bin/sh
-c
"cd
$cpfiles
; rm -rf l1 l2 target; touch target; ln -s target l1; ln -s l1 l2"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
isula
cp
$containername
:
$cpfiles
/l1
.
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
ls
-al
.
|
grep
"l1.*target"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to do copy"
&&
((
ret++
))
return
${
ret
}
}
function
cp_test_t
()
{
local
ret
=
0
local
image
=
"busybox"
local test
=
"container cp test => (
${
FUNCNAME
[@]
}
)"
msg_info
"
${
test
}
starting..."
isula pull
${
image
}
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to pull image:
${
image
}
"
&&
return
${
FAILURE
}
isula images |
grep
busybox
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- missing list image:
${
image
}
"
&&
((
ret++
))
containername
=
test_cmd_cp
isula run
-n
$containername
-itd
$image
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to run container:
${
image
}
"
&&
((
ret++
))
rm
-rf
$cpfiles
mkdir
-p
$cpfiles
isula
exec
$containername
mkdir
-p
$cpfiles
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to exec container:
${
containername
}
"
&&
((
ret++
))
test_cp_file_from_container
$containername
||
((
ret++
))
test_cp_dir_from_container
$containername
||
((
ret++
))
test_cp_file_to_container
$containername
||
((
ret++
))
test_cp_symlink_to_container
$containername
||
((
ret++
))
test_cp_symlink_from_container
$containername
||
((
ret++
))
isula
rm
-f
$containername
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to rm container:
${
containername
}
"
&&
((
ret++
))
rm
-rf
$cpfiles
echo
"test end"
return
${
ret
}
}
declare
-i
ans
=
0
cp_test_t
||
((
ans++
))
show_result
${
ans
}
"
${
curr_path
}
/
${
0
}
"
CI/test_cases/container_cases/rename.bash
0 → 100644
浏览文件 @
f46b710e
#!/bin/bash
#
# attributes: isulad basic container hook
# concurrent: NA
# spend time: 5
#######################################################################
##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved.
# - iSulad licensed under the Mulan PSL v2.
# - You can use this software according to the terms and conditions of the Mulan PSL v2.
# - You may obtain a copy of Mulan PSL v2 at:
# - http://license.coscl.org.cn/MulanPSL2
# - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
# - IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
# - PURPOSE.
# - See the Mulan PSL v2 for more details.
##- @Description:CI
##- @Author: lifeng
##- @Create: 2020-06-03
#######################################################################
declare
-r
curr_path
=
$(
dirname
$(
readlink
-f
"
$0
"
))
source
../helpers.bash
function
test_rename_spec
()
{
local
ret
=
0
local
image
=
"busybox"
local test
=
"container rename test => (
${
FUNCNAME
[@]
}
)"
old_name
=
old_name
rename_log
=
/tmp/rename.log
msg_info
"
${
test
}
starting..."
isula pull
${
image
}
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to pull image:
${
image
}
"
&&
return
${
FAILURE
}
isula images |
grep
busybox
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- missing list image:
${
image
}
"
&&
((
ret++
))
CONT
=
`
isula run
-n
$old_name
-itd
${
image
}
`
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to run container with image:
${
image
}
"
&&
((
ret++
))
isula rename
>
$rename_log
2>&1
[[
$?
-ne
1
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check rename container exit code:
${
image
}
"
&&
((
ret++
))
cat
$rename_log
|
grep
"requires 2 arguments"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check error output with image:
${
image
}
"
&&
((
ret++
))
isula rename
$old_name
$old_name
>
$rename_log
2>&1
[[
$?
-ne
1
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check rename same container exit code:
${
image
}
"
&&
((
ret++
))
cat
$rename_log
|
grep
"Renaming a container with the same name as its current name"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check error output with image:
${
image
}
"
&&
((
ret++
))
isula rename no_exist no_exist1
>
$rename_log
2>&1
[[
$?
-ne
1
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check rename same container exit code:
${
image
}
"
&&
((
ret++
))
cat
$rename_log
|
grep
"No such container"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check error output with image:
${
image
}
"
&&
((
ret++
))
isula rename
$old_name
1
>
$rename_log
2>&1
[[
$?
-ne
1
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check rename same container exit code:
${
image
}
"
&&
((
ret++
))
cat
$rename_log
|
grep
"Invalid container new name"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check error output with image:
${
image
}
"
&&
((
ret++
))
isula rename
$old_name
123@
>
$rename_log
2>&1
[[
$?
-ne
1
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check rename same container exit code:
${
image
}
"
&&
((
ret++
))
cat
$rename_log
|
grep
"Invalid container new name"
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check error output with image:
${
image
}
"
&&
((
ret++
))
isula rename
$old_name
new_name
>
$rename_log
2>&1
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check error output with image:
${
image
}
"
&&
((
ret++
))
isula
rm
-f
new_name
[[
$?
-ne
0
]]
&&
msg_err
"
${
FUNCNAME
[0]
}
:
${
LINENO
}
- failed to check error output with image:
${
image
}
"
&&
((
ret++
))
rm
-f
$rename_log
msg_info
"
${
test
}
finished with return
${
ret
}
..."
return
${
ret
}
}
declare
-i
ans
=
0
test_rename_spec
||
((
ans++
))
show_result
${
ans
}
"
${
curr_path
}
/
${
0
}
"
\ No newline at end of file
src/daemon/modules/image/oci/oci_export.c
浏览文件 @
f46b710e
...
...
@@ -50,7 +50,7 @@ out:
free
(
errmsg
);
errmsg
=
NULL
;
ret2
=
storage_rootfs_umount
(
id
);
ret2
=
storage_rootfs_umount
(
id
,
false
);
if
(
ret2
!=
0
)
{
ret
=
ret2
;
ERROR
(
"umount container %s failed"
,
id
);
...
...
src/daemon/modules/image/oci/oci_image.c
浏览文件 @
f46b710e
...
...
@@ -223,7 +223,7 @@ int oci_umount_rf(const im_umount_request *request)
return
-
1
;
}
return
storage_rootfs_umount
(
request
->
name_id
);
return
storage_rootfs_umount
(
request
->
name_id
,
request
->
force
);
}
int
oci_rmi
(
const
im_rmi_request
*
request
)
...
...
src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/deviceset.c
浏览文件 @
f46b710e
...
...
@@ -2140,7 +2140,7 @@ static int check_grow_base_device_fs(struct device_set *devset, image_devmapper_
base_dev_size
=
get_base_device_size
(
devset
);
if
(
devset
->
base_fs_size
<
base_dev_size
)
{
ERROR
(
"devmapper: Base fs size:%lu cannot be smaller than %lu"
,
devset
->
base_fs_size
,
base_dev_size
);
ERROR
(
"devmapper: Base fs size:%lu cannot be smaller than %lu"
,
devset
->
base_fs_size
,
base_dev_size
);
return
-
1
;
}
...
...
src/daemon/modules/image/oci/storage/storage.c
浏览文件 @
f46b710e
...
...
@@ -1177,7 +1177,7 @@ out:
return
mount_point
;
}
int
storage_rootfs_umount
(
const
char
*
container_id
)
int
storage_rootfs_umount
(
const
char
*
container_id
,
bool
force
)
{
int
ret
=
0
;
storage_rootfs
*
rootfs_info
=
NULL
;
...
...
@@ -1195,7 +1195,7 @@ int storage_rootfs_umount(const char *container_id)
goto
out
;
}
if
(
layer_store_umount
(
rootfs_info
->
layer
,
tru
e
)
!=
0
)
{
if
(
layer_store_umount
(
rootfs_info
->
layer
,
forc
e
)
!=
0
)
{
ERROR
(
"Failed to umount layer %s"
,
rootfs_info
->
layer
);
ret
=
-
1
;
goto
out
;
...
...
src/daemon/modules/image/oci/storage/storage.h
浏览文件 @
f46b710e
...
...
@@ -167,7 +167,7 @@ int storage_rootfs_fs_usgae(const char *container_id, imagetool_fs_info *fs_info
char
*
storage_rootfs_mount
(
const
char
*
container_id
);
int
storage_rootfs_umount
(
const
char
*
container_id
);
int
storage_rootfs_umount
(
const
char
*
container_id
,
bool
force
);
#ifdef __cplusplus
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录