27 lines
935 B
Diff
27 lines
935 B
Diff
|
From bda70bc306d650060c699154f398226b5c7cc90f Mon Sep 17 00:00:00 2001
|
||
|
|
From: WangFengTu <wangfengtu@huawei.com>
|
||
|
|
Date: Mon, 14 Sep 2020 15:56:56 +0800
|
||
|
|
Subject: [PATCH 06/10] fix pull failure caused by link conflict
|
||
|
|
|
||
|
|
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
|
||
|
|
---
|
||
|
|
src/daemon/modules/image/oci/registry/registry.c | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/src/daemon/modules/image/oci/registry/registry.c b/src/daemon/modules/image/oci/registry/registry.c
|
||
|
|
index 77b4d02..c892780 100644
|
||
|
|
--- a/src/daemon/modules/image/oci/registry/registry.c
|
||
|
|
+++ b/src/daemon/modules/image/oci/registry/registry.c
|
||
|
|
@@ -1212,6 +1212,8 @@ static int add_fetch_task(thread_fetch_info *info)
|
||
|
|
goto out;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
+ // retry get cached layer after some time of unlock
|
||
|
|
+ cache = get_cached_layer(info->blob_digest);
|
||
|
|
}
|
||
|
|
|
||
|
|
ret = add_cached_layer(info->blob_digest, info->file);
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|