Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

no panic when check magic_number or version fail #11

Merged
merged 27 commits into from
Feb 18, 2020
Merged

no panic when check magic_number or version fail #11

merged 27 commits into from
Feb 18, 2020

Conversation

solotzg
Copy link
Collaborator

@solotzg solotzg commented Feb 18, 2020

No description provided.

kennytm and others added 27 commits February 8, 2020 23:22
@kennytm
[3.1] external_storage: add S3 support (tikv#6209) (tikv#6536)
c1fa994 
* external_storage: add S3 support (tikv#6209)

Signed-off-by: Yi Wu <yiwu@pingcap.com>
Signed-off-by: kennytm <kennytm@gmail.com>
@youjiali1995
lock_manager: more metrics (tikv#6392) (tikv#6422) (tikv#6444)
647daec 
Signed-off-by: youjiali1995 <zlwgx1023@gmail.com>
@youjiali1995
lock_manager: update default config (tikv#6426) (tikv#6429) (tikv#6446)
1de4312 
Signed-off-by: youjiali1995 <zlwgx1023@gmail.com>
Update rocksdb and titan. Update rust-rocksdb url (tikv#6554)
62b5d65 
Signed-off-by: Yi Wu <yiwu@pingcap.com>
@disksing
raft_client: connect to other stores using peer_address (tikv#5569) (t…
52a7cae 
…ikv#6491)
@nolouch @jiyingtk @disksing
*: pick threads statistics for regions (tikv#6605)
e190308 
Co-authored-by: jiyingtk <1039793452@qq.com>
Co-authored-by: disksing <i@disksing.com>
@sre-bot
fix test_replica_read::test_read_after_cleanup_range_for_snap (tikv#6493
dee5c75 
)

Signed-off-by: 5kbpers <tangminghua@pingcap.com>
@youjiali1995
deadlock: more solid role change observer (tikv#6415) (tikv#6431) (ti…
d334f90 
…kv#6445)

Signed-off-by: youjiali1995 <zlwgx1023@gmail.com>
@5kbpers
raftstore: read index message count metric (tikv#6579) (tikv#6610)
2f02ee7 
Signed-off-by: 5kbpers <tangminghua@pingcap.com>
@BusyJay
raftstore: speed up conf change (tikv#6421) (tikv#6432)
5ef9d0b 
Signed-off-by: Jay Lee <busyjaylee@gmail.com>
@sre-bot
raftstore: fix a panic in read index queue (tikv#6609) (tikv#6613)
6068bf5 
Signed-off-by: qupeng <qupeng@pingcap.com>
@BusyJay
pick tikv#6414, tikv#6487, tikv#6477 and tikv#6539 to release-3.1 (ti…
2600f9a 
…kv#6564)

* raftstore: extract batch system (tikv#6414)
* apply: support yield (tikv#6487)
* batch-system: add benchmark (tikv#6477)
* Introduce pre transfer leader (tikv#6539)
Signed-off-by: Jay Lee <BusyJayLee@gmail.com>
@gengliqi
raftstore: set wait_merge_state to none after resuming pending state (t…
ec49dfb 
…ikv#6621)

Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
@sre-bot @solotzg
raftstore: fix a panic in read index queue (tikv#6609) (tikv#6613)
2a093e4 
Signed-off-by: qupeng <qupeng@pingcap.com>
@solotzg
Merge remote-tracking branch 'pingcap/release-3.1' into __tiflash-pro…
9cb1e13 
…xy-master

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	src/raftstore/store/fsm/apply.rs
#	src/raftstore/store/worker/region.rs
#	src/server/resolve.rs
@solotzg
update cargo.lock
2374a83
@gengliqi
raftstore: learner load merge target & fix a merge network recovery b…
f5bd0d9 
…ug (tikv#6623)

Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
@solotzg
1
ae7acda
@solotzg
Merge remote-tracking branch 'pingcap/release-3.1' into __tiflash-pro…
3f6df2b 
…xy-master

# Conflicts:
#	src/raftstore/store/fsm/peer.rs
#	src/raftstore/store/fsm/store.rs
#	src/raftstore/store/peer.rs
@solotzg
fix
914dd2a
@solotzg
1
054b2e6
@solotzg
Merge remote-tracking branch 'origin/tiflash-proxy-master' into __tif…
c9a2bc4 
…lash-proxy-master

# Conflicts:
#	Cargo.lock
@gengliqi
change merge flow path (tikv#6617)
d1f9d48 
Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
wip
e2dcc1f
@solotzg
Merge remote-tracking branch 'pingcap/release-3.1' into __tiflash-pro…
826d907 
…xy-master
@solotzg
Merge remote-tracking branch 'origin/tiflash-proxy-master' into __tif…
2f0c379 
…lash-proxy-master
@solotzg
no panic when check magic_number or version fail
c768a8c
@solotzg solotzg merged commit ccc914e into tiflash-proxy-master Feb 18, 2020
@solotzg solotzg deleted the __test branch February 18, 2020 04:20
solotzg added a commit that referenced this pull request Feb 21, 2020
@solotzg
Fix: no panic when check magic_number or version fail (#11)
479c6c5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
9 participants
@solotzg @kennytm @youjiali1995 @disksing @nolouch @sre-bot @5kbpers @BusyJay @gengliqi