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.

Sign up for GitHub

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

Jump to bottom

Fix max_transaction_time #4135

Merged
merged 8 commits into from
Mar 2, 2023
Merged

Fix max_transaction_time #4135

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b2312c0
Fix max_transaction_time boundaries between transactions
javsanpar Feb 23, 2023
1df86c7
Add test for max_transaction_time
javsanpar Feb 27, 2023
0aa6081
save unneeded fetching of all 'server_status'
javsanpar Feb 27, 2023
66e7f1d
Set active_transactions and transaction_started_at when the query com…
javsanpar Feb 27, 2023
069140f
Automatically start a transaction when running a query
renecannao Feb 27, 2023
bd7f890
Fix informative message in test_max_transaction_time-t
javsanpar Mar 1, 2023
1902eb5
More testing in test_max_transaction_time-t
renecannao Mar 1, 2023
aac20d5
Improving TAP test test_max_transaction_time-t
renecannao Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions lib/MySQL_Session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4968,6 +4968,9 @@ int MySQL_Session::handler() {
if (active_transactions == 0)
transaction_started_at = 0; // reset it
}
} else {
transaction_started_at = thread->curtime;
Copy link
Contributor

Choose a reason for hiding this comment

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

This code means that when a query completes, and active_transactions==0 , transaction_started_at is set to current time even if there is no transaction.

active_transactions = NumActiveTransactions();
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@renecannao what do you think about putting this code inside a function and calling it here and also when rc==-1. This way, ProxySQL also reset the timer when it has an error in the middle of a transaction.

Copy link
Contributor

Choose a reason for hiding this comment

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

Why do you want to reset the timer if there is an error in the middle of a transaction?

I am going back to what I wrote before: [...] at the beginning of the query

handler_rc0_Process_GTID(myconn);
Expand Down Expand Up @@ -5077,12 +5080,6 @@ int MySQL_Session::handler() {
handler_minus1_HandleBackendConnection(myds, myconn);
}
} else {
if (active_transactions == 0) {
active_transactions=NumActiveTransactions();
if (active_transactions > 0) {
transaction_started_at = thread->curtime;
}
}
switch (rc) {
// rc==1 , query is still running
// start sending to frontend if mysql_thread___threshold_resultset_size is reached
Expand Down