Skip to content

Commit

Permalink
Don't use activeContext for standby/leader cancelation (#4919)
Browse files Browse the repository at this point in the history
Move cancelation to after cleanup

Fixes GH-4915
  • Loading branch information
sethvargo authored and jefferai committed Jul 13, 2018
1 parent 1ce2513 commit be84781
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion vault/ha.go
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ func (c *Core) cleanLeaderPrefix(ctx context.Context, uuid string, leaderLostCh
// clearLeader is used to clear our leadership entry
func (c *Core) clearLeader(uuid string) error {
key := coreLeaderPrefix + uuid
err := c.barrier.Delete(c.activeContext, key)
err := c.barrier.Delete(context.Background(), key)

// Advertise ourselves as a standby
sd, ok := c.ha.(physical.ServiceDiscovery)
Expand Down

0 comments on commit be84781

Please sign in to comment.