Merge pull request #941 from HusterWan/zr/info-completion

feature: pouch info print information enhance

Author: allencloud

apis/swagger.yml

@@ -1317,6 +1317,13 @@ definitions:
           - "name=seccomp,profile=default"
           - "name=selinux"
           - "name=userns"
+      ListenAddresses:
+        description: "List of addresses the pouchd listens on"
+        type: "array"
+        items:
+          type: "string"
+        example:
+          - ["unix:///var/run/pouchd.sock", "tcp://0.0.0.0:4243"]
 
   RegistryServiceConfig:
     description: |

apis/types/system_info.go

@@ -3,6 +3,9 @@ package main
 import (
 	"context"
 	"fmt"
+	"os"
+
+	"github.com/alibaba/pouch/apis/types"
 
 	"github.com/spf13/cobra"
 )
@@ -47,44 +50,108 @@ func (v *InfoCommand) runInfo() error {
 		return fmt.Errorf("failed to get system info: %v", err)
 	}
 
-	v.cli.Print(result)
+	return prettyPrintInfo(v.cli, result)
+}
+
+func prettyPrintInfo(cli *Cli, info *types.SystemInfo) error {
+	fmt.Fprintln(os.Stdout, "Containers:", info.Containers)
+	fmt.Fprintln(os.Stdout, "Running:", info.ContainersRunning)
+	fmt.Fprintln(os.Stdout, "Paused:", info.ContainersPaused)
+	fmt.Fprintln(os.Stdout, "Stopped:", info.ContainersStopped)
+	fmt.Fprintln(os.Stdout, "Images: ", info.Images)
+	fmt.Fprintln(os.Stdout, "ID:", info.ID)
+	fmt.Fprintln(os.Stdout, "Name:", info.Name)
+	fmt.Fprintln(os.Stdout, "Server Version:", info.ServerVersion)
+	fmt.Fprintln(os.Stdout, "Storage Driver:", info.Driver)
+	fmt.Fprintln(os.Stdout, "Driver Status:", info.DriverStatus)
+	fmt.Fprintln(os.Stdout, "Logging Driver:", info.LoggingDriver)
+	fmt.Fprintln(os.Stdout, "Cgroup Driver:", info.CgroupDriver)
+	if len(info.Runtimes) > 0 {
+		fmt.Fprintln(os.Stdout, "Runtimes:")
+		for name := range info.Runtimes {
+			fmt.Fprintf(os.Stdout, "%s", name)
+		}
+		fmt.Fprint(os.Stdout, "\n")
+		fmt.Fprintln(os.Stdout, "Default Runtime:", info.DefaultRuntime)
+	}
+	fmt.Fprintln(os.Stdout, "runc:", info.RuncCommit)
+	fmt.Fprintln(os.Stdout, "containerd:", info.ContainerdCommit)
+
+	// Kernel info
+	fmt.Fprintln(os.Stdout, "Security Options:", info.SecurityOptions)
+	fmt.Fprintln(os.Stdout, "Kernel Version:", info.KernelVersion)
+	fmt.Fprintln(os.Stdout, "Operating System:", info.OperatingSystem)
+	fmt.Fprintln(os.Stdout, "OSType:", info.OSType)
+	fmt.Fprintln(os.Stdout, "Architecture:", info.Architecture)
+
+	fmt.Fprintln(os.Stdout, "HTTP Proxy:", info.HTTPProxy)
+	fmt.Fprintln(os.Stdout, "HTTPS Proxy:", info.HTTPSProxy)
+	fmt.Fprintln(os.Stdout, "Registry:", info.IndexServerAddress)
+	fmt.Fprintln(os.Stdout, "Experimental:", info.ExperimentalBuild)
+	fmt.Fprintln(os.Stdout, "Debug:", info.Debug)
+	fmt.Fprintln(os.Stdout, "Labels:", info.Labels)
+
+	fmt.Fprintln(os.Stdout, "CPUs:", info.NCPU)
+	fmt.Fprintln(os.Stdout, "Total Memory:", info.MemTotal)
+	fmt.Fprintln(os.Stdout, "Pouch Root Dir:", info.PouchRootDir)
+	fmt.Fprintln(os.Stdout, "LiveRestoreEnabled:", info.LiveRestoreEnabled)
+	if info.RegistryConfig != nil && (len(info.RegistryConfig.InsecureRegistryCIDRs) > 0 || len(info.RegistryConfig.IndexConfigs) > 0) {
+		fmt.Fprintln(os.Stdout, "Insecure Registries:")
+		for _, registry := range info.RegistryConfig.IndexConfigs {
+			if !registry.Secure {
+				fmt.Fprintln(os.Stdout, " "+registry.Name)
+			}
+		}
+
+		for _, registry := range info.RegistryConfig.InsecureRegistryCIDRs {
+			fmt.Fprintf(os.Stdout, " %s\n", registry)
+		}
+	}
+
+	if info.RegistryConfig != nil && len(info.RegistryConfig.Mirrors) > 0 {
+		fmt.Fprintln(os.Stdout, "Registry Mirrors:")
+		for _, mirror := range info.RegistryConfig.Mirrors {
+			fmt.Fprintln(os.Stdout, " "+mirror)
+		}
+	}
+
+	fmt.Fprintln(os.Stdout, "Daemon Listen Addresses:", info.ListenAddresses)
+
 	return nil
 }
 
 // infoExample shows examples in info command, and is used in auto-generated cli docs.
 func infoExample() string {
 	return `$ pouch info
+Containers: 1
+Running: 1
+Paused: 0
+Stopped: 0
+Images:  0
 ID:
 Name:
-OperatingSystem:
-PouchRootDir:         /var/lib/pouch
-ServerVersion:        0.3-dev
-ContainersRunning:    0
-Debug:                false
-DriverStatus:         []
-Labels:               []
-Containers:           0
-DefaultRuntime:       runc
-Driver:
-ExperimentalBuild:    false
-KernelVersion:        3.10.0-693.11.6.el7.x86_64
-OSType:               linux
-CgroupDriver:
-ContainerdCommit:     <nil>
-ContainersPaused:     0
-LoggingDriver:
-SecurityOptions:      []
-NCPU:                 0
-RegistryConfig:       <nil>
-RuncCommit:           <nil>
-ContainersStopped:    0
-HTTPSProxy:
-IndexServerAddress:   https://index.docker.io/v1/
-LiveRestoreEnabled:   false
-Runtimes:             map[]
+Server Version: 0.3-dev
+Storage Driver:
+Driver Status: []
+Logging Driver:
+Cgroup Driver:
+runc: <nil>
+containerd: <nil>
+Security Options: []
+Kernel Version: 3.10.0-693.17.1.el7.x86_64
+Operating System:
+OSType: linux
 Architecture:
-HTTPProxy:
-Images:               0
-MemTotal:             0
+HTTP Proxy:
+HTTPS Proxy:
+Registry: https://index.docker.io/v1/
+Experimental: false
+Debug: true
+Labels: []
+CPUs: 0
+Total Memory: 0
+Pouch Root Dir: /var/lib/pouch
+LiveRestoreEnabled: false
+Daemon Listen Addresses: [unix:///var/run/pouchd.sock]
 `
 }

cli/info.go

@@ -135,7 +135,7 @@ func (d *Daemon) Run() error {
 	}
 	d.imageMgr = imageMgr
 
-	systemMgr, err := internal.GenSystemMgr(&d.config)
+	systemMgr, err := internal.GenSystemMgr(&d.config, d)
 	if err != nil {
 		return err
 	}

daemon/daemon.go

@@ -2,10 +2,12 @@ package mgr
 
 import (
 	"runtime"
+	"sync/atomic"
 
 	"github.com/alibaba/pouch/apis/types"
 	"github.com/alibaba/pouch/daemon/config"
 	"github.com/alibaba/pouch/pkg/kernel"
+	"github.com/alibaba/pouch/pkg/meta"
 	"github.com/alibaba/pouch/registry"
 	"github.com/alibaba/pouch/version"
 
@@ -24,14 +26,17 @@ type SystemManager struct {
 	name     string
 	registry *registry.Client
 	config   *config.Config
+
+	store *meta.Store
 }
 
 // NewSystemManager creates a brand new system manager.
-func NewSystemManager(cfg *config.Config) (*SystemManager, error) {
+func NewSystemManager(cfg *config.Config, store *meta.Store) (*SystemManager, error) {
 	return &SystemManager{
 		name:     "system_manager",
 		registry: &registry.Client{},
 		config:   cfg,
+		store:    store,
 	}, nil
 }
 
@@ -44,16 +49,35 @@ func (mgr *SystemManager) Info() (types.SystemInfo, error) {
 		kernelVersion = kv.String()
 	}
 
+	var cRunning, cPaused, cStopped int64
+	_ = mgr.store.ForEach(func(obj meta.Object) error {
+		containerMeta, ok := obj.(*ContainerMeta)
+		if !ok {
+			return nil
+		}
+		status := containerMeta.State.Status
+		switch status {
+		case types.StatusRunning:
+			atomic.AddInt64(&cRunning, 1)
+		case types.StatusPaused:
+			atomic.AddInt64(&cPaused, 1)
+		case types.StatusStopped:
+			atomic.AddInt64(&cStopped, 1)
+		}
+
+		return nil
+	})
+
 	inf := types.SystemInfo{
 		// architecture: ,
 		// CgroupDriver: ,
 		// ContainerdCommit: ,
-		// Containers: ,
-		// ContainersPaused:,
-		// ContainersRunning:,
-		// ContainersStopped:,
-		Debug:          mgr.config.Debug,
-		DefaultRuntime: mgr.config.DefaultRuntime,
+		Containers:        cRunning + cPaused + cStopped,
+		ContainersPaused:  cPaused,
+		ContainersRunning: cRunning,
+		ContainersStopped: cStopped,
+		Debug:             mgr.config.Debug,
+		DefaultRuntime:    mgr.config.DefaultRuntime,
 		// Driver: ,
 		// DriverStatus: ,
 		// ExperimentalBuild: ,
@@ -76,7 +100,8 @@ func (mgr *SystemManager) Info() (types.SystemInfo, error) {
 		// RuncCommit: ,
 		// Runtimes: ,
 		// SecurityOptions: ,
-		ServerVersion: version.Version,
+		ServerVersion:   version.Version,
+		ListenAddresses: mgr.config.Listen,
 	}
 	return inf, nil
 }

daemon/mgr/system.go

@@ -29,8 +29,8 @@ func GenContainerMgr(ctx context.Context, d DaemonProvider) (mgr.ContainerMgr, e
 }
 
 // GenSystemMgr generates a SystemMgr instance according to config cfg.
-func GenSystemMgr(cfg *config.Config) (mgr.SystemMgr, error) {
-	return mgr.NewSystemManager(cfg)
+func GenSystemMgr(cfg *config.Config, d DaemonProvider) (mgr.SystemMgr, error) {
+	return mgr.NewSystemManager(cfg, d.MetaStore())
 }
 
 // GenImageMgr generates a ImageMgr instance according to config cfg.