20210429 etcdctl v2 backup cindex fix #12906
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
ptabor
force-pushed
the
20210429-etcdctl-v2-backup-cindex-fix
branch
from
79ffd9f
to
7fae99c
Compare
gyuho
reviewed
Apr 29, 2021
gyuho
reviewed
Apr 29, 2021
|
|
||
| consistentIndexKeyName = []byte("consistent_index") | ||
| ConsistentIndexKeyName = []byte("consistent_index") |
There was a problem hiding this comment.
What's the use case for making this public? If we need, can we document this saying this belongs to meta bucket?
There was a problem hiding this comment.
I'm trying to get rid of duplicated independent constants. In particular this one is used in: server/mvcc/kvstore.go for list of ignored keys when 'hash' is being computed, so no easy way to merge it into cindex package.
Parted port of my PR to this one, to make it consistent: 9fb0aa3
Codecov Report
@@ Coverage Diff @@
## master #12906 +/- ##
==========================================
+ Coverage 66.48% 71.19% +4.71%
==========================================
Files 426 430 +4
Lines 33965 34082 +117
==========================================
+ Hits 22581 24266 +1685
+ Misses 9316 7834 -1482
+ Partials 2068 1982 -86
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
…ency Prior to this CL, `ETCDCTL_API=2 etcdctl backup --with-v3` was readacting WAL log (by removal of some entries), but was NOT updating consistent_index in the backend. Also the WAL editing logic was buggy, as it didn't took in consideration the fact that when TERM changes, there can be entries with duplicated indexes in the log. So its NOT sufficient to subtract number of removed entries to get accurate log indexes. The PR replaces removing and shifting of WAL entries with replacing them with an no-op entries. Thanks to this consistent-index references are staying up to date. The PR also: - updates 'verification' logic to check whether consistent_index does not lag befor last snapshot - env-gated execution of verification framework in `etcdctl backup`. Tested with: ``` (./build.sh && cd tests && EXPECT_DEBUG=TRUE 'env' 'go' 'test' '-timeout=300m' 'go.etcd.io/etcd/tests/v3/e2e' -run=TestCtlV2Backup --count=1000 2>&1 | tee TestCtlV2BackupV3.log) ```
In case of failed verification, the server used to keep opened backend (so the file was locked on OS level).
ptabor
force-pushed
the
20210429-etcdctl-v2-backup-cindex-fix
branch
from
9fb0aa3
to
e90504f
Compare
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.
Fix
ETCDCTL_API=2 etcdctl backup --with-v3consistent index consistencyPrior to this CL,
ETCDCTL_API=2 etcdctl backup --with-v3was readacting WAL log(by removal of some entries), but was NOT updating consistent_index in the backend.
Also the WAL editing logic was buggy, as it didn't took in consideration the fact
that when TERM changes, there can be entries with duplicated indexes in
the log. So its NOT sufficient to subtract number of removed entries to
get accurate log indexes.
The PR replaces removing and shifting of WAL entries with replacing them with an no-op entries.
Thanks to this consistent-index references are staying up to date.
The PR also:
etcdctl backup.Tested with: