Skip to content

Commit

Permalink
[#22465] ASH: Ignore ASH calls while fetching active session history
Browse files Browse the repository at this point in the history
Summary:
Due to a refactor in de9fd5d  ActiveSessionHistory calls seem to include the ASH calls while fetching samples from the TServer, even if `ignore_ash_and_perform_calls` is set.

This diff fixes the regression.
Jira: DB-11382

Test Plan: wait_states-itest

Reviewers: asaha

Reviewed By: asaha

Subscribers: ybase, yql

Differential Revision: https://phorge.dev.yugabyte.com/D35227
  • Loading branch information
amitanandaiyer committed May 22, 2024
1 parent 288294e commit 26fb55d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/yb/integration-tests/wait_states-itest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,9 @@ void WaitStateTestCheckMethodCounts::VerifyCountsUnlocked() {
// It is acceptable that some calls may not have populated their aux_info yet.
// This probability should be very low.
ASSERT_LE(method_counts_[""], 2 * num_ash_calls * kProbNoMethod);

// We ignore ASH calls from showing up during the pull.
ASSERT_EQ(wait_state_code_counts_["kDumpRunningRpc_WaitOnReactor"], 0);
}

bool WaitStateTestCheckMethodCounts::IsDone() {
Expand Down
1 change: 1 addition & 0 deletions src/yb/tserver/pg_client_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1390,6 +1390,7 @@ class PgClientServiceImpl::Impl {
for (const auto& call : conn.calls_in_flight()) {
if (ShouldIgnoreCall(req, call)) {
VLOG(3) << "Ignoring " << call.wait_state().DebugString();
continue;
}
auto* wait_state = resp->add_wait_states();
wait_state->CopyFrom(call.wait_state());
Expand Down

0 comments on commit 26fb55d

Please sign in to comment.