a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

datamanager: clean etcd data before reinitialization

This commit is contained in:
Simone Gotti 2019-07-17 17:05:35 +02:00
parent 8fbb9fdcbe
commit 512162bf98
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
internal/datamanager/wal.go
View File

@ -962,7 +962,26 @@ func (d *DataManager) InitEtcd(ctx context.Context) error {
}
defer func() { _ = m.Unlock(ctx) }()
// Create changegroup min revision if it doesn't exists
mustInit := false
_, err = d.e.Get(ctx, etcdWalsDataKey, 0)
if err != nil {
if err != etcd.ErrKeyNotFound {
return err
}
mustInit = true
}
if mustInit {
d.log.Infof("no data found in etcd, initializing")
// delete all wals from etcd
if err := d.deleteEtcd(ctx); err != nil {
return err
}
}
// Always create changegroup min revision if it doesn't exists
cmp := []etcdclientv3.Cmp{}
then := []etcdclientv3.Op{}
@ -973,16 +992,10 @@ func (d *DataManager) InitEtcd(ctx context.Context) error {
return etcd.FromEtcdError(err)
}
_, err = d.e.Get(ctx, etcdWalsDataKey, 0)
if err != nil && err != etcd.ErrKeyNotFound {
return err
}
if err == nil {
if !mustInit {
return nil
}
d.log.Infof("no data found in etcd, initializing")
// walsdata not found in etcd
// if there're some wals in the objectstorage this means etcd has been reset.
@ -1055,7 +1068,7 @@ func (d *DataManager) InitEtcd(ctx context.Context) error {
return etcd.FromEtcdError(err)
}
if !tresp.Succeeded {
return errors.Errorf("failed to sync etcd: waldata already written")
return errors.Errorf("failed to sync etcd: walsdata already written")
}
return nil