mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
26b1064967
This PR adds a "request ID" to each event generated, the 'docker events' stream now looks like this: ``` 2015-09-10T15:02:50.000000000-07:00 [reqid: c01e3534ddca] de7c5d4ca927253cf4e978ee9c4545161e406e9b5a14617efb52c658b249174a: (from ubuntu) create ``` Note the `[reqID: c01e3534ddca]` part, that's new. Each HTTP request will generate its own unique ID. So, if you do a `docker build` you'll see a series of events all with the same reqID. This allow for log processing tools to determine which events are all related to the same http request. I didn't propigate the context to all possible funcs in the daemon, I decided to just do the ones that needed it in order to get the reqID into the events. I'd like to have people review this direction first, and if we're ok with it then I'll make sure we're consistent about when we pass around the context - IOW, make sure that all funcs at the same level have a context passed in even if they don't call the log funcs - this will ensure we're consistent w/o passing it around for all calls unnecessarily. ping @icecrime @calavera @crosbymichael Signed-off-by: Doug Davis <dug@us.ibm.com>
156 lines
4.4 KiB
Go
156 lines
4.4 KiB
Go
package daemon
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/Sirupsen/logrus"
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/context"
|
|
derr "github.com/docker/docker/errors"
|
|
"github.com/docker/docker/graph/tags"
|
|
"github.com/docker/docker/image"
|
|
"github.com/docker/docker/pkg/parsers"
|
|
"github.com/docker/docker/pkg/stringid"
|
|
"github.com/docker/docker/runconfig"
|
|
"github.com/opencontainers/runc/libcontainer/label"
|
|
)
|
|
|
|
// ContainerCreate takes configs and creates a container.
|
|
func (daemon *Daemon) ContainerCreate(ctx context.Context, name string, config *runconfig.Config, hostConfig *runconfig.HostConfig, adjustCPUShares bool) (*Container, []string, error) {
|
|
if config == nil {
|
|
return nil, nil, derr.ErrorCodeEmptyConfig
|
|
}
|
|
|
|
warnings, err := daemon.verifyContainerSettings(ctx, hostConfig, config)
|
|
if err != nil {
|
|
return nil, warnings, err
|
|
}
|
|
|
|
daemon.adaptContainerSettings(hostConfig, adjustCPUShares)
|
|
|
|
container, buildWarnings, err := daemon.Create(ctx, config, hostConfig, name)
|
|
if err != nil {
|
|
if daemon.Graph(ctx).IsNotExist(err, config.Image) {
|
|
if strings.Contains(config.Image, "@") {
|
|
return nil, warnings, derr.ErrorCodeNoSuchImageHash.WithArgs(config.Image)
|
|
}
|
|
img, tag := parsers.ParseRepositoryTag(config.Image)
|
|
if tag == "" {
|
|
tag = tags.DefaultTag
|
|
}
|
|
return nil, warnings, derr.ErrorCodeNoSuchImageTag.WithArgs(img, tag)
|
|
}
|
|
return nil, warnings, err
|
|
}
|
|
|
|
warnings = append(warnings, buildWarnings...)
|
|
|
|
return container, warnings, nil
|
|
}
|
|
|
|
// Create creates a new container from the given configuration with a given name.
|
|
func (daemon *Daemon) Create(ctx context.Context, config *runconfig.Config, hostConfig *runconfig.HostConfig, name string) (retC *Container, retS []string, retErr error) {
|
|
var (
|
|
container *Container
|
|
warnings []string
|
|
img *image.Image
|
|
imgID string
|
|
err error
|
|
)
|
|
|
|
if config.Image != "" {
|
|
img, err = daemon.repositories.LookupImage(config.Image)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
if err = daemon.graph.CheckDepth(img); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
imgID = img.ID
|
|
}
|
|
|
|
if err := daemon.mergeAndVerifyConfig(config, img); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
if hostConfig == nil {
|
|
hostConfig = &runconfig.HostConfig{}
|
|
}
|
|
if hostConfig.SecurityOpt == nil {
|
|
hostConfig.SecurityOpt, err = daemon.generateSecurityOpt(ctx, hostConfig.IpcMode, hostConfig.PidMode)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
}
|
|
if container, err = daemon.newContainer(ctx, name, config, imgID); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
defer func() {
|
|
if retErr != nil {
|
|
if err := daemon.rm(ctx, container, false); err != nil {
|
|
logrus.Errorf("Clean up Error! Cannot destroy container %s: %v", container.ID, err)
|
|
}
|
|
}
|
|
}()
|
|
|
|
if err := daemon.Register(ctx, container); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
if err := daemon.createRootfs(container); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
if err := daemon.setHostConfig(ctx, container, hostConfig); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
defer func() {
|
|
if retErr != nil {
|
|
if err := container.removeMountPoints(true); err != nil {
|
|
logrus.Error(err)
|
|
}
|
|
}
|
|
}()
|
|
if err := container.Mount(ctx); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
defer container.Unmount(ctx)
|
|
|
|
if err := createContainerPlatformSpecificSettings(container, config, hostConfig, img); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
if err := container.toDiskLocking(); err != nil {
|
|
logrus.Errorf("Error saving new container to disk: %v", err)
|
|
return nil, nil, err
|
|
}
|
|
container.logEvent(ctx, "create")
|
|
return container, warnings, nil
|
|
}
|
|
|
|
func (daemon *Daemon) generateSecurityOpt(ctx context.Context, ipcMode runconfig.IpcMode, pidMode runconfig.PidMode) ([]string, error) {
|
|
if ipcMode.IsHost() || pidMode.IsHost() {
|
|
return label.DisableSecOpt(), nil
|
|
}
|
|
if ipcContainer := ipcMode.Container(); ipcContainer != "" {
|
|
c, err := daemon.Get(ctx, ipcContainer)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return label.DupSecOpt(c.ProcessLabel), nil
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
// VolumeCreate creates a volume with the specified name, driver, and opts
|
|
// This is called directly from the remote API
|
|
func (daemon *Daemon) VolumeCreate(ctx context.Context, name, driverName string, opts map[string]string) (*types.Volume, error) {
|
|
if name == "" {
|
|
name = stringid.GenerateNonCryptoID()
|
|
}
|
|
|
|
v, err := daemon.volumes.Create(name, driverName, opts)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return volumeToAPIType(v), nil
|
|
}
|