Skip to content

Fix shard weight. Now we can set it to zero #1192

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

Merged
merged 4 commits into from
Nov 22, 2023
Merged

Fix shard weight. Now we can set it to zero #1192

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
858e158
Fix shard weight. Now we can set it to zero
maxistua Jul 13, 2023
7f0cbc5
The weight must be greater than or equal to 0
maxistua Nov 21, 2023
d89dc31
Merge branch '0.23.0' of https://github.com/Altinity/clickhouse-opera…
maxistua Nov 21, 2023
c141032
Merge branch 'Altinity-0.23.0' into shard-weight
maxistua Nov 21, 2023
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
2 changes: 1 addition & 1 deletion pkg/apis/clickhouse.altinity.com/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ type ChiTemplateNames struct {
// TODO unify with ChiReplica based on HostsSet
type ChiShard struct {
Name string `json:"name,omitempty" yaml:"name,omitempty"`
Weight int `json:"weight,omitempty" yaml:"weight,omitempty"`
Weight *int `json:"weight,omitempty" yaml:"weight,omitempty"`
InternalReplication *StringBool `json:"internalReplication,omitempty" yaml:"internalReplication,omitempty"`
Settings *Settings `json:"settings,omitempty" yaml:"settings,omitempty"`
Files *Settings `json:"files,omitempty" yaml:"files,omitempty"`
Expand Down
4 changes: 2 additions & 2 deletions pkg/model/ch_config_generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,8 @@ func (c *ClickHouseConfigGenerator) GetRemoteServers(options *RemoteServersGener
util.Iline(b, 16, "<internal_replication>%s</internal_replication>", shard.InternalReplication)

// <weight>X</weight>
if shard.Weight > 0 {
util.Iline(b, 16, "<weight>%d</weight>", shard.Weight)
if shard.Weight != nil {
util.Iline(b, 16, "<weight>%d</weight>", *shard.Weight)
}

shard.WalkHosts(func(host *chiv1.ChiHost) error {
Expand Down