Skip to content

Commit

Permalink
virtcontainers: Conversion to Stores
Browse files Browse the repository at this point in the history 
We convert the whole virtcontainers code to use the store package
instead of the resource_storage one. The resource_storage removal will
happen in a separate change for a more logical split.

This change is fairly big but mostly does not change the code logic.
What really changes is when we create a store for a container or a
sandbox. We now need to explictly do so instead of just assigning a
filesystem{} instance. Other than that, the logic is kept intact.

Fixes: kata-containers#1099

Signed-off-by: Samuel Ortiz <[email protected]>
  • Loading branch information
Samuel Ortiz committed Jan 24, 2019
1 parent b2b03e7 commit a16b500
Show file tree
Hide file tree
Showing 24 changed files with 420 additions and 683 deletions.
51 changes: 26 additions & 25 deletions virtcontainers/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
deviceApi "github.com/kata-containers/runtime/virtcontainers/device/api"
deviceConfig "github.com/kata-containers/runtime/virtcontainers/device/config"
vcTypes "github.com/kata-containers/runtime/virtcontainers/pkg/types"
"github.com/kata-containers/runtime/virtcontainers/store"
"github.com/kata-containers/runtime/virtcontainers/types"
specs "github.com/opencontainers/runtime-spec/specs-go"
opentracing "github.com/opentracing/opentracing-go"
Expand Down Expand Up @@ -142,7 +143,7 @@ func DeleteSandbox(ctx context.Context, sandboxID string) (VCSandbox, error) {
if err != nil {
return nil, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

// Fetch the sandbox from storage and create it.
s, err := fetchSandbox(ctx, sandboxID)
Expand Down Expand Up @@ -175,7 +176,7 @@ func FetchSandbox(ctx context.Context, sandboxID string) (VCSandbox, error) {
if err != nil {
return nil, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

// Fetch the sandbox from storage and create it.
s, err := fetchSandbox(ctx, sandboxID)
Expand Down Expand Up @@ -212,7 +213,7 @@ func StartSandbox(ctx context.Context, sandboxID string) (VCSandbox, error) {
if err != nil {
return nil, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

// Fetch the sandbox from storage and create it.
s, err := fetchSandbox(ctx, sandboxID)
Expand Down Expand Up @@ -244,7 +245,7 @@ func StopSandbox(ctx context.Context, sandboxID string) (VCSandbox, error) {
if err != nil {
return nil, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

// Fetch the sandbox from storage and create it.
s, err := fetchSandbox(ctx, sandboxID)
Expand Down Expand Up @@ -279,7 +280,7 @@ func RunSandbox(ctx context.Context, sandboxConfig SandboxConfig, factory Factor
if err != nil {
return nil, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(s.id, lockFile)

// Start the sandbox
err = s.Start()
Expand All @@ -295,7 +296,7 @@ func ListSandbox(ctx context.Context) ([]SandboxStatus, error) {
span, ctx := trace(ctx, "ListSandbox")
defer span.Finish()

dir, err := os.Open(configStoragePath)
dir, err := os.Open(store.ConfigStoragePath)
if err != nil {
if os.IsNotExist(err) {
// No sandbox directory is not an error
Expand Down Expand Up @@ -338,11 +339,11 @@ func StatusSandbox(ctx context.Context, sandboxID string) (SandboxStatus, error)
if err != nil {
return SandboxStatus{}, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
unlockSandbox(lockFile)
unlockSandbox(sandboxID, lockFile)
return SandboxStatus{}, err
}
defer s.releaseStatelessSandbox()
Expand Down Expand Up @@ -384,7 +385,7 @@ func CreateContainer(ctx context.Context, sandboxID string, containerConfig Cont
if err != nil {
return nil, nil, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand Down Expand Up @@ -419,7 +420,7 @@ func DeleteContainer(ctx context.Context, sandboxID, containerID string) (VCCont
if err != nil {
return nil, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand Down Expand Up @@ -448,7 +449,7 @@ func StartContainer(ctx context.Context, sandboxID, containerID string) (VCConta
if err != nil {
return nil, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand Down Expand Up @@ -477,7 +478,7 @@ func StopContainer(ctx context.Context, sandboxID, containerID string) (VCContai
if err != nil {
return nil, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand Down Expand Up @@ -506,7 +507,7 @@ func EnterContainer(ctx context.Context, sandboxID, containerID string, cmd type
if err != nil {
return nil, nil, nil, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand Down Expand Up @@ -540,11 +541,11 @@ func StatusContainer(ctx context.Context, sandboxID, containerID string) (Contai
if err != nil {
return ContainerStatus{}, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
unlockSandbox(lockFile)
unlockSandbox(sandboxID, lockFile)
return ContainerStatus{}, err
}
defer s.releaseStatelessSandbox()
Expand Down Expand Up @@ -621,7 +622,7 @@ func KillContainer(ctx context.Context, sandboxID, containerID string, signal sy
if err != nil {
return err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand Down Expand Up @@ -668,7 +669,7 @@ func ProcessListContainer(ctx context.Context, sandboxID, containerID string, op
if err != nil {
return nil, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand Down Expand Up @@ -697,7 +698,7 @@ func UpdateContainer(ctx context.Context, sandboxID, containerID string, resourc
if err != nil {
return err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand Down Expand Up @@ -726,7 +727,7 @@ func StatsContainer(ctx context.Context, sandboxID, containerID string) (Contain
return ContainerStats{}, err
}

defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand All @@ -750,7 +751,7 @@ func togglePauseContainer(ctx context.Context, sandboxID, containerID string, pa
if err != nil {
return err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand Down Expand Up @@ -794,7 +795,7 @@ func AddDevice(ctx context.Context, sandboxID string, info deviceConfig.DeviceIn
if err != nil {
return nil, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand All @@ -814,7 +815,7 @@ func toggleInterface(ctx context.Context, sandboxID string, inf *vcTypes.Interfa
if err != nil {
return nil, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand Down Expand Up @@ -858,7 +859,7 @@ func ListInterfaces(ctx context.Context, sandboxID string) ([]*vcTypes.Interface
if err != nil {
return nil, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand All @@ -882,7 +883,7 @@ func UpdateRoutes(ctx context.Context, sandboxID string, routes []*vcTypes.Route
if err != nil {
return nil, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand All @@ -906,7 +907,7 @@ func ListRoutes(ctx context.Context, sandboxID string) ([]*vcTypes.Route, error)
if err != nil {
return nil, err
}
defer unlockSandbox(lockFile)
defer unlockSandbox(sandboxID, lockFile)

s, err := fetchSandbox(ctx, sandboxID)
if err != nil {
Expand Down
Loading

0 comments on commit a16b500

Please sign in to comment.