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

Track transaction time #798

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Track transaction time #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 13 additions & 9 deletions src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,6 +1091,7 @@ where
//
// If the client is in session mode, no more custom protocol
// commands will be accepted.
let transaction_start = Instant::now();
loop {
let message = match initial_message {
None => {
Expand Down Expand Up @@ -1204,9 +1205,10 @@ where
if !server.in_transaction() {
// Report transaction executed statistics.
self.stats.transaction();
server
.stats()
.transaction(self.server_parameters.get_application_name());
server.stats().transaction(
Instant::now().duration_since(transaction_start).as_millis() as u64,
self.server_parameters.get_application_name(),
);

// Release server back to the pool if we are in transaction mode.
// If we are in session mode, we keep the server until the client disconnects.
Expand Down Expand Up @@ -1460,9 +1462,10 @@ where

if !server.in_transaction() {
self.stats.transaction();
server
.stats()
.transaction(self.server_parameters.get_application_name());
server.stats().transaction(
Instant::now().duration_since(transaction_start).as_millis() as u64,
self.server_parameters.get_application_name(),
);

// Release server back to the pool if we are in transaction mode.
// If we are in session mode, we keep the server until the client disconnects.
Expand Down Expand Up @@ -1511,9 +1514,10 @@ where

if !server.in_transaction() {
self.stats.transaction();
server
.stats()
.transaction(self.server_parameters.get_application_name());
server.stats().transaction(
Instant::now().duration_since(transaction_start).as_millis() as u64,
self.server_parameters.get_application_name(),
);

// Release server back to the pool if we are in transaction mode.
// If we are in session mode, we keep the server until the client disconnects.
Expand Down
3 changes: 2 additions & 1 deletion src/stats/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,12 @@ impl ServerStats {
/// we report each individual queries outside a transaction as a transaction
/// We only count the initial BEGIN as a transaction, all queries within do not
/// count as transactions
pub fn transaction(&self, application_name: &str) {
pub fn transaction(&self, milliseconds: u64, application_name: &str) {
self.set_application(application_name.to_string());

self.transaction_count.fetch_add(1, Ordering::Relaxed);
self.address.stats.xact_count_add();
self.address.stats.xact_time_add(milliseconds);
}

/// Report data sent to a server
Expand Down
43 changes: 38 additions & 5 deletions tests/ruby/stats_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
end

describe "SHOW STATS" do
context "clients connect and make one query" do
it "updates *_query_time and *_wait_time" do
context "clients connect and issue queries" do
it "updates {avg,total}_{query,xact,wait}_{time,count}" do
connections = Array.new(3) { PG::connect("#{pgcat_conn_str}?application_name=one_query") }
connections.each do |c|
Thread.new { c.async_exec("SELECT pg_sleep(0.25)") }
Thread.new { c.transaction { |t| t.async_exec("SELECT pg_sleep(0.25);") } }
end
sleep(1)
connections.map(&:close)
Expand All @@ -25,9 +25,42 @@
sleep(15.5)
admin_conn = PG::connect(processes.pgcat.admin_connection_string)
results = admin_conn.async_exec("SHOW STATS")[0]
admin_conn.close

# BEGIN, SELECT, COMMIT for each connection
expect(results["total_query_count"].to_i).to eq(9)
expect(results["total_query_time"].to_i).to be_within(200).of(750)
expect(results["avg_query_time"].to_i).to be_within(50).of(250)
expect(results["avg_query_time"].to_i).to be_within(15).of(250.0 / 3)

# Single transaction for each connection
expect(results["total_xact_count"].to_i).to eq(3)
expect(results["total_xact_time"].to_i).to be_within(200).of(750)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is failing in CI:

  1) Stats SHOW STATS clients connect and make one query updates *_query_time and *_wait_time
     Failure/Error: expect(results["total_xact_time"].to_i).to be_within(200).of(750)
       expected 1203 to be within 200 of 750
     # ./stats_spec.rb:32:in `block (4 levels) in <top (required)>'

It passes locally for me inside the dev container, but I wonder if that shows that this approach is flawed.

Having said that, I do see other specs fail some of the time, like this, which I don't think I broke:

  1) Stats SHOW POOLS bad database name does not change any stats
     Failure/Error: expect(results["sv_idle"]).to eq("1")

       expected: "1"
            got: "2"

       (compared using ==)
     # ./stats_spec.rb:72:in `block (4 levels) in <top (required)>'

expect(results["avg_xact_time"].to_i).to be_within(50).of(250)

expect(results["total_wait_time"].to_i).to_not eq(0)
expect(results["avg_wait_time"].to_i).to_not eq(0)

connections = Array.new(3) { PG::connect("#{pgcat_conn_str}?application_name=one_query") }
connections.each do |c|
Thread.new { c.async_exec("SELECT pg_sleep(0.125);") }
end
sleep(1)
connections.map(&:close)
# wait for averages to be calculated again
sleep(15.5)

results = admin_conn.async_exec("SHOW STATS")[0]
admin_conn.close
# Three more queries
expect(results["total_query_count"].to_i).to eq(12)
expect(results["total_query_time"].to_i).to be_within(225).of(1125)
# Average is 125ms in the current stats period
expect(results["avg_query_time"].to_i).to be_within(25).of(125.0)

# Autocommit transactions still increase the count and time
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was already the case, and is the same as PgBouncer: https://github.com/pgbouncer/pgbouncer/blob/e2a2a682fe9069366fca970ec2492d774b4f6b40/test/test_admin.py#L74-L75

expect(results["total_xact_count"].to_i).to eq(6)
expect(results["total_xact_time"].to_i).to be_within(225).of(1125)
# Average is 125ms in the current stats period
expect(results["avg_xact_time"].to_i).to be_within(25).of(125.0)

expect(results["total_wait_time"].to_i).to_not eq(0)
expect(results["avg_wait_time"].to_i).to_not eq(0)
Expand Down