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

Minor changes to sandbox metadata

Browse Source 
1. Reduce one bucket.Bucket call.
2. Use update helper instead of db.Update as in other functions.

Signed-off-by: Jin Dong <djdongjin95@gmail.com>
This commit is contained in:
Jin Dong 2023-06-18 19:56:25 +00:00
parent ad9d1a82f1
commit a01118bbed
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
metadata/sandbox.go
View File

@ -58,7 +58,7 @@ func (s *sandboxStore) Create(ctx context.Context, sandbox api.Sandbox) (api.San
return api.Sandbox{}, fmt.Errorf("failed to validate sandbox: %w", err) return api.Sandbox{}, fmt.Errorf("failed to validate sandbox: %w", err)
} }
if err := s.db.Update(func(tx *bbolt.Tx) error { if err := update(ctx, s.db, func(tx *bbolt.Tx) error {
parent, err := createSandboxBucket(tx, ns) parent, err := createSandboxBucket(tx, ns)
if err != nil { if err != nil {
return fmt.Errorf("create error: %w", err) return fmt.Errorf("create error: %w", err)
@ -138,10 +138,6 @@ func (s *sandboxStore) Update(ctx context.Context, sandbox api.Sandbox, fieldpat
updated.UpdatedAt = time.Now().UTC() updated.UpdatedAt = time.Now().UTC()
if err := s.validate(&updated); err != nil {
return err
}
if err := s.write(parent, &updated, true); err != nil { if err := s.write(parent, &updated, true); err != nil {
return err return err
} }
@ -255,6 +251,10 @@ func (s *sandboxStore) Delete(ctx context.Context, id string) error {
} }
func (s *sandboxStore) write(parent *bbolt.Bucket, instance *api.Sandbox, overwrite bool) error { func (s *sandboxStore) write(parent *bbolt.Bucket, instance *api.Sandbox, overwrite bool) error {
if err := s.validate(instance); err != nil {
return err
}
var ( var (
bucket *bbolt.Bucket bucket *bbolt.Bucket
err error err error
@ -267,13 +267,11 @@ func (s *sandboxStore) write(parent *bbolt.Bucket, instance *api.Sandbox, overwr
return err return err
} }
} else { } else {
bucket = parent.Bucket(id)
if bucket != nil {
return fmt.Errorf("sandbox bucket %q already exists: %w", instance.ID, errdefs.ErrAlreadyExists)
}
bucket, err = parent.CreateBucket(id) bucket, err = parent.CreateBucket(id)
if err != nil { if err != nil {
if err == bbolt.ErrBucketExists {
return fmt.Errorf("sandbox bucket %q already exists: %w", instance.ID, errdefs.ErrAlreadyExists)
}
return err return err
} }
} }