best-practice: update massive regions to match 4.0 (#2595)#2969
Merged
ti-srebot merged 3 commits intoJun 22, 2020
Conversation
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
5 tasks
ti-srebot
added
special-week
ti-srebot
requested review from
Connor1996,
TomShawn,
kissmydb,
miaoqingli and
zhangjinpeng87
Contributor
Author
|
@BusyJay please accept the invitation then you can push to the cherry-pick pull requests. |
yikeke
suggested changes
Jun 19, 2020
Comment on lines
+72
to
+76
| <<<<<<< HEAD | ||
| Up to TiDB v3.1.0-beta.1, Hibernate Region is still an experimental feature, which is enabled by default in [TiKV master](https://github.com/tikv/tikv/tree/master). You can enable this feature according to your needs. For the configuration of Hibernate Region, refer to [Configure Hibernate Region](https://github.com/tikv/tikv/blob/master/docs/reference/configuration/raftstore-config.md#hibernate-region). | ||
| ======= | ||
| Hibernate Region is enabled by default in [TiKV master](https://github.com/tikv/tikv/tree/master). You can enable this feature according to your needs. For the configuration of Hibernate Region, refer to [Configure Hibernate Region](https://github.com/tikv/tikv/blob/master/docs/reference/configuration/raftstore-config.md#hibernate-region). | ||
| >>>>>>> 3e28802... best-practice: update massive regions to match 4.0 (#2595) |
Contributor
Author
|
@yikeke, @Connor1996, @zhangjinpeng1987, @kissmydb, @TomShawn, @miaoqingli, PTAL. |
Contributor
Author
|
@ti-srebot, please update your pull request. |
Signed-off-by: Jay Lee <BusyJayLee@gmail.com>
Contributor
|
/merge |
ti-srebot
added
the
status/can-merge
Contributor
Author
|
/run-all-tests |
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.
cherry-pick #2595 to release-3.1
What is changed, added or deleted? (Required)
Update massive regions to match 4.0.
Which TiDB version(s) do your changes apply to? (Required)
What is the related PR or file link(s)?