github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-04 11:06:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1661 from liubin/1660-replace-newStore-by-store

Browse Source 
virtcontainers: replace newStore by store in Sandbox struct
This commit is contained in:
Eric Ernst 2021-04-08 13:17:44 -07:00 committed by GitHub
commit 2334b858a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/runtime/virtcontainers/api_test.go
View File

@ -144,7 +144,7 @@ func TestCreateSandboxNoopAgentSuccessful(t *testing.T) {
assert.True(ok) assert.True(ok)
assert.NotNil(s) assert.NotNil(s)
sandboxDir := filepath.Join(s.newStore.RunStoragePath(), p.ID()) sandboxDir := filepath.Join(s.store.RunStoragePath(), p.ID())
_, err = os.Stat(sandboxDir) _, err = os.Stat(sandboxDir)
assert.NoError(err) assert.NoError(err)
} }
@ -175,7 +175,7 @@ func TestCreateSandboxKataAgentSuccessful(t *testing.T) {
s, ok := p.(*Sandbox) s, ok := p.(*Sandbox)
assert.True(ok) assert.True(ok)
sandboxDir := filepath.Join(s.newStore.RunStoragePath(), p.ID()) sandboxDir := filepath.Join(s.store.RunStoragePath(), p.ID())
_, err = os.Stat(sandboxDir) _, err = os.Stat(sandboxDir)
assert.NoError(err) assert.NoError(err)
} }
@ -224,7 +224,7 @@ func createAndStartSandbox(ctx context.Context, config SandboxConfig) (sandbox V
if !ok { if !ok {
return nil, "", fmt.Errorf("Could not get Sandbox") return nil, "", fmt.Errorf("Could not get Sandbox")
} }
sandboxDir = filepath.Join(s.newStore.RunStoragePath(), sandbox.ID()) sandboxDir = filepath.Join(s.store.RunStoragePath(), sandbox.ID())
_, err = os.Stat(sandboxDir) _, err = os.Stat(sandboxDir)
if err != nil { if err != nil {
return nil, "", err return nil, "", err
@ -285,7 +285,7 @@ func TestCleanupContainer(t *testing.T) {
s, ok := p.(*Sandbox) s, ok := p.(*Sandbox)
assert.True(ok) assert.True(ok)
sandboxDir := filepath.Join(s.newStore.RunStoragePath(), p.ID()) sandboxDir := filepath.Join(s.store.RunStoragePath(), p.ID())
_, err = os.Stat(sandboxDir) _, err = os.Stat(sandboxDir)
if err == nil { if err == nil {

6
src/runtime/virtcontainers/container_test.go
View File

@ -316,11 +316,11 @@ func TestContainerAddDriveDir(t *testing.T) {
}, },
} }
sandbox.newStore, err = persist.GetDriver() sandbox.store, err = persist.GetDriver()
assert.NoError(err) assert.NoError(err)
assert.NotNil(sandbox.newStore) assert.NotNil(sandbox.store)
defer sandbox.newStore.Destroy(sandbox.id) defer sandbox.store.Destroy(sandbox.id)
contID := "100" contID := "100"
container := Container{ container := Container{

6
src/runtime/virtcontainers/kata_agent_test.go
View File

@ -831,10 +831,10 @@ func TestAgentCreateContainer(t *testing.T) {
hypervisor: &mockHypervisor{}, hypervisor: &mockHypervisor{},
} }
newStore, err := persist.GetDriver() store, err := persist.GetDriver()
assert.NoError(err) assert.NoError(err)
assert.NotNil(newStore) assert.NotNil(store)
sandbox.newStore = newStore sandbox.store = store
container := &Container{ container := &Container{
ctx: sandbox.ctx, ctx: sandbox.ctx,

6
src/runtime/virtcontainers/persist.go
View File

@ -287,7 +287,7 @@ func (s *Sandbox) Save() error {
s.dumpNetwork(&ss) s.dumpNetwork(&ss)
s.dumpConfig(&ss) s.dumpConfig(&ss)
if err := s.newStore.ToDisk(ss, cs); err != nil { if err := s.store.ToDisk(ss, cs); err != nil {
return err return err
} }
@ -397,7 +397,7 @@ func (s *Sandbox) loadNetwork(netInfo persistapi.NetworkInfo) {
// Restore will restore sandbox data from persist file on disk // Restore will restore sandbox data from persist file on disk
func (s *Sandbox) Restore() error { func (s *Sandbox) Restore() error {
ss, _, err := s.newStore.FromDisk(s.id) ss, _, err := s.store.FromDisk(s.id)
if err != nil { if err != nil {
return err return err
} }
@ -412,7 +412,7 @@ func (s *Sandbox) Restore() error {
// Restore will restore container data from persist file on disk // Restore will restore container data from persist file on disk
func (c *Container) Restore() error { func (c *Container) Restore() error {
_, css, err := c.sandbox.newStore.FromDisk(c.sandbox.id) _, css, err := c.sandbox.store.FromDisk(c.sandbox.id)
if err != nil { if err != nil {
return err return err
} }

6
src/runtime/virtcontainers/persist_test.go
View File

@ -38,9 +38,9 @@ func TestSandboxRestore(t *testing.T) {
state: types.SandboxState{BlockIndexMap: make(map[int]struct{})}, state: types.SandboxState{BlockIndexMap: make(map[int]struct{})},
} }
sandbox.newStore, err = persist.GetDriver() sandbox.store, err = persist.GetDriver()
assert.NoError(err) assert.NoError(err)
assert.NotNil(sandbox.newStore) assert.NotNil(sandbox.store)
// if we don't call Save(), we can get nothing from disk // if we don't call Save(), we can get nothing from disk
err = sandbox.Restore() err = sandbox.Restore()
@ -67,7 +67,7 @@ func TestSandboxRestore(t *testing.T) {
// empty the sandbox // empty the sandbox
sandbox.state = types.SandboxState{} sandbox.state = types.SandboxState{}
if sandbox.newStore, err = persist.GetDriver(); err != nil || sandbox.newStore == nil { if sandbox.store, err = persist.GetDriver(); err != nil || sandbox.store == nil {
t.Fatal("failed to get persist driver") t.Fatal("failed to get persist driver")
} }

16
src/runtime/virtcontainers/qemu_test.go
View File

@ -194,7 +194,7 @@ func TestQemuKnobs(t *testing.T) {
assert.NoError(err) assert.NoError(err)
q := &qemu{ q := &qemu{
store: sandbox.newStore, store: sandbox.store,
} }
err = q.createSandbox(context.Background(), sandbox.id, NetworkNamespace{}, &sandbox.config.HypervisorConfig) err = q.createSandbox(context.Background(), sandbox.id, NetworkNamespace{}, &sandbox.config.HypervisorConfig)
assert.NoError(err) assert.NoError(err)
@ -462,7 +462,7 @@ func TestQemuFileBackedMem(t *testing.T) {
assert.NoError(err) assert.NoError(err)
q := &qemu{ q := &qemu{
store: sandbox.newStore, store: sandbox.store,
} }
sandbox.config.HypervisorConfig.SharedFS = config.VirtioFS sandbox.config.HypervisorConfig.SharedFS = config.VirtioFS
err = q.createSandbox(context.Background(), sandbox.id, NetworkNamespace{}, &sandbox.config.HypervisorConfig) err = q.createSandbox(context.Background(), sandbox.id, NetworkNamespace{}, &sandbox.config.HypervisorConfig)
@ -477,7 +477,7 @@ func TestQemuFileBackedMem(t *testing.T) {
assert.NoError(err) assert.NoError(err)
q = &qemu{ q = &qemu{
store: sandbox.newStore, store: sandbox.store,
} }
sandbox.config.HypervisorConfig.BootToBeTemplate = true sandbox.config.HypervisorConfig.BootToBeTemplate = true
sandbox.config.HypervisorConfig.SharedFS = config.VirtioFS sandbox.config.HypervisorConfig.SharedFS = config.VirtioFS
@ -493,7 +493,7 @@ func TestQemuFileBackedMem(t *testing.T) {
assert.NoError(err) assert.NoError(err)
q = &qemu{ q = &qemu{
store: sandbox.newStore, store: sandbox.store,
} }
sandbox.config.HypervisorConfig.FileBackedMemRootDir = "/tmp/xyzabc" sandbox.config.HypervisorConfig.FileBackedMemRootDir = "/tmp/xyzabc"
err = q.createSandbox(context.Background(), sandbox.id, NetworkNamespace{}, &sandbox.config.HypervisorConfig) err = q.createSandbox(context.Background(), sandbox.id, NetworkNamespace{}, &sandbox.config.HypervisorConfig)
@ -507,7 +507,7 @@ func TestQemuFileBackedMem(t *testing.T) {
assert.NoError(err) assert.NoError(err)
q = &qemu{ q = &qemu{
store: sandbox.newStore, store: sandbox.store,
} }
sandbox.config.HypervisorConfig.EnableVhostUserStore = true sandbox.config.HypervisorConfig.EnableVhostUserStore = true
sandbox.config.HypervisorConfig.HugePages = true sandbox.config.HypervisorConfig.HugePages = true
@ -520,7 +520,7 @@ func TestQemuFileBackedMem(t *testing.T) {
assert.NoError(err) assert.NoError(err)
q = &qemu{ q = &qemu{
store: sandbox.newStore, store: sandbox.store,
} }
sandbox.config.HypervisorConfig.EnableVhostUserStore = true sandbox.config.HypervisorConfig.EnableVhostUserStore = true
sandbox.config.HypervisorConfig.HugePages = false sandbox.config.HypervisorConfig.HugePages = false
@ -541,11 +541,11 @@ func createQemuSandboxConfig() (*Sandbox, error) {
}, },
} }
newStore, err := persist.GetDriver() store, err := persist.GetDriver()
if err != nil { if err != nil {
return &Sandbox{}, err return &Sandbox{}, err
} }
sandbox.newStore = newStore sandbox.store = store
return &sandbox, nil return &sandbox, nil
} }

20
src/runtime/virtcontainers/sandbox.go
View File

@ -168,7 +168,7 @@ type Sandbox struct {
factory Factory factory Factory
hypervisor hypervisor hypervisor hypervisor
agent agent agent agent
newStore persistapi.PersistDriver store persistapi.PersistDriver
network Network network Network
monitor *monitor monitor *monitor
@ -282,7 +282,7 @@ func (s *Sandbox) GetContainer(containerID string) VCContainer {
return nil return nil
} }
// Release closes the agent connection and removes sandbox from internal list. // Release closes the agent connection.
func (s *Sandbox) Release(ctx context.Context) error { func (s *Sandbox) Release(ctx context.Context) error {
s.Logger().Info("release sandbox") s.Logger().Info("release sandbox")
if s.monitor != nil { if s.monitor != nil {
@ -293,7 +293,6 @@ func (s *Sandbox) Release(ctx context.Context) error {
} }
// Status gets the status of the sandbox // Status gets the status of the sandbox
// TODO: update container status properly, see kata-containers/runtime#253
func (s *Sandbox) Status() SandboxStatus { func (s *Sandbox) Status() SandboxStatus {
var contStatusList []ContainerStatus var contStatusList []ContainerStatus
for _, c := range s.containers { for _, c := range s.containers {
@ -491,8 +490,7 @@ func newSandbox(ctx context.Context, sandboxConfig SandboxConfig, factory Factor
} }
// create agent instance // create agent instance
newAagentFunc := getNewAgentFunc(ctx) agent := getNewAgentFunc(ctx)()
agent := newAagentFunc()
hypervisor, err := newHypervisor(sandboxConfig.HypervisorType) hypervisor, err := newHypervisor(sandboxConfig.HypervisorType)
if err != nil { if err != nil {
@ -518,14 +516,14 @@ func newSandbox(ctx context.Context, sandboxConfig SandboxConfig, factory Factor
hypervisor.setSandbox(s) hypervisor.setSandbox(s)
if s.newStore, err = persist.GetDriver(); err != nil || s.newStore == nil { if s.store, err = persist.GetDriver(); err != nil || s.store == nil {
return nil, fmt.Errorf("failed to get fs persist driver: %v", err) return nil, fmt.Errorf("failed to get fs persist driver: %v", err)
} }
defer func() { defer func() {
if retErr != nil { if retErr != nil {
s.Logger().WithError(retErr).WithField("sandboxid", s.id).Error("Create new sandbox failed") s.Logger().WithError(retErr).Error("Create new sandbox failed")
s.newStore.Destroy(s.id) s.store.Destroy(s.id)
} }
}() }()
@ -543,7 +541,7 @@ func newSandbox(ctx context.Context, sandboxConfig SandboxConfig, factory Factor
s.Logger().WithError(err).Debug("restore sandbox failed") s.Logger().WithError(err).Debug("restore sandbox failed")
} }
// new store doesn't require hypervisor to be stored immediately // store doesn't require hypervisor to be stored immediately
if err = s.hypervisor.createSandbox(ctx, s.id, s.networkNS, &sandboxConfig.HypervisorConfig); err != nil { if err = s.hypervisor.createSandbox(ctx, s.id, s.networkNS, &sandboxConfig.HypervisorConfig); err != nil {
return nil, err return nil, err
} }
@ -708,7 +706,7 @@ func (s *Sandbox) Delete(ctx context.Context) error {
s.agent.cleanup(ctx, s) s.agent.cleanup(ctx, s)
return s.newStore.Destroy(s.id) return s.store.Destroy(s.id)
} }
func (s *Sandbox) startNetworkMonitor(ctx context.Context) error { func (s *Sandbox) startNetworkMonitor(ctx context.Context) error {
@ -2283,7 +2281,7 @@ func fetchSandbox(ctx context.Context, sandboxID string) (sandbox *Sandbox, err
// load sandbox config fromld store. // load sandbox config fromld store.
c, err := loadSandboxConfig(sandboxID) c, err := loadSandboxConfig(sandboxID)
if err != nil { if err != nil {
virtLog.WithError(err).Warning("failed to get sandbox config from new store") virtLog.WithError(err).Warning("failed to get sandbox config from store")
return nil, err return nil, err
} }

2
src/runtime/virtcontainers/sandbox_test.go
View File

@ -1009,7 +1009,7 @@ func TestDeleteStoreWhenNewContainerFail(t *testing.T) {
} }
_, err = newContainer(context.Background(), p, &contConfig) _, err = newContainer(context.Background(), p, &contConfig)
assert.NotNil(t, err, "New container with invalid device info should fail") assert.NotNil(t, err, "New container with invalid device info should fail")
storePath := filepath.Join(p.newStore.RunStoragePath(), testSandboxID, contID) storePath := filepath.Join(p.store.RunStoragePath(), testSandboxID, contID)
_, err = os.Stat(storePath) _, err = os.Stat(storePath)
assert.NotNil(t, err, "Should delete configuration root after failed to create a container") assert.NotNil(t, err, "Should delete configuration root after failed to create a container")
} }