[24.0 backport] daemon/list: Refactor refreshImage and make readConfig return errdefs
#46095
+75
−17
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit 7379d18) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Check for generic `errdefs.NotFound` rather than specific error helper struct when checking if the error is caused by the image not being present. It still works for `ErrImageDoesNotExist` because it implements the NotFound errdefs interface too. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit 5a39bee) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
vvoland
added
area/images
kind/bugfix
Add context comments and make it a bit more readable. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit 68991ae) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
refreshImage is the only function used as a reducer and it doesn't use the `filter *listContext`. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit 13180c1) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
vvoland
force-pushed
the
c8d-refreshimage-refactor-24
branch
from
e131cf0
to
45ba926
Compare
rumpl
approved these changes
Jul 28, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
readConfigreturn errdefs #46081- What I did
readConfigtranslate containerd NotFound into errdefs.NotFoundErrImageDoesNotExistcheck inrefreshImageintoerrdefs.IsNotFoundcheck (we forgot to upstream this: daemon: Replace ErrImageDoesNotExist typecheck rumpl/moby#130)refreshImage- because the whole code was confusing. I added some comments and restructured it a bit.- How I did it
See commits.
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)