Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
iSulad
提交
48d3f667
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,发现更多精彩内容 >>
提交
48d3f667
编写于
5月 23, 2020
作者:
W
WangFengTu
提交者:
lifeng68
7月 25, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Do not restrict max pull thread
Signed-off-by:
N
WangFengTu
<
wangfengtu@huawei.com
>
上级
6a56b14e
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
0 addition
and
19 deletion
+0
-19
src/image/oci/registry/registry.c
src/image/oci/registry/registry.c
+0
-19
未找到文件。
src/image/oci/registry/registry.c
浏览文件 @
48d3f667
...
@@ -45,7 +45,6 @@
...
@@ -45,7 +45,6 @@
#define MAX_LAYER_NUM 125
#define MAX_LAYER_NUM 125
#define MANIFEST_BIG_DATA_KEY "manifest"
#define MANIFEST_BIG_DATA_KEY "manifest"
#define ROOTFS_TYPE "layers"
#define ROOTFS_TYPE "layers"
#define MAX_CONCURRENT_DOWNLOAD_NUM 5
typedef
struct
{
typedef
struct
{
pull_descriptor
*
desc
;
pull_descriptor
*
desc
;
...
@@ -71,7 +70,6 @@ typedef struct {
...
@@ -71,7 +70,6 @@ typedef struct {
pthread_cond_t
cond
;
pthread_cond_t
cond
;
bool
cond_inited
;
bool
cond_inited
;
map_t
*
cached_layers
;
map_t
*
cached_layers
;
size_t
count
;
}
registry_global
;
}
registry_global
;
static
registry_global
*
g_shared
;
static
registry_global
*
g_shared
;
...
@@ -1110,7 +1108,6 @@ static int fetch_one_layer(thread_fetch_info *info)
...
@@ -1110,7 +1108,6 @@ static int fetch_one_layer(thread_fetch_info *info)
out:
out:
// notify to continue downloading
// notify to continue downloading
mutex_lock
(
&
g_shared
->
mutex
);
mutex_lock
(
&
g_shared
->
mutex
);
g_shared
->
count
--
;
set_cached_layers_info
(
info
->
blob_digest
,
diffid
,
ret
,
info
->
file
);
set_cached_layers_info
(
info
->
blob_digest
,
diffid
,
ret
,
info
->
file
);
if
(
pthread_cond_broadcast
(
&
g_shared
->
cond
))
{
if
(
pthread_cond_broadcast
(
&
g_shared
->
cond
))
{
ERROR
(
"Failed to broadcast"
);
ERROR
(
"Failed to broadcast"
);
...
@@ -1132,17 +1129,6 @@ static int do_fetch(thread_fetch_info *info)
...
@@ -1132,17 +1129,6 @@ static int do_fetch(thread_fetch_info *info)
mutex_lock
(
&
g_shared
->
mutex
);
mutex_lock
(
&
g_shared
->
mutex
);
cache
=
get_cached_layer
(
info
->
blob_digest
);
cache
=
get_cached_layer
(
info
->
blob_digest
);
if
(
cache
==
NULL
)
{
// If there are too many download threads, wait until anyone completed.
while
(
g_shared
->
count
>=
MAX_CONCURRENT_DOWNLOAD_NUM
)
{
cond_ret
=
pthread_cond_wait
(
&
g_shared
->
cond
,
&
g_shared
->
mutex
);
if
(
cond_ret
!=
0
)
{
ERROR
(
"condition wait failed, ret %d"
,
cond_ret
);
ret
=
-
1
;
goto
unlock_out
;
}
}
}
ret
=
add_cached_layer
(
info
->
blob_digest
,
info
->
file
);
ret
=
add_cached_layer
(
info
->
blob_digest
,
info
->
file
);
if
(
ret
!=
0
)
{
if
(
ret
!=
0
)
{
...
@@ -1152,11 +1138,6 @@ static int do_fetch(thread_fetch_info *info)
...
@@ -1152,11 +1138,6 @@ static int do_fetch(thread_fetch_info *info)
}
}
cached_layers_added
=
true
;
cached_layers_added
=
true
;
// First request to download this blob.
if
(
cache
==
NULL
)
{
g_shared
->
count
++
;
}
mutex_unlock
(
&
g_shared
->
mutex
);
mutex_unlock
(
&
g_shared
->
mutex
);
if
(
cache
==
NULL
)
{
if
(
cache
==
NULL
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录