From 3e1ebaeecfdaefa579eb64588a8f21f731bf8e18 Mon Sep 17 00:00:00 2001 From: Bin Shi <39923490+binshi-bing@users.noreply.github.com> Date: Thu, 20 Apr 2023 20:45:20 -0700 Subject: [PATCH] keyspace, tso: fix next revision to watch after watch/Get/RangeScan (#6353) ref tikv/pd#6232 The next revision to watch should always be Header.Revision + 1 where header is response header of watch/Get/RangeScan Signed-off-by: Bin Shi --- pkg/keyspace/tso_keyspace_group.go | 2 +- pkg/tso/keyspace_group_manager.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/keyspace/tso_keyspace_group.go b/pkg/keyspace/tso_keyspace_group.go index bb0f413fb2d..ce9e3005bbc 100644 --- a/pkg/keyspace/tso_keyspace_group.go +++ b/pkg/keyspace/tso_keyspace_group.go @@ -164,7 +164,7 @@ func (m *GroupManager) startWatchLoop() { } resp, err = etcdutil.EtcdKVGet(m.client, m.tsoServiceKey, clientv3.WithRange(m.tsoServiceEndKey)) if err == nil { - revision = resp.Header.Revision + revision = resp.Header.Revision + 1 for _, item := range resp.Kvs { s := &discovery.ServiceRegistryEntry{} if err := json.Unmarshal(item.Value, s); err != nil { diff --git a/pkg/tso/keyspace_group_manager.go b/pkg/tso/keyspace_group_manager.go index 49529998ba9..bc329f5552f 100644 --- a/pkg/tso/keyspace_group_manager.go +++ b/pkg/tso/keyspace_group_manager.go @@ -415,7 +415,7 @@ func (kgm *KeyspaceGroupManager) loadKeyspaceGroups( } if resp.Header != nil { - revision = resp.Header.Revision + revision = resp.Header.Revision + 1 } return revision, kgs, resp.More, nil