-
Notifications
You must be signed in to change notification settings - Fork 9.8k
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
Conversation
…sion Signed-off-by: Marek Siarkowicz <[email protected]>
for _, op := range report.Watch { | ||
var lastEventRevision int64 = 1 |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
etcd/tests/robustness/traffic/client.go
Line 230 in 6a96ab7
for r := range c.client.Watch(ctx, request.Key, ops...) { |
There was a problem hiding this comment.
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.
etcd/tests/robustness/traffic/kubernetes.go
Lines 67 to 82 in 6a96ab7
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
etcd/tests/robustness/traffic/kubernetes.go
Lines 190 to 197 in 6a96ab7
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) | |
} |
There was a problem hiding this 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.
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 should be followed by a problem and the problem is the validation assumes that client won't request watch with older revision. |
Sorry for that, I rewrote the title couple of times and it turned out not very clear. |
Thanks for updating! |
cc @ahrtr
Part of #16693