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

server/balancer: guarantee replicas are safe if possible #473

Merged
merged 6 commits into from
Jan 21, 2017
Merged

server/balancer: guarantee replicas are safe if possible #473

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e8c0c95
server: guarantee replicas are safe when possible
huachaohuang Jan 9, 2017
27632f3
add replication tests
huachaohuang Jan 11, 2017
f25fd88
add tests
huachaohuang Jan 11, 2017
443d700
server/replication: remove allow-unsafe-balance option
huachaohuang Jan 13, 2017
2a3ed41
server/replication: simplify score
huachaohuang Jan 13, 2017
c93f7d3
check location labels before putting store
huachaohuang Jan 19, 2017
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
19 changes: 14 additions & 5 deletions server/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,15 +325,24 @@ func (c *RaftCluster) putStore(store *metapb.Store) error {
}
}

// Store exists, update store meta.
if s := cluster.getStore(store.GetId()); s != nil {
s := cluster.getStore(store.GetId())
if s == nil {
// Add a new store.
s = newStoreInfo(store)
} else {
// Update an existed store.
s.Address = store.Address
s.Labels = store.Labels
return cluster.putStore(s)
}

// Store does not exist, add a new store.
return cluster.putStore(newStoreInfo(store))
// Check location labels.
for _, k := range c.s.cfg.Replication.LocationLabels {
if v := s.getLabelValue(k); len(v) == 0 {
Copy link
Contributor

Choose a reason for hiding this comment

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

should check before update the store info?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's ok, it is a clone.

Copy link
Contributor

Choose a reason for hiding this comment

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

LGTM

return errors.Errorf("missing location label %q in store %v", k, s)
}
}

return cluster.putStore(s)
}

// RemoveStore marks a store as offline in cluster.
Expand Down
2 changes: 1 addition & 1 deletion server/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func (s *storeInfo) getLocationID(keys []string) string {
if len(v) == 0 {
return ""
Copy link
Contributor

Choose a reason for hiding this comment

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

no need to consider the latter key which value is not empty?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think we should support missing label cases, it's error prone and hard to explain the behavior.
If we want to update the configurations or labels, we can just turn off the balance temporarily.

Copy link
Contributor

Choose a reason for hiding this comment

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

So we should forbid the missing label in TiKV, and if TiKV reports the label without a value, we should log an error and don't add this label too.

}
id += s.getLabelValue(k)
id += v
}
return id
}
Expand Down