Fix containerd config dump.

Random-Liu · Random-Liu · commit aaccfcbe2b87 · 2019-10-23T22:38:18.000-07:00
Signed-off-by: Lantao Liu &lt;lantaol@google.com&gt;
diff --git a/cmd/containerd/command/config.go b/cmd/containerd/command/config.go
@@ -65,10 +65,14 @@ func outputConfig(cfg *srvconfig.Config) error {
 		}
 	}
 
+	if config.Timeouts == nil {
+		config.Timeouts = make(map[string]string)
+	}
 	timeouts := timeout.All()
-	config.Timeouts = make(map[string]string)
 	for k, v := range timeouts {
-		config.Timeouts[k] = v.String()
+		if config.Timeouts[k] == "" {
+			config.Timeouts[k] = v.String()
+		}
 	}
 
 	// for the time being, keep the defaultConfig's version set at 1 so that
diff --git a/docs/man/containerd-config.toml.5.md b/docs/man/containerd-config.toml.5.md
@@ -39,6 +39,8 @@ separately (for example vendors may keep a custom runtime configuration in a
 separate file without modifying the main `config.toml`).
 Imported files will overwrite simple fields like `int` or
 `string` (if not empty) and will append `array` and `map` fields.
+Imported files are also versioned, and the version can't be higher than
+the main config.
 
 **[grpc]**
 : Section for gRPC socket listener settings. Contains three properties:
diff --git a/services/server/config/config.go b/services/server/config/config.go
@@ -28,6 +28,8 @@ import (
 	"github.com/containerd/containerd/plugin"
 )
 
+// NOTE: Any new map fields added also need to be handled in mergeConfig.
+
 // Config provides containerd configuration data for the server
 type Config struct {
 	// Version of the config file
@@ -321,6 +323,10 @@ func mergeConfig(to, from *Config) error {
 		to.ProxyPlugins[k] = v
 	}
 
+	for k, v := range from.Timeouts {
+		to.Timeouts[k] = v
+	}
+
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -65,10 +65,14 @@ func outputConfig(cfg *srvconfig.Config) error {`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
	`68`	`+ if config.Timeouts == nil {`
	`69`	`+ config.Timeouts = make(map[string]string)`
	`70`	`+ }`
`68`	`71`	`timeouts := timeout.All()`
`69`		`- config.Timeouts = make(map[string]string)`
`70`	`72`	`for k, v := range timeouts {`
`71`		`- config.Timeouts[k] = v.String()`
	`73`	`+ if config.Timeouts[k] == "" {`
	`74`	`+ config.Timeouts[k] = v.String()`
	`75`	`+ }`
`72`	`76`	`}`
`73`	`77`
`74`	`78`	`// for the time being, keep the defaultConfig's version set at 1 so that`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ import (`
`28`	`28`	`"github.com/containerd/containerd/plugin"`
`29`	`29`	`)`
`30`	`30`
	`31`	`+// NOTE: Any new map fields added also need to be handled in mergeConfig.`
	`32`	`+`
`31`	`33`	`// Config provides containerd configuration data for the server`
`32`	`34`	`type Config struct {`
`33`	`35`	`// Version of the config file`
`@@ -321,6 +323,10 @@ func mergeConfig(to, from *Config) error {`
`321`	`323`	`to.ProxyPlugins[k] = v`
`322`	`324`	`}`
`323`	`325`
	`326`	`+ for k, v := range from.Timeouts {`
	`327`	`+ to.Timeouts[k] = v`
	`328`	`+ }`
	`329`	`+`
`324`	`330`	`return nil`
`325`	`331`	`}`
`326`	`332`