mirrors/traefik
1
0
Fork 0
mirror of https://github.com/traefik/traefik.git synced 2025-11-29 14:41:15 +01:00
Code Issues Projects Releases Wiki Activity

Fix datastore corruption on reload due to shrinking config size

Browse Source
This commit is contained in:
Simon Elsbrock 2017-10-30 11:22:04 +01:00 committed by Traefiker
parent 1b2cb53d4f
commit 9b5845f1cb
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cluster/datastore.go
View File

@ -119,19 +119,8 @@ func (d *Datastore) watchChanges() error {
func (d *Datastore) reload() error { func (d *Datastore) reload() error {
log.Debug("Datastore reload") log.Debug("Datastore reload")
d.localLock.Lock() _, err := d.Load()
err := d.kv.LoadConfig(d.meta) return err
if err != nil {
d.localLock.Unlock()
return err
}
err = d.meta.unmarshall()
if err != nil {
d.localLock.Unlock()
return err
}
d.localLock.Unlock()
return nil
} }
// Begin creates a transaction with the KV store. // Begin creates a transaction with the KV store.