manager/state/raft/storage: TestReadRepairWAL: fix for etcd v3.5.5#3095
Merged
thaJeztah merged 1 commit intomoby:masterfrom Nov 23, 2022
Merged
manager/state/raft/storage: TestReadRepairWAL: fix for etcd v3.5.5#3095thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah merged 1 commit intomoby:masterfrom
Conversation
etcd server v3.5.5 includes a fix to prevent the reader from trying to read more data than available in the file, introduced in etcd-io/etcd@621cd7b > restrict the max size of each WAL entry to the remaining size of the file > > Currently the max size of each WAL entry is hard coded as 10MB. If users > set a value > 10MB for the flag --max-request-bytes, then etcd may run > into a situation that it successfully processes a big request, but fails > to decode it when replaying the WAL file on startup. > > On the other hand, we can't just remove the limitation, because if a > WAL entry is somehow corrupted, and its recByte is a huge value, then > etcd may run out of memory. So the solution is to restrict the max size > of each WAL entry as a dynamic value, which is the remaining size of > the WAL file. This patch updates the test to have sufficient data available in the corrupted file to perform recovery. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
commented
Nov 23, 2022
Comment on lines
-234
to
-239
| fName := filepath.Join(tempdir, files[0].Name()) | ||
| fileContents, err := os.ReadFile(fName) | ||
| require.NoError(t, err) | ||
| info, err := files[0].Info() | ||
| require.NoError(t, err) | ||
| require.NoError(t, os.WriteFile(fName, fileContents[:200], info.Mode())) |
Member
Author
There was a problem hiding this comment.
Replaced this with os.Truncate() below, which was shorter, and more descriptive what we're doing 😅
| // | ||
| // - https://github.com/etcd-io/etcd/commit/621cd7b9e5aa2ccf634b555e4ebe0037b8975066 / https://github.com/etcd-io/etcd/pull/14127 (backport of https://github.com/etcd-io/etcd/pull/14122) | ||
| // - https://github.com/etcd-io/etcd/issues/14114 | ||
| require.NoError(t, os.Truncate(filepath.Join(tempdir, files[0].Name()), 300)) |
Member
Author
There was a problem hiding this comment.
Effectively the fix is s/200/300/
Member
Author
|
Flaky test? (passing locally) |
Codecov Report
@@ Coverage Diff @@
## master #3095 +/- ##
=========================================
Coverage ? 62.10%
=========================================
Files ? 153
Lines ? 24177
Branches ? 0
=========================================
Hits ? 15014
Misses ? 7613
Partials ? 1550 Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
Member
Author
rumpl
approved these changes
Nov 23, 2022
Member
Author
|
Bringing this one in as well, but happy to do follow-ups if there's issues with the change in the test, or if we need to improve this functionality (/cc @dperny) |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
etcd server v3.5.5 includes a fix to prevent the reader from trying to read more data than available in the file, introduced in etcd-io/etcd@621cd7b
This patch updates the test to have sufficient data available in the corrupted file to perform recovery.