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.

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

deadlock: more solid role change observer (#6415) (#6431) #6445

Merged
merged 5 commits into from
Feb 14, 2020

Conversation

youjiali1995
Copy link
Contributor

Signed-off-by: youjiali1995 [email protected]

What have you changed?

Cherry pick #6415

@youjiali1995 youjiali1995 added the type/cherry-pick Type: PR - Cherry pick label Jan 9, 2020
@youjiali1995 youjiali1995 added this to the v3.1.0-beta.1 milestone Jan 9, 2020
@youjiali1995 youjiali1995 modified the milestones: v3.1.0-beta.1, v3.1.0-beta.2 Jan 9, 2020
@youjiali1995
Copy link
Contributor Author

@AndreMouche @sticnarf @MyonKeminta PTAL

@sticnarf
Copy link
Contributor

Fix the conflicts please. :)

@youjiali1995
Copy link
Contributor Author

/run-all-tests

Copy link
Contributor

@sticnarf sticnarf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@youjiali1995
Copy link
Contributor Author

/run-all-tests

@youjiali1995
Copy link
Contributor Author

@MyonKeminta PTAL

@youjiali1995
Copy link
Contributor Author

/run-all-tests

@youjiali1995 youjiali1995 merged commit d334f90 into tikv:release-3.1 Feb 14, 2020
@youjiali1995 youjiali1995 deleted the cherry-pick-6415-3.1 branch February 14, 2020 04:38
solotzg added a commit to pingcap/tidb-engine-ext that referenced this pull request Feb 15, 2020
* [3.1] external_storage: add S3 support (tikv#6209) (tikv#6536)

* external_storage: add S3 support (tikv#6209)

Signed-off-by: Yi Wu <[email protected]>
Signed-off-by: kennytm <[email protected]>

* lock_manager: more metrics (tikv#6392) (tikv#6422) (tikv#6444)

Signed-off-by: youjiali1995 <[email protected]>

* lock_manager: update default config (tikv#6426) (tikv#6429) (tikv#6446)

Signed-off-by: youjiali1995 <[email protected]>

* Update rocksdb and titan. Update rust-rocksdb url (tikv#6554)

Signed-off-by: Yi Wu <[email protected]>

* raft_client: connect to other stores using peer_address (tikv#5569) (tikv#6491)

* *: pick threads statistics for regions (tikv#6605)

Co-authored-by: jiyingtk <[email protected]>
Co-authored-by: disksing <[email protected]>

* fix test_replica_read::test_read_after_cleanup_range_for_snap (tikv#6493)

Signed-off-by: 5kbpers <[email protected]>

* deadlock: more solid role change observer (tikv#6415) (tikv#6431) (tikv#6445)

Signed-off-by: youjiali1995 <[email protected]>

* raftstore: read index message count metric (tikv#6579) (tikv#6610)

Signed-off-by: 5kbpers <[email protected]>

* raftstore: speed up conf change (tikv#6421) (tikv#6432)

Signed-off-by: Jay Lee <[email protected]>

* raftstore: fix a panic in read index queue (tikv#6609) (tikv#6613)

Signed-off-by: qupeng <[email protected]>

* pick tikv#6414, tikv#6487, tikv#6477 and tikv#6539 to release-3.1 (tikv#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 <[email protected]>

* raftstore: set wait_merge_state to none after resuming pending state (tikv#6621)

Signed-off-by: Liqi Geng <[email protected]>

* raftstore: learner load merge target & fix a merge network recovery bug (tikv#6623)

Signed-off-by: Liqi Geng <[email protected]>

* change merge flow path (tikv#6617)

Signed-off-by: Liqi Geng <[email protected]>

Co-authored-by: kennytm <[email protected]>
Co-authored-by: Lei Zhao <[email protected]>
Co-authored-by: yiwu-arbug <[email protected]>
Co-authored-by: disksing <[email protected]>
Co-authored-by: ShuNing <[email protected]>
Co-authored-by: jiyingtk <[email protected]>
Co-authored-by: pingcap-github-bot <[email protected]>
Co-authored-by: 5kbpers <[email protected]>
Co-authored-by: Jay <[email protected]>
Co-authored-by: gengliqi <[email protected]>
solotzg added a commit to pingcap/tidb-engine-ext that referenced this pull request Feb 21, 2020
* [3.1] external_storage: add S3 support (tikv#6209) (tikv#6536)

* external_storage: add S3 support (tikv#6209)

Signed-off-by: Yi Wu <[email protected]>
Signed-off-by: kennytm <[email protected]>

* lock_manager: more metrics (tikv#6392) (tikv#6422) (tikv#6444)

Signed-off-by: youjiali1995 <[email protected]>

* lock_manager: update default config (tikv#6426) (tikv#6429) (tikv#6446)

Signed-off-by: youjiali1995 <[email protected]>

* Update rocksdb and titan. Update rust-rocksdb url (tikv#6554)

Signed-off-by: Yi Wu <[email protected]>

* raft_client: connect to other stores using peer_address (tikv#5569) (tikv#6491)

* *: pick threads statistics for regions (tikv#6605)

Co-authored-by: jiyingtk <[email protected]>
Co-authored-by: disksing <[email protected]>

* fix test_replica_read::test_read_after_cleanup_range_for_snap (tikv#6493)

Signed-off-by: 5kbpers <[email protected]>

* deadlock: more solid role change observer (tikv#6415) (tikv#6431) (tikv#6445)

Signed-off-by: youjiali1995 <[email protected]>

* raftstore: read index message count metric (tikv#6579) (tikv#6610)

Signed-off-by: 5kbpers <[email protected]>

* raftstore: speed up conf change (tikv#6421) (tikv#6432)

Signed-off-by: Jay Lee <[email protected]>

* raftstore: fix a panic in read index queue (tikv#6609) (tikv#6613)

Signed-off-by: qupeng <[email protected]>

* pick tikv#6414, tikv#6487, tikv#6477 and tikv#6539 to release-3.1 (tikv#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 <[email protected]>

* raftstore: set wait_merge_state to none after resuming pending state (tikv#6621)

Signed-off-by: Liqi Geng <[email protected]>

* raftstore: learner load merge target & fix a merge network recovery bug (tikv#6623)

Signed-off-by: Liqi Geng <[email protected]>

* change merge flow path (tikv#6617)

Signed-off-by: Liqi Geng <[email protected]>

Co-authored-by: kennytm <[email protected]>
Co-authored-by: Lei Zhao <[email protected]>
Co-authored-by: yiwu-arbug <[email protected]>
Co-authored-by: disksing <[email protected]>
Co-authored-by: ShuNing <[email protected]>
Co-authored-by: jiyingtk <[email protected]>
Co-authored-by: pingcap-github-bot <[email protected]>
Co-authored-by: 5kbpers <[email protected]>
Co-authored-by: Jay <[email protected]>
Co-authored-by: gengliqi <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/cherry-pick Type: PR - Cherry pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants