cmd/workload: fixed filter test request error handling #31424
Conversation
zsfelfoldi
force-pushed
the
fix-workload-error
branch
from
0aad3af to
7960b3f
Compare
| continue | ||
| } | ||
| processed = append(processed, qt) | ||
| if len(processed)%50 == 0 { | ||
| fmt.Println(" processed:", len(processed), "remaining", len(queries), "failed:", failed, "result mismatch:", mismatch) | ||
| fmt.Println(" processed:", len(processed), "remaining", len(queries), "failed:", failed, "pruned:", pruned, "result mismatch:", mismatch) |
There was a problem hiding this comment.
In general, we should replace Println calls with logging statements throughout this utility. But it's not really a blocker for this specific PR.
| @@ -206,14 +212,10 @@ func (fq *filterQuery) run(client *client, historyPruneBlock *uint64) { | |||
| Addresses: fq.Address, | |||
| Topics: fq.Topics, | |||
| }) | |||
| if err != nil { | |||
| if err = validateHistoryPruneErr(fq.Err, uint64(fq.FromBlock), historyPruneBlock); err == errPrunedHistory { | |||
There was a problem hiding this comment.
crap. big oversight on my part.. whoops
There was a problem hiding this comment.
It was correct at some point. I must have inadvertently broken it before my original PR was merged.
cmd/workload/filtertestgen.go
Outdated
| @@ -71,6 +71,9 @@ func filterGenCmd(ctx *cli.Context) error { | |||
| f.updateFinalizedBlock() | |||
| query := f.newQuery() | |||
| query.run(f.client, nil) | |||
| if query.Err == errPrunedHistory { | |||
| continue | |||
There was a problem hiding this comment.
I think we should error here. It's not really possible to generate meaningful tests on a pruned node.
There was a problem hiding this comment.
I changed it so that the generator exits on errors instead of collecting them into a separate file. It also fails on history pruning errors. Now I think it doesn't make sense to collect errors into a file during generation as the test vectors should be generated in a correct environment. On the other hand it does make sense to collect errors during the performance test so I added it there (the --errors flag was there in filterperf anyways but it didn't do anything until now).
fjl
changed the title
This PR fixes the broken request error handling of the workload filter tests. Until now
validateHistoryPruneErrwas invoked withfq.Erras an input which was always nil and a timeout or http error was reported as a result content mismatch.Also, in case of
errPrunedHistoryit is wrong to return here without setting an error because then it will look like a valid empty result and the check will later fail. So insteaderrPrunedHistoryis always returned now (without printing an error message) and the callers ofrunshould handle this special case (typically ignore silently).