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

config: enable cross table merge by default #3129

Merged
merged 4 commits into from
Nov 6, 2020
Merged

config: enable cross table merge by default #3129

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
666e4df
enable merge cross table by default
rleungx Nov 2, 2020
de57ec6
Merge branch 'master' into enable-cross-table-merge
ti-srebot Nov 2, 2020
f03bbae
Merge branch 'master' into enable-cross-table-merge
rleungx Nov 3, 2020
943fc5d
Merge branch 'master' into enable-cross-table-merge
HunDunDM Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions server/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,7 @@ const (
defaultLeaderSchedulePolicy = "count"
defaultStoreLimitMode = "manual"
defaultEnableJointConsensus = true
defaultEnableCrossTableMerge = true
)

func (c *ScheduleConfig) adjust(meta *configMetaData) error {
Expand Down Expand Up @@ -802,6 +803,9 @@ func (c *ScheduleConfig) adjust(meta *configMetaData) error {
if !meta.IsDefined("enable-joint-consensus") {
c.EnableJointConsensus = defaultEnableJointConsensus
}
if !meta.IsDefined("enable-cross-table-merge") {
c.EnableCrossTableMerge = defaultEnableCrossTableMerge
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we let the merge is enabled if an upgrade from 4.0?

Copy link
Member Author

Choose a reason for hiding this comment

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

It depends, do you think it's better?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think some paraments should be adjusted to a better default value, even it is upgraded from old version. such as tolerance-ratio

Copy link
Member Author

Choose a reason for hiding this comment

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

make sense, but maybe in another PR?

}
adjustFloat64(&c.LowSpaceRatio, defaultLowSpaceRatio)
adjustFloat64(&c.HighSpaceRatio, defaultHighSpaceRatio)

Expand Down