Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

server/leader: use the compact revision to watch leader #1396

Merged
merged 9 commits into from
Dec 29, 2018
Merged

server/leader: use the compact revision to watch leader #1396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5b04088
server/leader: use the compact revision to watch leader
nolouch Dec 26, 2018
281f8a0
Merge branch 'master' into use-minversion
rleungx Dec 26, 2018
b61e0d6
address comment
nolouch Dec 27, 2018
6e47925
Merge remote-tracking branch 'origin/use-minversion' into use-minversion
nolouch Dec 27, 2018
87f9b8b
Merge remote-tracking branch 'upstream/master' into use-minversion
nolouch Dec 27, 2018
41cbe75
Merge branch 'master' into use-minversion
nolouch Dec 27, 2018
56a1bfd
Merge branch 'master' into use-minversion
nolouch Dec 28, 2018
d3945da
Merge branch 'master' into use-minversion
nolouch Dec 28, 2018
955bcb2
Merge branch 'master' into use-minversion
nolouch Dec 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions server/leader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,14 +310,17 @@ func (s *Server) watchLeader(leader *pdpb.Member, revision int64) {
defer s.cluster.regionSyncer.StopSyncWithLeader()
}

// The revision is the revision of last modification on this key.
// If the revision is compacted, will meet required revision has been compacted error.
// In this case, use the compact revision to re-watch the key.
for {
// gofail: var delayWatcher struct{}
rch := watcher.Watch(ctx, s.getLeaderPath(), clientv3.WithRev(revision))
for wresp := range rch {
// meet compacted error, use current revision.
// meet compacted error, use the compact revision.
if wresp.CompactRevision != 0 {
log.Warnf("required revision %d has been compacted, use current revision", revision)
revision = 0
log.Warnf("required revision %d has been compacted, use the compact revision %d", revision, wresp.CompactRevision)
revision = wresp.CompactRevision
nolouch marked this conversation as resolved.
Show resolved Hide resolved
break
}
if wresp.Canceled {
Expand Down
2 changes: 1 addition & 1 deletion tests/server/leader_watch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

func (s *serverTestSuite) TestWatcher(c *C) {
c.Parallel()
cluster, err := tests.NewTestCluster(1)
cluster, err := tests.NewTestCluster(1, func(conf *server.Config) { conf.AutoCompactionRetention = "1s" })
c.Assert(err, IsNil)
defer cluster.Destroy()

Expand Down