github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #2725 from fuweid/enhance_split_config_from_server

Browse Source 
enhance: split config from server package
This commit is contained in:
Michael Crosby 2018-10-17 10:22:51 -04:00 committed by GitHub
commit f1f8cb017e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/containerd/command/config.go
View File

@ -23,12 +23,13 @@ import (
"github.com/BurntSushi/toml"
"github.com/containerd/containerd/services/server"
srvconfig "github.com/containerd/containerd/services/server/config"
"github.com/urfave/cli"
)
// Config is a wrapper of server config for printing out.
type Config struct {
*server.Config
*srvconfig.Config
// Plugins overrides `Plugins map[string]toml.Primitive` in server config.
Plugins map[string]interface{} `toml:"plugins"`
}

8
cmd/containerd/command/config_linux.go
View File

@ -18,14 +18,14 @@ package command
import (
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/services/server"
srvconfig "github.com/containerd/containerd/services/server/config"
)
func defaultConfig() *server.Config {
return &server.Config{
func defaultConfig() *srvconfig.Config {
return &srvconfig.Config{
Root: defaults.DefaultRootDir,
State: defaults.DefaultStateDir,
GRPC: server.GRPCConfig{
GRPC: srvconfig.GRPCConfig{
Address: defaults.DefaultAddress,
MaxRecvMsgSize: defaults.DefaultMaxRecvMsgSize,
MaxSendMsgSize: defaults.DefaultMaxSendMsgSize,

10
cmd/containerd/command/config_unsupported.go
View File

@ -20,17 +20,17 @@ package command
import (
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/services/server"
srvconfig "github.com/containerd/containerd/services/server/config"
)
func defaultConfig() *server.Config {
return &server.Config{
func defaultConfig() *srvconfig.Config {
return &srvconfig.Config{
Root: defaults.DefaultRootDir,
State: defaults.DefaultStateDir,
GRPC: server.GRPCConfig{
GRPC: srvconfig.GRPCConfig{
Address: defaults.DefaultAddress,
},
Debug: server.Debug{
Debug: srvconfig.Debug{
Level: "info",
Address: defaults.DefaultDebugAddress,
},

8
cmd/containerd/command/config_windows.go
View File

@ -18,14 +18,14 @@ package command
import (
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/services/server"
srvconfig "github.com/containerd/containerd/services/server/config"
)
func defaultConfig() *server.Config {
return &server.Config{
func defaultConfig() *srvconfig.Config {
return &srvconfig.Config{
Root: defaults.DefaultRootDir,
State: defaults.DefaultStateDir,
GRPC: server.GRPCConfig{
GRPC: srvconfig.GRPCConfig{
Address: defaults.DefaultAddress,
MaxRecvMsgSize: defaults.DefaultMaxRecvMsgSize,
MaxSendMsgSize: defaults.DefaultMaxSendMsgSize,

7
cmd/containerd/command/main.go
View File

@ -29,6 +29,7 @@ import (
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/services/server"
srvconfig "github.com/containerd/containerd/services/server/config"
"github.com/containerd/containerd/sys"
"github.com/containerd/containerd/version"
"github.com/pkg/errors"
@ -109,7 +110,7 @@ func App() *cli.App {
// we don't miss any signals during boot
signal.Notify(signals, handledSignals...)
if err := server.LoadConfig(context.GlobalString("config"), config); err != nil && !os.IsNotExist(err) {
if err := srvconfig.LoadConfig(context.GlobalString("config"), config); err != nil && !os.IsNotExist(err) {
return err
}
// apply flags to the config
@ -187,7 +188,7 @@ func serve(ctx gocontext.Context, l net.Listener, serveFunc func(net.Listener) e
}()
}
func applyFlags(context *cli.Context, config *server.Config) error {
func applyFlags(context *cli.Context, config *srvconfig.Config) error {
// the order for config vs flag values is that flags will always override
// the config values if they are set
if err := setLevel(context, config); err != nil {
@ -217,7 +218,7 @@ func applyFlags(context *cli.Context, config *server.Config) error {
return nil
}
func setLevel(context *cli.Context, config *server.Config) error {
func setLevel(context *cli.Context, config *srvconfig.Config) error {
l := context.GlobalString("log-level")
if l == "" {
l = config.Debug.Level

6
daemon_config_linux_test.go
View File

@ -30,7 +30,7 @@ import (
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/pkg/testutil"
"github.com/containerd/containerd/runtime/v2/runc/options"
"github.com/containerd/containerd/services/server"
srvconfig "github.com/containerd/containerd/services/server/config"
)
// the following nolint is for shutting up gometalinter on non-linux.
@ -42,7 +42,7 @@ func newDaemonWithConfig(t *testing.T, configTOML string) (*Client, *daemon, fun
testutil.RequiresRoot(t)
var (
ctrd = daemon{}
configTOMLDecoded server.Config
configTOMLDecoded srvconfig.Config
buf = bytes.NewBuffer(nil)
)
@ -61,7 +61,7 @@ func newDaemonWithConfig(t *testing.T, configTOML string) (*Client, *daemon, fun
t.Fatal(err)
}
if err = server.LoadConfig(configTOMLFile, &configTOMLDecoded); err != nil {
if err = srvconfig.LoadConfig(configTOMLFile, &configTOMLDecoded); err != nil {
t.Fatal(err)
}

2
services/server/config.go → services/server/config/config.go
View File

@ -14,7 +14,7 @@
limitations under the License.
*/
package server
package config
import (
"github.com/BurntSushi/toml"

7
services/server/server.go
View File

@ -40,6 +40,7 @@ import (
"github.com/containerd/containerd/metadata"
"github.com/containerd/containerd/pkg/dialer"
"github.com/containerd/containerd/plugin"
srvconfig "github.com/containerd/containerd/services/server/config"
"github.com/containerd/containerd/snapshots"
ssproxy "github.com/containerd/containerd/snapshots/proxy"
metrics "github.com/docker/go-metrics"
@ -50,7 +51,7 @@ import (
)
// New creates and initializes a new containerd server
func New(ctx context.Context, config *Config) (*Server, error) {
func New(ctx context.Context, config *srvconfig.Config) (*Server, error) {
switch {
case config.Root == "":
return nil, errors.New("root must be specified")
@ -149,7 +150,7 @@ func New(ctx context.Context, config *Config) (*Server, error) {
type Server struct {
rpc *grpc.Server
events *exchange.Exchange
config *Config
config *srvconfig.Config
plugins []*plugin.Plugin
}
@ -211,7 +212,7 @@ func (s *Server) Stop() {
// LoadPlugins loads all plugins into containerd and generates an ordered graph
// of all plugins.
func LoadPlugins(ctx context.Context, config *Config) ([]*plugin.Registration, error) {
func LoadPlugins(ctx context.Context, config *srvconfig.Config) ([]*plugin.Registration, error) {
// load all plugins into containerd
if err := plugin.Load(filepath.Join(config.Root, "plugins")); err != nil {
return nil, err

3
services/server/server_linux.go
View File

@ -22,12 +22,13 @@ import (
"github.com/containerd/cgroups"
"github.com/containerd/containerd/log"
srvconfig "github.com/containerd/containerd/services/server/config"
"github.com/containerd/containerd/sys"
specs "github.com/opencontainers/runtime-spec/specs-go"
)
// apply sets config settings on the server process
func apply(ctx context.Context, config *Config) error {
func apply(ctx context.Context, config *srvconfig.Config) error {
if config.OOMScore != 0 {
log.G(ctx).Debugf("changing OOM score to %d", config.OOMScore)
if err := sys.SetOOMScore(os.Getpid(), config.OOMScore); err != nil {

8
services/server/server_solaris.go
View File

@ -16,8 +16,12 @@
package server
import "context"
import (
"context"
func apply(_ context.Context, _ *Config) error {
srvconfig "github.com/containerd/containerd/server/config"
)
func apply(_ context.Context, _ *srvconfig.Config) error {
return nil
}

3
services/server/server_test.go
View File

@ -20,13 +20,14 @@ import (
"context"
"testing"
srvconfig "github.com/containerd/containerd/services/server/config"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
)
func TestNewErrorsWithSamePathForRootAndState(t *testing.T) {
path := "/tmp/path/for/testing"
_, err := New(context.Background(), &Config{
_, err := New(context.Background(), &srvconfig.Config{
Root: path,
State: path,
})

8
services/server/server_unsupported.go
View File

@ -18,8 +18,12 @@
package server
import "context"
import (
"context"
func apply(_ context.Context, _ *Config) error {
srvconfig "github.com/containerd/containerd/services/server/config"
)
func apply(_ context.Context, _ *srvconfig.Config) error {
return nil
}

4
services/server/server_windows.go
View File

@ -20,8 +20,10 @@ package server
import (
"context"
srvconfig "github.com/containerd/containerd/services/server/config"
)
func apply(_ context.Context, _ *Config) error {
func apply(_ context.Context, _ *srvconfig.Config) error {
return nil
}