server/leader: use the compact revision to watch leader

Signed-off-by: nolouch <nolouch@gmail.com>
tikv · Dec 26, 2018 · b970b14 · b970b14
1 parent b473e5e
commit b970b14
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/integration_test/leader_watch_test.go b/pkg/integration_test/leader_watch_test.go
@@ -25,7 +25,7 @@ import (
 
 func (s *integrationTestSuite) TestWatcher(c *C) {
 	c.Parallel()
-	cluster, err := newTestCluster(1)
+	cluster, err := newTestCluster(1, func(conf *server.Config) { conf.AutoCompactionRetention = "1s" }
 	c.Assert(err, IsNil)
 	defer cluster.Destroy()
 

diff --git a/server/leader.go b/server/leader.go
@@ -314,8 +314,8 @@ func (s *Server) watchLeader(leader *pdpb.Member, revision int64) {
 		for wresp := range rch {
 			// meet compacted error, use current revision.
 			if wresp.CompactRevision != 0 {
-				log.Warnf("required revision %d has been compacted, use current revision", revision)
-				revision = 0
+				revision = wresp.CompactRevision
+				log.Warnf("required revision %d has been compacted, use the compact revision", revision)
 				break
 			}
 			if wresp.Canceled {