facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-05 06:18:07 +03:00
Code Issues Projects Releases Wiki Activity

instrument mutation queries with SQL perf counters

Browse Source 
Summary:
instrument mutation queries with SQL perf counters

this will give us correct scuba logging

increment counters before sql queries

==== this is a sev follow up task ====

Reviewed By: markbt

Differential Revision: D54362984

fbshipit-source-id: 898df4b53faec650385e0b20b045023f087186cd
This commit is contained in:
Liubov Dmitrieva 2024-03-01 03:16:12 -08:00 committed by Facebook GitHub Bot
parent bb37cf9419
commit 724c1421c4
1 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
eden/mononoke/mercurial/mutation/src/store.rs
View File

@ -210,6 +210,8 @@ impl SqlHgMutationStore {
})
.collect();
ctx.perf_counters()
.add_to_counter(PerfCounterType::SqlWrites, 4);
if let Some(cri) = ctx.metadata().client_request_info() {
let (txn, _) =
AddChangesets::traced_query_with_transaction(txn, cri, db_csets.as_slice()).await?;
@ -261,14 +263,20 @@ impl SqlHgMutationStore {
&self,
ctx: &CoreContext,
changeset_ids: &HashSet<HgChangesetId>,
) -> Result<&Connection> {
) -> Result<(&Connection, PerfCounterType)> {
// Check if the replica is up-to-date with respect to all changesets we
// are interested in.
let changeset_ids: Vec<_> = changeset_ids.iter().collect();
if changeset_ids.is_empty() {
// There are no interesting changesets, so just use the replica.
return Ok(&self.connections.read_connection);
return Ok((
&self.connections.read_connection,
PerfCounterType::SqlReadsReplica,
));
}
ctx.perf_counters()
.increment_counter(PerfCounterType::SqlReadsReplica);
let count = match ctx.metadata().client_request_info() {
Some(cri) => {
CountChangesets::traced_query(
@ -288,15 +296,22 @@ impl SqlHgMutationStore {
.await
}
}?;
if let Some((count,)) = count.into_iter().next() {
if count as usize == changeset_ids.len() {
// The replica knows all of the changesets, so use it.
return Ok(&self.connections.read_connection);
return Ok((
&self.connections.read_connection,
PerfCounterType::SqlReadsReplica,
));
}
}
// The replica doesn't know all of the changesets, use the connection to
// the master.
Ok(&self.connections.read_master_connection)
Ok((
&self.connections.read_master_connection,
PerfCounterType::SqlReadsMaster,
))
}
/// Collect entries from the database into an entry set.
@ -304,6 +319,7 @@ impl SqlHgMutationStore {
&self,
ctx: &CoreContext,
connection: &Connection,
sql_perf_counter: PerfCounterType,
entry_set: &mut HgMutationEntrySet,
rows: I,
) -> Result<()>
@ -362,6 +378,7 @@ impl SqlHgMutationStore {
})?;
}
if !to_fetch_split.is_empty() {
ctx.perf_counters().increment_counter(sql_perf_counter);
let rows = match ctx.metadata().client_request_info() {
Some(cri) => {
SelectSplitsBySuccessor::traced_query(
@ -401,6 +418,7 @@ impl SqlHgMutationStore {
&self,
ctx: &CoreContext,
connection: &Connection,
sql_perf_counter: PerfCounterType,
entry_set: &mut HgMutationEntrySet,
changesets: &HashSet<HgChangesetId>,
) -> Result<()> {
@ -415,6 +433,7 @@ impl SqlHgMutationStore {
let cri = ctx.metadata().client_request_info();
let chunk_rows = stream::iter(chunks.into_iter().map(move |chunk| async move {
ctx.perf_counters().increment_counter(sql_perf_counter);
match cri {
Some(cri) => {
SelectBySuccessor::traced_query(
@ -433,8 +452,14 @@ impl SqlHgMutationStore {
.try_collect::<Vec<_>>()
.await?;
self.collect_entries(ctx, connection, entry_set, chunk_rows.into_iter().flatten())
.await?;
self.collect_entries(
ctx,
connection,
sql_perf_counter,
entry_set,
chunk_rows.into_iter().flatten(),
)
.await?;
Ok(())
}
@ -443,6 +468,7 @@ impl SqlHgMutationStore {
&self,
ctx: &CoreContext,
connection: &Connection,
sql_perf_counter: PerfCounterType,
entry_set: &mut HgMutationEntrySet,
) -> Result<()> {
if entry_set.entries.is_empty() {
@ -458,6 +484,7 @@ impl SqlHgMutationStore {
let cri = ctx.metadata().client_request_info();
let rows = stream::iter(chunks.into_iter().map(|changesets| async move {
ctx.perf_counters().increment_counter(sql_perf_counter);
match cri {
Some(cri) => {
SelectBySuccessorChain::traced_query(
@ -485,8 +512,14 @@ impl SqlHgMutationStore {
.try_collect::<Vec<_>>()
.await?;
self.collect_entries(ctx, connection, entry_set, rows.into_iter().flatten())
.await?;
self.collect_entries(
ctx,
connection,
sql_perf_counter,
entry_set,
rows.into_iter().flatten(),
)
.await?;
Ok(())
}
@ -537,6 +570,7 @@ impl HgMutationStore for SqlHgMutationStore {
self.fetch_by_successor(
ctx,
&self.connections.read_master_connection,
PerfCounterType::SqlReadsMaster,
&mut entry_set,
&changeset_ids,
)
@ -587,6 +621,7 @@ impl HgMutationStore for SqlHgMutationStore {
self.fetch_by_successor(
ctx,
&self.connections.read_master_connection,
PerfCounterType::SqlReadsMaster,
&mut entry_set,
&predecessor_ids,
)
@ -620,12 +655,18 @@ impl HgMutationStore for SqlHgMutationStore {
}
let mut entry_set = HgMutationEntrySet::new();
let connection = self
let (connection, sql_perf_counter) = self
.read_connection_for_changesets(ctx, &changeset_ids)
.await?;
self.fetch_by_successor(ctx, connection, &mut entry_set, &changeset_ids)
.await?;
self.fetch_all_predecessors(ctx, connection, &mut entry_set)
self.fetch_by_successor(
ctx,
connection,
sql_perf_counter,
&mut entry_set,
&changeset_ids,
)
.await?;
self.fetch_all_predecessors(ctx, connection, sql_perf_counter, &mut entry_set)
.await?;
let changeset_count = changeset_ids.len();
let entries = entry_set.into_all_predecessors_by_changeset(changeset_ids);