From eb079960a8be56a827fda7f20f4a8613025b21dc Mon Sep 17 00:00:00 2001 From: James Phillips Date: Sat, 30 Jul 2016 22:33:07 -0700 Subject: [PATCH] Tweaks recovery based on interface changes. --- consul/server.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/consul/server.go b/consul/server.go index 47c870bfebee..e556e864c526 100644 --- a/consul/server.go +++ b/consul/server.go @@ -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) }