Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
iSulad
提交
b98d346b
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,发现更多精彩内容 >>
提交
b98d346b
编写于
7月 09, 2020
作者:
G
gaohuatao
提交者:
lifeng68
7月 25, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
devmapper: fix delete device busy err
Signed-off-by:
N
gaohuatao
<
gaohuatao@huawei.com
>
上级
b077276c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
44 addition
and
31 deletion
+44
-31
src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/deviceset.c
...oci/storage/layer_store/graphdriver/devmapper/deviceset.c
+4
-4
src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/wrapper_devmapper.c
...age/layer_store/graphdriver/devmapper/wrapper_devmapper.c
+39
-26
src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/wrapper_devmapper.h
...age/layer_store/graphdriver/devmapper/wrapper_devmapper.h
+1
-1
未找到文件。
src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/deviceset.c
浏览文件 @
b98d346b
...
...
@@ -278,7 +278,7 @@ static int remove_device(const char *name)
}
for
(;
i
<
max_retry
;
i
++
)
{
ret
=
dev_
remove_devi
ce
(
name
);
ret
=
dev_
delete_device_for
ce
(
name
);
if
(
ret
==
0
)
{
DEBUG
(
"devmapper: remove device:%s success"
,
name
);
goto
out
;
...
...
@@ -2190,7 +2190,7 @@ static int delete_transaction(struct device_set *devset, image_devmapper_device_
// If syncDelete is true, we want to return error. If deferred
// deletion is not enabled, we return an error. If error is
// something other then EBUSY, return an error.
if
(
sync_delete
||
!
devset
->
deferred_delete
||
ret
!=
ERR_BUSY
)
{
if
(
sync_delete
||
!
devset
->
deferred_delete
||
n
ret
!=
ERR_BUSY
)
{
ERROR
(
"devmapper: Error deleting device"
);
ret
=
-
1
;
goto
out
;
...
...
@@ -2369,7 +2369,7 @@ static int do_check_all_devices(struct device_set *devset)
}
// remove broken device
if
(
length
==
0
)
{
nret
=
dev_
remove_devi
ce
(
devices_list
[
i
]);
nret
=
dev_
delete_device_for
ce
(
devices_list
[
i
]);
if
(
nret
!=
0
)
{
WARN
(
"devmapper: remove broken device %s failed, err:%s"
,
devices_list
[
i
],
dev_strerror
(
nret
));
}
...
...
@@ -2382,7 +2382,7 @@ static int do_check_all_devices(struct device_set *devset)
continue
;
}
if
(
stat
(
device_path
,
&
st
))
{
nret
=
dev_
remove_devi
ce
(
devices_list
[
i
]);
nret
=
dev_
delete_device_for
ce
(
devices_list
[
i
]);
if
(
nret
!=
0
)
{
WARN
(
"devmapper: remove incompelete device %s, err:%s"
,
devices_list
[
i
],
dev_strerror
(
nret
));
}
...
...
src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/wrapper_devmapper.c
浏览文件 @
b98d346b
...
...
@@ -24,12 +24,10 @@
#include "isula_libutils/log.h"
#include "utils.h"
struct
dm_task
;
static
bool
dm_saw_busy
=
false
;
static
bool
dm_saw_exist
=
false
;
static
bool
dm_saw_enxio
=
false
;
// no such device or address
// static bool dm_saw_eno_data = false; // no data available
static
bool
g_dm_saw_busy
=
false
;
static
bool
g_dm_saw_exist
=
false
;
static
bool
g_dm_saw_enxio
=
false
;
// no such device or address
static
bool
g_dm_saw_eno_data
=
false
;
// no data available
static
int64_t
dm_udev_wait_timeout
=
0
;
char
*
dev_strerror
(
int
errnum
)
...
...
@@ -415,7 +413,7 @@ free_out:
free
(
uwait
);
}
int
dev_
remove_devi
ce
(
const
char
*
name
)
int
dev_
delete_device_for
ce
(
const
char
*
name
)
{
int
ret
=
0
;
struct
dm_task
*
dmt
=
NULL
;
...
...
@@ -439,15 +437,15 @@ int dev_remove_device(const char *name)
goto
out
;
}
dm_saw_busy
=
false
;
dm_saw_enxio
=
false
;
g_
dm_saw_busy
=
false
;
g_
dm_saw_enxio
=
false
;
if
(
dm_task_run
(
dmt
)
!=
1
)
{
if
(
dm_saw_busy
)
{
if
(
g_
dm_saw_busy
)
{
ret
=
ERR_BUSY
;
goto
udev
;
}
if
(
dm_saw_enxio
)
{
if
(
g_
dm_saw_enxio
)
{
ret
=
ERR_ENXIO
;
goto
udev
;
}
...
...
@@ -494,9 +492,9 @@ int dev_remove_device_deferred(const char *name)
goto
out
;
}
dm_saw_enxio
=
false
;
g_
dm_saw_enxio
=
false
;
if
(
dm_task_run
(
dmt
)
!=
1
)
{
if
(
dm_saw_enxio
)
{
if
(
g_
dm_saw_enxio
)
{
ret
=
ERR_ENXIO
;
goto
udev
;
}
...
...
@@ -651,9 +649,9 @@ int dev_create_device(const char *pool_fname, int device_id)
goto
cleanup
;
}
dm_saw_exist
=
false
;
g_
dm_saw_exist
=
false
;
if
(
dm_task_run
(
dmt
)
!=
1
)
{
if
(
dm_saw_exist
)
{
if
(
g_
dm_saw_exist
)
{
ret
=
ERR_DEVICE_ID_EXISTS
;
}
else
{
ret
=
-
1
;
...
...
@@ -674,7 +672,7 @@ int dev_delete_device(const char *pool_fname, int device_id)
int
ret
=
0
;
int
nret
=
0
;
uint64_t
sector
=
0
;
char
message
[
PATH_MAX
]
=
{
0
};
// 临时字符缓冲区上限
char
message
[
PATH_MAX
]
=
{
0
};
struct
dm_task
*
dmt
=
NULL
;
if
(
pool_fname
==
NULL
)
{
...
...
@@ -706,9 +704,20 @@ int dev_delete_device(const char *pool_fname, int device_id)
goto
cleanup
;
}
g_dm_saw_busy
=
false
;
g_dm_saw_eno_data
=
false
;
if
(
dm_task_run
(
dmt
)
!=
1
)
{
if
(
g_dm_saw_busy
)
{
ret
=
ERR_BUSY
;
ERROR
(
"devicemapper: Error delete device:device is busy"
);
goto
cleanup
;
}
if
(
g_dm_saw_eno_data
)
{
DEBUG
(
"devicemapper: device(id:%d) from pool(%s) does not exist"
,
device_id
,
pool_fname
);
goto
cleanup
;
}
ret
=
-
1
;
ERROR
(
"devicemapper:
task run failed
"
);
ERROR
(
"devicemapper:
Error running dev_delete_device
"
);
goto
cleanup
;
}
...
...
@@ -917,14 +926,14 @@ int dev_cancel_deferred_remove(const char *dm_name)
goto
cleanup
;
}
dm_saw_busy
=
false
;
dm_saw_enxio
=
false
;
g_
dm_saw_busy
=
false
;
g_
dm_saw_enxio
=
false
;
if
(
dm_task_run
(
dmt
)
!=
1
)
{
if
(
dm_saw_busy
)
{
if
(
g_
dm_saw_busy
)
{
ret
=
ERR_BUSY
;
goto
cleanup
;
}
if
(
dm_saw_enxio
)
{
if
(
g_
dm_saw_enxio
)
{
ret
=
ERR_ENXIO
;
goto
cleanup
;
}
...
...
@@ -967,14 +976,18 @@ void storage_devmapper_log_callback(int level, char *file, int line, int dm_errn
{
if
(
level
<
LOG_LEVEL_DEBUG
)
{
if
(
strstr
(
message
,
"busy"
)
!=
NULL
)
{
dm_saw_busy
=
true
;
g_
dm_saw_busy
=
true
;
}
if
(
strstr
(
message
,
"File exist"
)
!=
NULL
)
{
dm_saw_exist
=
true
;
g_
dm_saw_exist
=
true
;
}
if
(
strstr
(
message
,
"No such device or address"
)
!=
NULL
)
{
dm_saw_enxio
=
true
;
g_dm_saw_enxio
=
true
;
}
if
(
strstr
(
message
,
"No data available"
)
!=
NULL
)
{
g_dm_saw_eno_data
=
true
;
}
}
dm_log
(
level
,
file
,
line
,
dm_errno_or_class
,
message
);
...
...
@@ -1043,9 +1056,9 @@ int dev_create_snap_device_raw(const char *pool_name, int device_id, int base_de
goto
cleanup
;
}
dm_saw_exist
=
false
;
g_
dm_saw_exist
=
false
;
if
(
dm_task_run
(
dmt
)
!=
1
)
{
if
(
dm_saw_exist
)
{
if
(
g_
dm_saw_exist
)
{
ret
=
ERR_DEVICE_ID_EXISTS
;
goto
cleanup
;
}
...
...
src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/wrapper_devmapper.h
浏览文件 @
b98d346b
...
...
@@ -101,7 +101,7 @@ int dev_get_status(uint64_t *start, uint64_t *length, char **target_type, char *
int
dev_get_info
(
struct
dm_info
*
info
,
const
char
*
name
);
int
dev_
remove_devi
ce
(
const
char
*
name
);
int
dev_
delete_device_for
ce
(
const
char
*
name
);
int
dev_remove_device_deferred
(
const
char
*
name
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录