Add container creation logic to Libpod
Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
parent
8d78e3cfac
commit
241653e152
8 changed files with 873 additions and 51 deletions
|
@ -1,52 +1,121 @@
|
|||
package libpod
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"io/ioutil"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
|
||||
"github.com/containers/storage"
|
||||
"github.com/docker/docker/pkg/stringid"
|
||||
spec "github.com/opencontainers/runtime-spec/specs-go"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/sirupsen/logrus"
|
||||
"github.com/ulule/deepcopier"
|
||||
)
|
||||
|
||||
// ContainerState represents the current state of a container
|
||||
type ContainerState int
|
||||
|
||||
const (
|
||||
// ContainerStateUnknown indicates that the container is in an error
|
||||
// state where information about it cannot be retrieved
|
||||
ContainerStateUnknown ContainerState = iota
|
||||
// ContainerStateConfigured indicates that the container has had its
|
||||
// storage configured but it has not been created in the OCI runtime
|
||||
ContainerStateConfigured ContainerState = iota
|
||||
// ContainerStateCreated indicates the container has been created in
|
||||
// the OCI runtime but not started
|
||||
ContainerStateCreated ContainerState = iota
|
||||
// ContainerStateRunning indicates the container is currently executing
|
||||
ContainerStateRunning ContainerState = iota
|
||||
// ContainerStateStopped indicates that the container was running but has
|
||||
// exited
|
||||
ContainerStateStopped ContainerState = iota
|
||||
// ContainerStatePaused indicates that the container has been paused
|
||||
ContainerStatePaused ContainerState = iota
|
||||
)
|
||||
|
||||
// Container is a single OCI container
|
||||
type Container struct {
|
||||
id string
|
||||
name string
|
||||
config *containerConfig
|
||||
|
||||
spec *spec.Spec
|
||||
pod *Pod
|
||||
pod *Pod
|
||||
runningSpec *spec.Spec
|
||||
state ContainerState
|
||||
|
||||
valid bool
|
||||
lock sync.RWMutex
|
||||
// The location of the on-disk OCI runtime spec
|
||||
specfilePath string
|
||||
// Path to the nonvolatile container configuration file
|
||||
statefilePath string
|
||||
// Path to the container's non-volatile directory
|
||||
containerDir string
|
||||
// Path to the container's volatile directory
|
||||
containerRunDir string
|
||||
// Path to the mountpoint of the container's root filesystem
|
||||
containerMountPoint string
|
||||
|
||||
// Whether this container was configured with containers/storage
|
||||
useContainerStorage bool
|
||||
// Containers/storage information on container
|
||||
// Will be empty if container is configured using a directory
|
||||
containerStorageInfo *ContainerInfo
|
||||
|
||||
// TODO move to storage.Locker from sync.Mutex
|
||||
valid bool
|
||||
lock sync.Mutex
|
||||
runtime *Runtime
|
||||
}
|
||||
|
||||
// containerConfig contains all information that was used to create the
|
||||
// container. It may not be changed once created.
|
||||
// It is stored as an unchanging part of on-disk state
|
||||
type containerConfig struct {
|
||||
Spec *spec.Spec `json:"spec"`
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
RootfsDir *string `json:"rootfsDir,omitempty"`
|
||||
RootfsImageID *string `json:"rootfsImageID,omitempty"`
|
||||
RootfsImageName *string `json:"rootfsImageName,omitempty"`
|
||||
UseImageConfig bool `json:"useImageConfig"`
|
||||
Pod *string `json:"pod,omitempty"`
|
||||
SharedNamespaceCtr *string `json:"shareNamespacesWith,omitempty"`
|
||||
SharedNamespaceMap map[string]string `json:"sharedNamespaces"`
|
||||
}
|
||||
|
||||
// ID returns the container's ID
|
||||
func (c *Container) ID() string {
|
||||
// No locking needed, ID will never mutate after a container is created
|
||||
return c.id
|
||||
return c.config.ID
|
||||
}
|
||||
|
||||
// Name returns the container's name
|
||||
func (c *Container) Name() string {
|
||||
return c.name
|
||||
return c.config.Name
|
||||
}
|
||||
|
||||
// Spec returns the container's OCI runtime spec
|
||||
// The spec returned is the one used to create the container. The running
|
||||
// spec may differ slightly as mounts are added based on the image
|
||||
func (c *Container) Spec() *spec.Spec {
|
||||
// The spec can potentially be altered when storage is configured and to
|
||||
// add annotations at container create time
|
||||
// As such, access to it is locked
|
||||
c.lock.RLock()
|
||||
defer c.lock.RUnlock()
|
||||
|
||||
spec := new(spec.Spec)
|
||||
deepcopier.Copy(c.spec).To(spec)
|
||||
deepcopier.Copy(c.config.Spec).To(spec)
|
||||
|
||||
return spec
|
||||
}
|
||||
|
||||
// State returns the current state of the container
|
||||
func (c *Container) State() (ContainerState, error) {
|
||||
c.lock.Lock()
|
||||
defer c.lock.Unlock()
|
||||
|
||||
// TODO uncomment when working
|
||||
// if err := c.runtime.ociRuntime.updateContainerStatus(c); err != nil {
|
||||
// return ContainerStateUnknown, err
|
||||
// }
|
||||
|
||||
return c.state, nil
|
||||
}
|
||||
|
||||
// Make a new container
|
||||
func newContainer(rspec *spec.Spec) (*Container, error) {
|
||||
if rspec == nil {
|
||||
|
@ -54,23 +123,147 @@ func newContainer(rspec *spec.Spec) (*Container, error) {
|
|||
}
|
||||
|
||||
ctr := new(Container)
|
||||
ctr.id = stringid.GenerateNonCryptoID()
|
||||
ctr.name = ctr.id // TODO generate unique human-readable names
|
||||
ctr.config = new(containerConfig)
|
||||
|
||||
ctr.spec = new(spec.Spec)
|
||||
deepcopier.Copy(rspec).To(ctr.spec)
|
||||
ctr.config.ID = stringid.GenerateNonCryptoID()
|
||||
ctr.config.Name = ctr.config.ID // TODO generate unique human-readable names
|
||||
|
||||
ctr.config.Spec = new(spec.Spec)
|
||||
deepcopier.Copy(rspec).To(ctr.config.Spec)
|
||||
|
||||
return ctr, nil
|
||||
}
|
||||
|
||||
// Create container root filesystem for use
|
||||
func (c *Container) setupStorage() error {
|
||||
c.lock.Lock()
|
||||
defer c.lock.Unlock()
|
||||
|
||||
if !c.valid {
|
||||
return errors.Wrapf(ErrCtrRemoved, "container %s is not valid", c.ID())
|
||||
}
|
||||
|
||||
if c.state != ContainerStateConfigured {
|
||||
return errors.Wrapf(ErrCtrStateInvalid, "container %s must be in Configured state to have storage set up", c.ID())
|
||||
}
|
||||
|
||||
// If we're configured to use a directory, perform that setup
|
||||
if c.config.RootfsDir != nil {
|
||||
// TODO implement directory-based root filesystems
|
||||
return ErrNotImplemented
|
||||
}
|
||||
|
||||
// Not using a directory, so call into containers/storage
|
||||
return c.setupImageRootfs()
|
||||
}
|
||||
|
||||
// Set up an image as root filesystem using containers/storage
|
||||
func (c *Container) setupImageRootfs() error {
|
||||
// Need both an image ID and image name, plus a bool telling us whether to use the image configuration
|
||||
if c.config.RootfsImageID == nil || c.config.RootfsImageName == nil {
|
||||
return errors.Wrapf(ErrInvalidArg, "must provide image ID and image name to use an image")
|
||||
}
|
||||
|
||||
// TODO SELinux mount label
|
||||
containerInfo, err := c.runtime.storageService.CreateContainerStorage(c.runtime.imageContext, *c.config.RootfsImageName, *c.config.RootfsImageID, c.config.Name, c.config.ID, "")
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "error creating container storage")
|
||||
}
|
||||
|
||||
c.useContainerStorage = true
|
||||
c.containerStorageInfo = &containerInfo
|
||||
c.containerDir = containerInfo.Dir
|
||||
c.containerRunDir = containerInfo.RunDir
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// Create creates a container in the OCI runtime
|
||||
func (c *Container) Create() error {
|
||||
return ErrNotImplemented
|
||||
func (c *Container) Create() (err error) {
|
||||
c.lock.Lock()
|
||||
defer c.lock.Unlock()
|
||||
|
||||
if !c.valid {
|
||||
return errors.Wrapf(ErrCtrRemoved, "container %s is not valid", c.ID())
|
||||
}
|
||||
|
||||
if c.state != ContainerStateConfigured {
|
||||
return errors.Wrapf(ErrCtrExists, "container %s has already been created in runtime", c.ID())
|
||||
}
|
||||
|
||||
// If using containers/storage, mount the container
|
||||
if !c.useContainerStorage {
|
||||
// TODO implemented directory-based root filesystems
|
||||
return ErrNotImplemented
|
||||
} else {
|
||||
mountPoint, err := c.runtime.storageService.StartContainer(c.ID())
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "error mounting storage for container %s", c.ID())
|
||||
}
|
||||
c.containerMountPoint = mountPoint
|
||||
|
||||
defer func() {
|
||||
if err != nil {
|
||||
if err2 := c.runtime.storageService.StopContainer(c.ID()); err2 != nil {
|
||||
logrus.Errorf("Error unmounting storage for container %s: %v", c.ID(), err2)
|
||||
}
|
||||
|
||||
c.containerMountPoint = ""
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
// Make the OCI runtime spec we will use
|
||||
c.runningSpec = new(spec.Spec)
|
||||
deepcopier.Copy(c.config.Spec).To(c.runningSpec)
|
||||
c.runningSpec.Root.Path = c.containerMountPoint
|
||||
|
||||
// TODO Add annotation for start time to spec
|
||||
|
||||
// Save the OCI spec to disk
|
||||
jsonPath := filepath.Join(c.containerRunDir, "config.json")
|
||||
fileJSON, err := json.Marshal(c.runningSpec)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "error exporting runtime spec for container %s to JSON", c.ID())
|
||||
}
|
||||
if err := ioutil.WriteFile(jsonPath, fileJSON, 0644); err != nil {
|
||||
return errors.Wrapf(err, "error writing runtime spec JSON to file for container %s", c.ID())
|
||||
}
|
||||
|
||||
// With the spec complete, do an OCI create
|
||||
// TODO set cgroup parent in a sane fashion
|
||||
if err := c.runtime.ociRuntime.createContainer(c, "/libpod_parent"); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// TODO should flush this state to disk here
|
||||
c.state = ContainerStateCreated
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// Start starts a container
|
||||
func (c *Container) Start() error {
|
||||
return ErrNotImplemented
|
||||
c.lock.Lock()
|
||||
defer c.lock.Unlock()
|
||||
|
||||
if !c.valid {
|
||||
return ErrCtrRemoved
|
||||
}
|
||||
|
||||
// Container must be created or stopped to be started
|
||||
if !(c.state == ContainerStateCreated || c.state == ContainerStateStopped) {
|
||||
return errors.Wrapf(ErrCtrStateInvalid, "container %s must be in Created or Stopped state to be started", c.ID())
|
||||
}
|
||||
|
||||
if err := c.runtime.ociRuntime.startContainer(c); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// TODO should flush state to disk here
|
||||
c.state = ContainerStateRunning
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// Stop stops a container
|
||||
|
@ -101,9 +294,13 @@ func (c *Container) Mount() (string, error) {
|
|||
return "", ErrNotImplemented
|
||||
}
|
||||
|
||||
// Status gets a container's status
|
||||
// TODO this should return relevant information about container state
|
||||
func (c *Container) Status() error {
|
||||
// Pause pauses a container
|
||||
func (c *Container) Pause() error {
|
||||
return ErrNotImplemented
|
||||
}
|
||||
|
||||
// Unpause unpauses a container
|
||||
func (c *Container) Unpause() error {
|
||||
return ErrNotImplemented
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue