Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16695 from serathius/watch-validation-revision

Browse Source 
Fix watch validation assuming that client requesting older watch revision
This commit is contained in:
Marek Siarkowicz 2023-10-05 19:17:51 +02:00 committed by GitHub
commit 3f859a626b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 172 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
tests/robustness/validate/validate_test.go
View File

@ -23,6 +23,7 @@ import (
"go.uber.org/zap/zaptest"
"go.etcd.io/etcd/tests/v3/framework/testutils"
"go.etcd.io/etcd/tests/v3/robustness/model"
"go.etcd.io/etcd/tests/v3/robustness/report"
)
@ -47,3 +48,170 @@ func TestValidate(t *testing.T) {
})
}
}
func TestValidateWatch(t *testing.T) {
tcs := []struct {
name string
reports []report.ClientReport
}{
{
name: "earlier event after bookmark in separate request",
reports: []report.ClientReport{
{
Watch: []model.WatchOperation{
{
Request: model.WatchRequest{
Key: "a",
Revision: 100,
},
Responses: []model.WatchResponse{
{
IsProgressNotify: true,
Revision: 100,
},
},
},
{
Request: model.WatchRequest{
Key: "a",
Revision: 99,
},
Responses: []model.WatchResponse{
{
Events: []model.WatchEvent{
{
Event: model.Event{
Type: model.PutOperation,
Key: "a",
Value: model.ValueOrHash{
Value: "99",
},
},
Revision: 99,
},
},
Revision: 100,
},
},
},
},
},
},
},
{
name: "earlier event after in separate request",
reports: []report.ClientReport{
{
Watch: []model.WatchOperation{
{
Request: model.WatchRequest{
Key: "a",
Revision: 100,
},
Responses: []model.WatchResponse{
{
Events: []model.WatchEvent{
{
Event: model.Event{
Type: model.PutOperation,
Key: "a",
Value: model.ValueOrHash{
Value: "100",
},
},
Revision: 100,
},
},
Revision: 100,
},
},
},
{
Request: model.WatchRequest{
Key: "a",
Revision: 99,
},
Responses: []model.WatchResponse{
{
Events: []model.WatchEvent{
{
Event: model.Event{
Type: model.PutOperation,
Key: "a",
Value: model.ValueOrHash{
Value: "99",
},
},
Revision: 99,
},
},
Revision: 100,
},
},
},
},
},
},
},
{
name: "duplicated event between two separate requests",
reports: []report.ClientReport{
{
Watch: []model.WatchOperation{
{
Request: model.WatchRequest{
Key: "a",
Revision: 100,
},
Responses: []model.WatchResponse{
{
Events: []model.WatchEvent{
{
Event: model.Event{
Type: model.PutOperation,
Key: "a",
Value: model.ValueOrHash{
Value: "100",
},
},
Revision: 100,
},
},
Revision: 100,
},
},
},
{
Request: model.WatchRequest{
Key: "a",
Revision: 100,
},
Responses: []model.WatchResponse{
{
Events: []model.WatchEvent{
{
Event: model.Event{
Type: model.PutOperation,
Key: "a",
Value: model.ValueOrHash{
Value: "100",
},
},
Revision: 100,
},
},
Revision: 100,
},
},
},
},
},
},
},
}
for _, tc := range tcs {
t.Run(tc.name, func(t *testing.T) {
validateWatch(t, Config{ExpectRevisionUnique: true}, tc.reports)
})
}
}

9
tests/robustness/validate/watch.go
View File

@ -43,8 +43,8 @@ func validateWatch(t *testing.T, cfg Config, reports []report.ClientReport) []mo
}
func validateBookmarkable(t *testing.T, report report.ClientReport) {
var lastProgressNotifyRevision int64
for _, op := range report.Watch {
var lastProgressNotifyRevision int64
for _, resp := range op.Responses {
for _, event := range resp.Events {
if event.Revision <= lastProgressNotifyRevision {
@ -59,8 +59,8 @@ func validateBookmarkable(t *testing.T, report report.ClientReport) {
}
func validateOrdered(t *testing.T, report report.ClientReport) {
var lastEventRevision int64 = 1
for _, op := range report.Watch {
var lastEventRevision int64 = 1
for _, resp := range op.Responses {
for _, event := range resp.Events {
if event.Revision < lastEventRevision {
@ -73,9 +73,8 @@ func validateOrdered(t *testing.T, report report.ClientReport) {
}
func validateUnique(t *testing.T, expectUniqueRevision bool, report report.ClientReport) {
uniqueOperations := map[any]struct{}{}
for _, op := range report.Watch {
uniqueOperations := map[any]struct{}{}
for _, resp := range op.Responses {
for _, event := range resp.Events {
var key any
@ -97,8 +96,8 @@ func validateUnique(t *testing.T, expectUniqueRevision bool, report report.Clien
}
func validateAtomic(t *testing.T, report report.ClientReport) {
var lastEventRevision int64 = 1
for _, op := range report.Watch {
var lastEventRevision int64 = 1
for _, resp := range op.Responses {
if len(resp.Events) > 0 {
if resp.Events[0].Revision == lastEventRevision {