ctrd: support to show shim log

Signed-off-by: Wei Fu <fuweid89@gmail.com>

ctrd/supervisord/config.go

@@ -18,7 +18,7 @@ type Config struct {
  // Metrics and monitoring settings
  Metrics MetricsConfig `toml:"metrics"`
  // Plugins provides plugin specific configuration for the initialization of a plugin
- Plugins map[string]toml.Primitive `toml:"plugins"`
+ Plugins map[string]interface{} `toml:"plugins"`
  // OOMScore adjust the containerd's oom score
  OOMScore int `toml:"oom_score"`
  // Cgroup specifies cgroup information for the containerd daemon process
@@ -51,3 +51,11 @@ type MetricsConfig struct {
 type CgroupConfig struct {
  Path string `toml:"path"`
 }
+
+// V1RuntimeConfig options for the runtime
+//
+// NOTE: don't add other thing here because default config
+// will be merged with this in containerd side.
+type V1RuntimeConfig struct {
+ ShimDebug bool `toml:"shim_debug"`
+}

ctrd/supervisord/option.go

@@ -1,6 +1,8 @@
 package supervisord
 
-import "fmt"
+import (
+ "fmt"
+)
 
 // WithGRPCAddress sets the containerd address.
 func WithGRPCAddress(addr string) Opt {
@@ -41,3 +43,17 @@ func WithContainerdBinary(nameOrPath string) Opt {
  return nil
  }
 }
+
+// WithV1RuntimeShimDebug shows shim log in stdout.
+func WithV1RuntimeShimDebug() Opt {
+ return func(d *Daemon) error {
+ var v1RuntimeCfg = V1RuntimeConfig{ShimDebug: true}
+
+ // FIXME: plugin name is hard code
+ if d.cfg.Plugins == nil {
+ d.cfg.Plugins = map[string]interface{}{}
+ }
+ d.cfg.Plugins["linux"] = v1RuntimeCfg
+ return nil
+ }
+}

daemon/daemon.go

@@ -80,6 +80,7 @@ func NewDaemon(cfg *config.Config) *Daemon {
 
  if cfg.Debug {
  ctrdDaemonOpts = append(ctrdDaemonOpts, supervisord.WithLogLevel("debug"))
+ ctrdDaemonOpts = append(ctrdDaemonOpts, supervisord.WithV1RuntimeShimDebug())
  }
 
  ctrdDaemon, err := supervisord.Start(context.TODO(),