enhance: add more field in 'pouch info' command #1238
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ZouRui89
force-pushed
the
info
branch
2 times, most recently
from
1ed8bab to
3373790
Compare
allencloud
reviewed
May 4, 2018
daemon/mgr/system.go
Outdated
| @@ -96,8 +99,13 @@ func (mgr *SystemManager) Info() (types.SystemInfo, error) { | |||
| OSName = osName | |||
| } | |||
|
|
|||
| images, err := mgr.imageMgr.ListImages(context.Background(), "") | |||
| if err != nil { | |||
| logrus.Warnf("failed to get image info") | |||
There was a problem hiding this comment.
this error log seems improper. You did not describe the error correctly, and did not log the detailed error message, right?
How about logrus.Warnf("failed to list images: %v", err)? @ZouRui89
There was a problem hiding this comment.
The filed 'image' corresponds to the number of images, in which case I think logrus.Warnf("failed to get image info: %v", err) is better. WDYT? @allencloud
|
I like your work. LGTM if some update according to code comment. @ZouRui89 |
Signed-off-by: Zou Rui <[email protected]>
allencloud
reviewed
May 7, 2018
| DefaultLogConfig types.HostConfigAO0LogConfig `json:"default-log-config, omitempty"` | ||
|
|
||
| // RegistryService | ||
| RegistryService types.RegistryServiceConfig `json:"registry-service, omitempty" ` |
There was a problem hiding this comment.
We add this field in the code, however I am afraid we have not add this field's assignment in manager's code, right? Do we have a plan to add this field assignment? @ZouRui89
|
LGTM |
pouchrobot
added
the
LGTM
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Zou Rui [email protected]
Ⅰ. Describe what this PR did
This pr adds the value assertion of 'Architecture/Images/LoggingDriver/RegistryConfig' on daemon side, in which case 'pouch info' command wil output more field value.
Ⅱ. Does this pull request fix one issue?
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
[root@instance-1 zouruicloud]# pouch info
Containers: 0
Running: 0
Paused: 0
Stopped: 0
Images: 1
ID:
Name: instance-1
Server Version: 0.4.0
Storage Driver: overlayfs
Driver Status: []
Logging Driver:
Cgroup Driver:
runc:
containerd:
Security Options: []
Kernel Version: 3.10.0-693.11.1.el7.x86_64
Operating System: "CentOS Linux 7 (Core)"
OSType: linux
Architecture: amd64
HTTP Proxy:
HTTPS Proxy:
Registry: https://index.docker.io/v1/
Experimental: false
Debug: false
Labels:
node_ip=10.142.0.2
SN=GoogleCloud-0F7AA324BDD10D51358D5410E1D02814
CPUs: 1
Total Memory: 3.456 GiB
Pouch Root Dir: /var/lib/pouch
LiveRestoreEnabled: true
LxcfsEnabled: false
Daemon Listen Addresses: [unix:///var/run/pouchd.sock]
Ⅴ. Special notes for reviews