Skip to content

client: remove meta revision #10543

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

Merged
ti-chi-bot merged 7 commits into from
Apr 16, 2026
Merged

client: remove meta revision #10543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4ad4e84
client: remove meta revision
bufferflies Apr 1, 2026
daef237
client: reload RM snapshot before watch retry
bufferflies Apr 1, 2026
64409c5
client: sync new RM groups from snapshot reload
bufferflies Apr 1, 2026
daf78dc
Revert "client: sync new RM groups from snapshot reload"
bufferflies Apr 8, 2026
1228f9d
Revert "client: reload RM snapshot before watch retry"
bufferflies Apr 8, 2026
73c78a3
Merge remote-tracking branch 'origin/master' into pr-merge/c3cd07c6-r…
bufferflies Apr 15, 2026
c3793ac
server/cluster: gofmt startup fields
bufferflies Apr 15, 2026
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: 2 additions & 7 deletions client/resource_group/controller/global_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,10 +322,6 @@ func (c *ResourceGroupsController) Start(ctx context.Context) {
stateUpdateTicker.Reset(time.Millisecond * 100)
})

_, metaRevision, err := c.provider.LoadResourceGroups(ctx)
if err != nil {
log.Warn("load resource group revision failed", zap.Error(err))
}
resp, err := c.provider.Get(ctx, []byte(controllerConfigPath))
if err != nil {
log.Warn("load resource group revision failed", zap.Error(err))
Expand All @@ -335,7 +331,7 @@ func (c *ResourceGroupsController) Start(ctx context.Context) {
if !c.ruConfig.isSingleGroupByKeyspace {
// Use WithPrevKV() to get the previous key-value pair when get Delete Event.
prefix := pd.GroupSettingsPathPrefixBytes(c.keyspaceID)
watchMetaChannel, err = c.provider.Watch(ctx, prefix, opt.WithRev(metaRevision), opt.WithPrefix(), opt.WithPrevKV())
watchMetaChannel, err = c.provider.Watch(ctx, prefix, opt.WithPrefix(), opt.WithPrevKV())
Comment thread
bufferflies marked this conversation as resolved.
if err != nil {
Comment thread
bufferflies marked this conversation as resolved.
log.Warn("watch resource group meta failed", zap.Error(err))
}
Expand Down Expand Up @@ -363,7 +359,7 @@ func (c *ResourceGroupsController) Start(ctx context.Context) {
if !c.ruConfig.isSingleGroupByKeyspace && watchMetaChannel == nil {
// Use WithPrevKV() to get the previous key-value pair when get Delete Event.
prefix := pd.GroupSettingsPathPrefixBytes(c.keyspaceID)
watchMetaChannel, err = c.provider.Watch(ctx, prefix, opt.WithRev(metaRevision), opt.WithPrefix(), opt.WithPrevKV())
watchMetaChannel, err = c.provider.Watch(ctx, prefix, opt.WithPrefix(), opt.WithPrevKV())
Comment thread
bufferflies marked this conversation as resolved.
if err != nil {
log.Warn("watch resource group meta failed", zap.Error(err))
watchRetryTimer.Reset(watchRetryInterval)
Expand Down Expand Up @@ -417,7 +413,6 @@ func (c *ResourceGroupsController) Start(ctx context.Context) {
continue
}
for _, item := range resp {
metaRevision = item.Kv.ModRevision
group := &rmpb.ResourceGroup{}
switch item.Type {
case meta_storagepb.Event_PUT:
Expand Down
12 changes: 6 additions & 6 deletions server/cluster/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,13 @@ type RaftCluster struct {
etcdClient *clientv3.Client
httpClient *http.Client

running bool
isKeyspaceGroupEnabled bool
running bool
isKeyspaceGroupEnabled bool
tsoDynamicSwitchingState atomic.Int32
meta *metapb.Cluster
storage storage.Storage
minResolvedTS atomic.Value // Store as uint64
externalTS atomic.Value // Store as uint64
meta *metapb.Cluster
storage storage.Storage
minResolvedTS atomic.Value // Store as uint64
externalTS atomic.Value // Store as uint64

// Keep the previous store limit settings when removing a store.
prevStoreLimit sync.Map // map[uint64]map[storelimit.Type]float64
Expand Down
Loading