Fix out of date comments for CRI store packages

All of the CRI store related packages all use the standard errdefs
errors now for if a key doesn't or already exists (ErrAlreadyExists,
ErrNotFound), but the comments for the methods still referenced
some unused package specific error definitions. This change just
updates the comments to reflect what errors are actually returned
and adds comments for some previously undocumented exported functions.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
This commit is contained in:
Daniel Canter 2022-07-11 13:53:11 -07:00
parent de4e2e11d4
commit bcdc8468f8
5 changed files with 14 additions and 7 deletions

View File

@ -162,7 +162,7 @@ func getRepoDigestAndTag(namedRef docker.Named, digest imagedigest.Digest, schem
} }
// localResolve resolves image reference locally and returns corresponding image metadata. It // localResolve resolves image reference locally and returns corresponding image metadata. It
// returns store.ErrNotExist if the reference doesn't exist. // returns errdefs.ErrNotFound if the reference doesn't exist.
func (c *criService) localResolve(refOrID string) (imagestore.Image, error) { func (c *criService) localResolve(refOrID string) (imagestore.Image, error) {
getImageID := func(refOrId string) string { getImageID := func(refOrId string) string {
if _, err := imagedigest.Parse(refOrID); err == nil { if _, err := imagedigest.Parse(refOrID); err == nil {

View File

@ -122,7 +122,7 @@ func NewStore(labels *label.Store) *Store {
} }
} }
// Add a container into the store. Returns store.ErrAlreadyExist if the // Add a container into the store. Returns errdefs.ErrAlreadyExists if the
// container already exists. // container already exists.
func (s *Store) Add(c Container) error { func (s *Store) Add(c Container) error {
s.lock.Lock() s.lock.Lock()
@ -140,7 +140,7 @@ func (s *Store) Add(c Container) error {
return nil return nil
} }
// Get returns the container with specified id. Returns store.ErrNotExist // Get returns the container with specified id. Returns errdefs.ErrNotFound
// if the container doesn't exist. // if the container doesn't exist.
func (s *Store) Get(id string) (Container, error) { func (s *Store) Get(id string) (Container, error) {
s.lock.RLock() s.lock.RLock()
@ -169,6 +169,9 @@ func (s *Store) List() []Container {
return containers return containers
} }
// UpdateContainerStats updates the container specified by ID with the
// stats present in 'newContainerStats'. Returns errdefs.ErrNotFound
// if the container does not exist in the store.
func (s *Store) UpdateContainerStats(id string, newContainerStats *stats.ContainerStats) error { func (s *Store) UpdateContainerStats(id string, newContainerStats *stats.ContainerStats) error {
s.lock.Lock() s.lock.Lock()
defer s.lock.Unlock() defer s.lock.Unlock()

View File

@ -161,7 +161,7 @@ func (s *Store) Resolve(ref string) (string, error) {
// Get gets image metadata by image id. The id can be truncated. // Get gets image metadata by image id. The id can be truncated.
// Returns various validation errors if the image id is invalid. // Returns various validation errors if the image id is invalid.
// Returns storeutil.ErrNotExist if the image doesn't exist. // Returns errdefs.ErrNotFound if the image doesn't exist.
func (s *Store) Get(id string) (Image, error) { func (s *Store) Get(id string) (Image, error) {
return s.store.get(id) return s.store.get(id)
} }

View File

@ -78,7 +78,8 @@ func NewStore(labels *label.Store) *Store {
} }
} }
// Add a sandbox into the store. // Add a sandbox into the store. Returns errdefs.ErrAlreadyExists if the sandbox is
// already stored.
func (s *Store) Add(sb Sandbox) error { func (s *Store) Add(sb Sandbox) error {
s.lock.Lock() s.lock.Lock()
defer s.lock.Unlock() defer s.lock.Unlock()
@ -96,7 +97,7 @@ func (s *Store) Add(sb Sandbox) error {
} }
// Get returns the sandbox with specified id. // Get returns the sandbox with specified id.
// Returns store.ErrNotExist if the sandbox doesn't exist. // Returns errdefs.ErrNotFound if the sandbox doesn't exist.
func (s *Store) Get(id string) (Sandbox, error) { func (s *Store) Get(id string) (Sandbox, error) {
s.lock.RLock() s.lock.RLock()
defer s.lock.RUnlock() defer s.lock.RUnlock()
@ -124,6 +125,9 @@ func (s *Store) List() []Sandbox {
return sandboxes return sandboxes
} }
// UpdateContainerStats updates the sandbox specified by ID with the
// stats present in 'newContainerStats'. Returns errdefs.ErrNotFound
// if the sandbox does not exist in the store.
func (s *Store) UpdateContainerStats(id string, newContainerStats *stats.ContainerStats) error { func (s *Store) UpdateContainerStats(id string, newContainerStats *stats.ContainerStats) error {
s.lock.RLock() s.lock.RLock()
defer s.lock.RUnlock() defer s.lock.RUnlock()

View File

@ -56,7 +56,7 @@ func (s *Store) Add(snapshot Snapshot) {
s.snapshots[snapshot.Key] = snapshot s.snapshots[snapshot.Key] = snapshot
} }
// Get returns the snapshot with specified key. Returns store.ErrNotExist if the // Get returns the snapshot with specified key. Returns errdefs.ErrNotFound if the
// snapshot doesn't exist. // snapshot doesn't exist.
func (s *Store) Get(key string) (Snapshot, error) { func (s *Store) Get(key string) (Snapshot, error) {
s.lock.RLock() s.lock.RLock()