Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
iSulad-img
提交
d9385f29
I
iSulad-img
项目概览
openeuler
/
iSulad-img
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
iSulad-img
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
d9385f29
编写于
3月 24, 2020
作者:
W
WangFengTu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support inspect graph driver's metadata
Signed-off-by:
N
WangFengTu
<
wangfengtu@huawei.com
>
上级
da471a3f
变更
4
展开全部
隐藏空白更改
内联
并排
Showing
4 changed file
with
450 addition
and
220 deletion
+450
-220
cmd/isulad_img/grpc.go
cmd/isulad_img/grpc.go
+28
-4
cmd/isulad_img/storage_metadata.go
cmd/isulad_img/storage_metadata.go
+50
-0
isula/isula_image.pb.go
isula/isula_image.pb.go
+358
-216
isula/isula_image.proto
isula/isula_image.proto
+14
-0
未找到文件。
cmd/isulad_img/grpc.go
浏览文件 @
d9385f29
...
...
@@ -261,12 +261,12 @@ func (s *grpcImageService) ListImages(ctx context.Context, req *pb.ListImagesReq
resp
:=
&
pb
.
ListImagesResponse
{}
for
_
,
img
:=
range
images
.
Images
{
respImg
,
err
:=
transImageToPBImage
(
img
)
if
err
!=
nil
{
respImg
,
err
2
:=
transImageToPBImage
(
img
)
if
err
2
!=
nil
{
return
&
pb
.
ListImagesResponse
{
Errmsg
:
err
.
Error
(),
Errmsg
:
err
2
.
Error
(),
Cc
:
1
,
},
err
},
err
2
}
resp
.
Images
=
append
(
resp
.
Images
,
respImg
)
...
...
@@ -637,6 +637,30 @@ func (s *grpcImageService) GraphdriverStatus(ctx context.Context, req *pb.Graphd
return
resp
,
nil
}
// get metadata of graphdriver
func
(
s
*
grpcImageService
)
GraphdriverMetadata
(
ctx
context
.
Context
,
req
*
pb
.
GraphdriverMetadataRequest
)
(
*
pb
.
GraphdriverMetadataResponse
,
error
)
{
var
err
error
if
req
==
nil
||
req
.
NameId
==
""
{
err
=
errors
.
New
(
"Lack infomation for driver metadata"
)
return
&
pb
.
GraphdriverMetadataResponse
{
Errmsg
:
err
.
Error
(),
Cc
:
1
,
},
err
}
resp
:=
&
pb
.
GraphdriverMetadataResponse
{}
resp
.
Metadata
,
resp
.
Name
,
err
=
storageMetadata
(
s
.
gopts
,
req
.
NameId
)
if
err
!=
nil
{
return
&
pb
.
GraphdriverMetadataResponse
{
Errmsg
:
err
.
Error
(),
Cc
:
1
,
},
err
}
return
resp
,
nil
}
// login registry
func
(
s
*
grpcImageService
)
Login
(
ctx
context
.
Context
,
req
*
pb
.
LoginRequest
)
(
*
pb
.
LoginResponse
,
error
)
{
if
req
==
nil
||
req
.
Server
==
""
||
req
.
Username
==
""
||
req
.
Password
==
""
{
...
...
cmd/isulad_img/storage_metadata.go
0 → 100644
浏览文件 @
d9385f29
// Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved.
// iSulad-img licensed under the Mulan PSL v1.
// You can use this software according to the terms and conditions of the Mulan PSL v1.
// You may obtain a copy of Mulan PSL v1 at:
// http://license.coscl.org.cn/MulanPSL
// 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 v1 for more details.
// Description: iSulad image kit
// Author: wangfengtu
// Create: 2020-03-20
package
main
import
"fmt"
func
storageMetadata
(
gopts
*
globalOptions
,
nameID
string
)
(
metadata
map
[
string
]
string
,
name
string
,
err
error
)
{
imageService
,
err
:=
getImageService
(
gopts
)
if
err
!=
nil
{
return
nil
,
""
,
fmt
.
Errorf
(
"failed to get image service: %v"
,
err
)
}
runtimeService
:=
getRuntimeService
(
""
,
imageService
)
if
runtimeService
==
nil
{
return
nil
,
""
,
fmt
.
Errorf
(
"failed to get runtime service: %v"
,
err
)
}
layerID
,
err
:=
runtimeService
.
GetContainerLayerID
(
nameID
)
if
err
!=
nil
{
return
nil
,
""
,
fmt
.
Errorf
(
"failed to get container layer id by %v: %v"
,
nameID
,
err
)
}
store
,
err
:=
getStorageStore
(
gopts
)
if
err
!=
nil
{
return
nil
,
""
,
err
}
driver
,
err
:=
store
.
GraphDriver
()
if
err
!=
nil
{
return
nil
,
""
,
err
}
metadata
,
err
=
driver
.
Metadata
(
layerID
)
if
err
!=
nil
{
return
nil
,
""
,
err
}
return
metadata
,
driver
.
String
(),
err
}
isula/isula_image.pb.go
浏览文件 @
d9385f29
此差异已折叠。
点击以展开。
isula/isula_image.proto
浏览文件 @
d9385f29
...
...
@@ -76,6 +76,9 @@ service ImageService {
// get status of graphdriver
rpc
GraphdriverStatus
(
GraphdriverStatusRequest
)
returns
(
GraphdriverStatusResponse
)
{}
// get metadata of graphdriver
rpc
GraphdriverMetadata
(
GraphdriverMetadataRequest
)
returns
(
GraphdriverMetadataResponse
)
{}
// login registry
rpc
Login
(
LoginRequest
)
returns
(
LoginResponse
)
{}
// logout registry
...
...
@@ -144,6 +147,17 @@ message GraphdriverStatusResponse {
uint32
cc
=
3
;
}
message
GraphdriverMetadataRequest
{
string
name_id
=
1
;
}
message
GraphdriverMetadataResponse
{
map
<
string
,
string
>
metadata
=
1
;
string
name
=
2
;
string
errmsg
=
3
;
uint32
cc
=
4
;
}
message
ContainerFsUsageRequest
{
string
name_id
=
1
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录