Fix error message check on query timeout #16827
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Manan Gupta <[email protected]>
GuptaManan100
requested review from
harshit-gangal,
systay and
frouioui
as code owners
Review ChecklistHello reviewers! 👋 Please follow this checklist when reviewing this Pull Request. General
Tests
Documentation
New flags
If a workflow is added or modified:
Backward compatibility
|
vitess-bot
bot
added
NeedsBackportReason
GuptaManan100
removed
NeedsDescriptionUpdate
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #16827 +/- ##
==========================================
- Coverage 69.51% 69.50% -0.01%
==========================================
Files 1568 1569 +1
Lines 202426 202517 +91
==========================================
+ Hits 140717 140763 +46
- Misses 61709 61754 +45 ☔ View full report in Codecov by Sentry. |
Comment on lines
-197
to
+209
| assert.ErrorContains(t, err, "DeadlineExceeded desc = context deadline exceeded (errno 1317) (sqlstate 70100)") | ||
| // We can get two different error messages based on whether it is coming from vttablet or vtgate | ||
| if !strings.Contains(err.Error(), "Query execution was interrupted, maximum statement execution time exceeded") { | ||
| assert.ErrorContains(t, err, "DeadlineExceeded desc = context deadline exceeded (errno 1317) (sqlstate 70100)") | ||
| } | ||
|
|
||
| // Let's also check that setting the session variable also works. | ||
| utils.Exec(t, mcmp.VtConn, "set query_timeout=4000") | ||
| _, err = utils.ExecAllowError(t, mcmp.VtConn, "select sleep(u2.id2), u1.id2 from t1 u1 join t1 u2 where u1.id2 = u2.id1") | ||
| assert.Error(t, err) | ||
| assert.ErrorContains(t, err, "DeadlineExceeded desc = context deadline exceeded (errno 1317) (sqlstate 70100)") | ||
| if !strings.Contains(err.Error(), "Query execution was interrupted, maximum statement execution time exceeded") { | ||
| assert.ErrorContains(t, err, "DeadlineExceeded desc = context deadline exceeded (errno 1317) (sqlstate 70100)") | ||
| } |
There was a problem hiding this comment.
If you look at other test in the file.
we just check the deadline error and error code. which is same in both the error messages
TestQueryTimeoutWithTables:
assert.ErrorContains(t, err, "context deadline exceeded")
assert.ErrorContains(t, err, "(errno 1317) (sqlstate 70100)")
harshit-gangal
approved these changes
Sep 24, 2024
systay
approved these changes
Sep 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR fixes the error messages check in the test
TestOverallQueryTimeout. This is a test we introduced recently and noticed that there are actually two possible error messages that can be received based on whether it was vttablet or vtgate that sent it.This PR fixes the test expectations to align with this.
Related Issue(s)
Checklist
Deployment Notes