Skip to content

Commit

Permalink
Tweaks recovery based on interface changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
slackpad committed Aug 9, 2016
1 parent 1b633e6 commit 379eb5e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions consul/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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)
}

Expand Down

0 comments on commit 379eb5e

Please sign in to comment.