status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tweaks recovery based on interface changes.

This commit is contained in:
James Phillips 2016-07-30 22:33:07 -07:00
parent 1b633e66c5
commit 379eb5ecd0
No known key found for this signature in database
GPG Key ID: 77183E682AC5FC11
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
consul/server.go
View File

@ -458,7 +458,7 @@ Please see https://www.consul.io/docs/guides/outage.html for more information.
return fmt.Errorf("recovery failed to make temp FSM: %v", err)
}
if err := raft.RecoverCluster(s.config.RaftConfig, tmpFsm,
log, stable, snap, configuration); err != nil {
log, stable, snap, trans, configuration); err != nil {
return fmt.Errorf("recovery failed: %v", err)
}
if err := os.Remove(peersFile); err != nil {
@ -485,7 +485,7 @@ Please see https://www.consul.io/docs/guides/outage.html for more information.
return fmt.Errorf("cleanup failed to make temp FSM: %v", err)
}
if err := raft.RecoverCluster(s.config.RaftConfig, tmpFsm,
log, stable, snap, raft.Configuration{}); err != nil {
log, stable, snap, trans, raft.Configuration{}); err != nil {
return fmt.Errorf("recovery failed: %v", err)
}