Browse Source

Merge pull request #10838 from tbg/unbreak

quorum: fix vet failure
Tobias Grieger 6 years ago
parent
commit
5d30dccdaa
1 changed files with 4 additions and 4 deletions
  1. 4 4
      raft/quorum/datadriven_test.go

+ 4 - 4
raft/quorum/datadriven_test.go

@@ -195,14 +195,14 @@ func TestDataDriven(t *testing.T) {
 						return ll
 						return ll
 					}
 					}
 					for id := range c {
 					for id := range c {
-						idx, _ := l.AckedIndex(id)
-						if idx > idx && idx > 0 {
+						iidx, _ := l.AckedIndex(id)
+						if idx > iidx && iidx > 0 {
 							// If the committed index was definitely above the currently
 							// If the committed index was definitely above the currently
 							// inspected idx, the result shouldn't change if we lower it
 							// inspected idx, the result shouldn't change if we lower it
 							// further.
 							// further.
-							lo := overlay(c, l, id, idx-1)
+							lo := overlay(c, l, id, iidx-1)
 							if aIdx := c.CommittedIndex(lo); aIdx != idx {
 							if aIdx := c.CommittedIndex(lo); aIdx != idx {
-								fmt.Fprintf(&buf, "%s <-- overlaying %d->%d", aIdx, id, idx)
+								fmt.Fprintf(&buf, "%s <-- overlaying %d->%d", aIdx, id, iidx)
 							}
 							}
 							lo = overlay(c, l, id, 0)
 							lo = overlay(c, l, id, 0)
 							if aIdx := c.CommittedIndex(lo); aIdx != idx {
 							if aIdx := c.CommittedIndex(lo); aIdx != idx {