set uuid for header to prevent raftstore merging #40
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: Yu Juncen <yujuncen@pingcap.com>
3pointer
reviewed
Apr 7, 2022
src/import/sst_service.rs
Outdated
| // The current `resolved_ts` observer assumes that each batch of request doesn't has | ||
| // two writes to the same key. (Even with 2 different TS). That was true for normal cases | ||
| // because the latches reject concurrency write to keys. However we have bypassed the latch layer :( | ||
| header.set_uuid(uuid::Uuid::new_v4().as_bytes().to_vec()); |
There was a problem hiding this comment.
Will this change affects on ingest cmd?🤔
There was a problem hiding this comment.
🤔 This UUID seems only affects the UUID in the response, and probably won't make things worse.
There was a problem hiding this comment.
Anyway moved it to make_requests
Signed-off-by: Yu Juncen <yujuncen@pingcap.com>
3pointer
approved these changes
Apr 7, 2022
YuJuncen
added a commit
that referenced
this pull request
Apr 26, 2022
…h `br-stream`: - backup-stream: update kvproto to master [by @3pointer] (#48) - Added retry for initial scanning and some metrics [by @YuJuncen] (#47) - Added a new observer type 'pitr' [by @YuJuncen] (#46) - backup-stream: fix some bugs in log backup [by @3pointer] (#45) - Refactor resolver [by @YuJuncen] (#44) - report error to PD server [by @YuJuncen] (#43) - br: support pause/resume stream task [by @joccau] (#42) - Adapt error code for `endpoint::Error` and implement the contextual error [by @YuJuncen] (#41) - set uuid for header to prevent raftstore merging [by @YuJuncen] (#40) - fix the upload part of S3 storage [by @YuJuncen] (#39) - Use min ts of mem lock [by @YuJuncen] (#38) - Fix size leakage and build [by @YuJuncen] (#37) - eliminate the block call in ticker [by @YuJuncen] (#36) - br: support checkSum during stream restore dml kv-events [by @joccau] (#35) - refine br-stream to backup-stream [by @3pointer] (#34) - Allow local storage support directory and partition the log files by table [by @YuJuncen] (#33) - br-stream: added store error to the store [by @YuJuncen] (#32) - Scan on Leader Change [by @YuJuncen] (#31) - use local thread pool for downloading [by @YuJuncen] (#30) - display the error when failed to get snapshot [by @YuJuncen] (#29) - br-stream: remove duplicate entry in apply kv file [by @3pointer] (#28) - don't hold lock during flushing [by @YuJuncen] (#27) - fix listener on follower if region changed [by @YuJuncen] (#26) - Update Service GC Safe Point after Flushing [by @YuJuncen] (#25) - br-stream: use raft router to apply kv files for sst_importer [by @3pointer] (#24) - added integration test framework [by @YuJuncen] (#22) - br-stream: add restore ts to filter data out of range. [by @3pointer] (#20) - *: batch write to temp file [by @YuJuncen] (#19) - omit coping in EventIterator, use write batch for apply [by @YuJuncen] (#18) - br: don't flush to externStorage periodically when have empty kv-record [by @joccau] (#17) - added SegmentMap to replace the BTreeMap [by @YuJuncen] (#16) - added resolved ts related metrics [by @YuJuncen] (#15) - Added resolved timestamp uploading [by @YuJuncen] (#14) - add flush tick [by @3pointer] (#13) - implement stream restore for tikv side. [by @3pointer] (#12) - added metrics [by @YuJuncen] (#11) - update kvproto [by @YuJuncen] (#9) - Initial scanning && Error reporting [by @YuJuncen] (#8) - resolve conflict [by @3pointer] (#7) - br: backup stream: support flushing temp files to ExternalStorage [by @joccau] (#6) - encoder: move encoder to a independent mod [by @3pointer] (#5) - br-stream: don't clone the key & value in encode_event() [by @kennytm] (#4) - br: backup stream: Modify log print format [by @joccau] (#3) - br-stream: reduce the lock of tables; added some metrics [by @YuJuncen] (#2) For more details of these commits, please check the origin feature branch at https://github.com/3pointer/tikv/tree/br-stream. Signed-off-by: Yu Juncen <yujuncen@pingcap.com>
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.
This PR fixed a bug that caused TiKV panic during log restoring because of the duplicated key in the same
RaftCmdRequest.We did make keys distinct when building requests, but the raftstore may merge small requests(see
BatchRaftCmdRequestBuilder). This PR set the UUID field in the header so it won't try to merge two distinct requests.