Added workaround for corrupted zip chunks #7243
Merged
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
azhavoro
changed the title
bsekachev
reviewed
Dec 8, 2023
changelog.d/20231208_152516_andrey_workarround_cache_corrupted_data.md
Outdated
Show resolved
Hide resolved
…_data.md Co-authored-by: Boris Sekachev <boris.sekachev@yandex.ru>
bsekachev
requested review from
SpecLad
and removed request for
nmanovic and
Marishka17
…cv/cvat into az/workarround_cache_corrupted_data
SpecLad
requested changes
Dec 8, 2023
cvat/apps/engine/cache.py
Outdated
| item = create_item() | ||
| else: | ||
| # check control sum | ||
| if item[2] != zlib.crc32(item[0].getbuffer()): |
There was a problem hiding this comment.
If CVAT is upgraded from a previous release, it could already have entries in the cache, which will not have element #2, in which case an IndexError will be raised here. You should handle that case.
bsekachev
reviewed
Dec 8, 2023
SpecLad
reviewed
Dec 8, 2023
SpecLad
reviewed
Dec 8, 2023
cvat/apps/engine/cache.py
Outdated
| else: | ||
| # compare checksum | ||
| item_checksum = item[2] if len(item) == 3 else None | ||
| if item_checksum != zlib.crc32(item[0].getbuffer()): |
There was a problem hiding this comment.
item[0] might not be a BytesIO if it's loaded from a cache created by a previous version.
SpecLad
reviewed
Dec 8, 2023
Co-authored-by: Roman Donchenko <roman@cvat.ai>
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #7243 +/- ##
===========================================
- Coverage 81.79% 81.77% -0.02%
===========================================
Files 366 367 +1
Lines 39353 39369 +16
Branches 3642 3644 +2
===========================================
+ Hits 32188 32195 +7
- Misses 7165 7174 +9
|
SpecLad
approved these changes
Dec 8, 2023
Merged
amjadsaadeh
pushed a commit
to amjadsaadeh/cvat
that referenced
this pull request
Dec 14, 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.
Motivation and context
How has this been tested?
Checklist
developbranch(cvat-canvas,
cvat-core,
cvat-data and
cvat-ui)
License
Feel free to contact the maintainers if that's a concern.