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.

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

Fix watch validation assuming that client not requesting older watch revision #16695

Merged
merged 1 commit into from
Oct 5, 2023

Conversation

serathius
Copy link
Member

@serathius serathius commented Oct 5, 2023

cc @ahrtr

Part of #16693

for _, op := range report.Watch {
var lastEventRevision int64 = 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why change this. Aren't watch responses globally ordered for each client? In your test case TestValidateWatch, there is no clientId; do you intentionally verify that different clients may request an older revision?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, we expect client to get increasing revisions due to either fact that watch doesn't break or that users will usually want to reestablish watches on the following revision. However, from etcd perspective, those are independent watch request each providing its own revision to start watching from. It's not invalid that single client can start watching from rev 200, and after that decide to establish new watch from rev 100.

As in case #16693, for some unknown reason etcd went back from revision 301 to 192 in the KV store. So from clients perspective it behaved correctly, after watch was broken it established the new watch on revision 192, even though it has previously seen revision 301.

Goal of this issue is to remove assumption about sensible client behavior (not going back on watch), and just validate the watch responses. This should increase readability of robustness test reports as client misbehavior caused by etcd linearizability issue will no longer also report invalid watch.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

etcd went back from revision 301 to 192 in the KV store. So from clients perspective it behaved correctly, after watch was broken it established the new watch on revision 192, even though it has previously seen revision 301

It's true. But in your test case, there is no watch establishment, so the revision shouldn't go back?

The test change is OK. But I'd suggest you to have a deep dive to figure out why the revision go back. Let me know if you need my assistance or I misunderstood anything.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for r := range c.client.Watch(ctx, request.Key, ops...) {

Copy link
Member Author

@serathius serathius Oct 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's true. But in your test case, there is no watch establishment, so the revision shouldn't go back?

There is, but only in Kubernetes traffic. It runs a ListWatch loop with 100 ms timeout.

Look consists of Read and Watch from the Read revision.

g.Go(func() error {
for {
select {
case <-ctx.Done():
return ctx.Err()
case <-finish:
return nil
default:
}
rev, err := t.Read(ctx, kc, s, limiter, keyPrefix)
if err != nil {
continue
}
t.Watch(ctx, kc, s, limiter, keyPrefix, rev+1)
}
})

And watch breaks every 100ms to simulate client loosing connection

func (t kubernetesTraffic) Watch(ctx context.Context, kc *kubernetesClient, s *storage, limiter *rate.Limiter, keyPrefix string, revision int64) {
watchCtx, cancel := context.WithTimeout(ctx, WatchTimeout)
defer cancel()
for e := range kc.client.Watch(watchCtx, keyPrefix, revision, true, true) {
s.Update(e)
}
limiter.Wait(ctx)
}

Copy link
Member

@ahrtr ahrtr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let the PR go for now.

Please revisit https://github.com/etcd-io/etcd/pull/16695/files#r1347740431 later.

@serathius serathius merged commit 3f859a6 into etcd-io:main Oct 5, 2023
@chaochn47
Copy link
Member

chaochn47 commented Oct 5, 2023

It is difficult for me to understand the title until fully read the PR comment. Thanks for the discussion.

The PR title can be updated to Fix watch validation assuming that client not requesting older watch revision.

Fix should be followed by a problem and the problem is the validation assumes that client won't request watch with older revision.

@serathius serathius changed the title Fix watch validation assuming that client requesting older watch revision Fix watch validation assuming that client not requesting older watch revision Oct 5, 2023
@serathius
Copy link
Member Author

Sorry for that, I rewrote the title couple of times and it turned out not very clear.

@chaochn47
Copy link
Member

Thanks for updating!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants