Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2330 from influxdata/frequency 

fix: Make allocs profile record all allocations
pull/24376/head
kodiakhq[bot] 2021-08-18 11:16:22 +00:00 committed by GitHub
parent 1d6a8703af c0640bf1f9
commit 8c331cab88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/influxdb_ioxd/http.rs
View File

@ -778,7 +778,7 @@ async fn pprof_home<M: ConnectionManager + Send + Sync + Debug + 'static>(
);
let allocs_cmd = format!(
"/debug/pprof/allocs?seconds={}",
PProfArgs::default_seconds()
PProfAllocsArgs::default_seconds()
);
Ok(Response::new(Body::from(format!(
r#"<a href="{}">http://{}{}</a><br><a href="{}">http://{}{}</a>"#,
@ -821,6 +821,30 @@ impl PProfArgs {
}
}
#[derive(Debug, Deserialize)]
struct PProfAllocsArgs {
#[serde(default = "PProfAllocsArgs::default_seconds")]
seconds: u64,
// The sampling interval is a number of bytes that have to cumulatively allocated for a sample to be taken.
//
// For example if the sampling interval is 99, and you're doing a million of 40 bytes allocations,
// the allocations profile will account for 16MB instead of 40MB.
// Heappy will adjust the estimate for sampled recordings, but now that feature is not yet implemented.
#[serde(default = "PProfAllocsArgs::default_interval")]
interval: NonZeroI32,
}
impl PProfAllocsArgs {
fn default_seconds() -> u64 {
30
}
// 1 means: sample every allocation.
fn default_interval() -> NonZeroI32 {
NonZeroI32::new(1).unwrap()
}
}
#[tracing::instrument(level = "debug")]
async fn pprof_profile<M: ConnectionManager + Send + Sync + Debug + 'static>(
req: Request<Body>,
@ -863,10 +887,10 @@ async fn pprof_heappy_profile<M: ConnectionManager + Send + Sync + Debug + 'stat
req: Request<Body>,
) -> Result<Response<Body>, ApplicationError> {
let query_string = req.uri().query().unwrap_or_default();
let query: PProfArgs =
let query: PProfAllocsArgs =
serde_urlencoded::from_str(query_string).context(InvalidQueryString { query_string })?;
let report = self::heappy::dump_heappy_rsprof(query.seconds, query.frequency.get()).await;
let report = self::heappy::dump_heappy_rsprof(query.seconds, query.interval.get()).await;
let mut body: Vec<u8> = Vec::new();

12
src/influxdb_ioxd/http/heappy.rs
View File

@ -6,18 +6,18 @@ use heappy::{self, HeapReport};
use observability_deps::tracing::info;
use tokio::time::Duration;
pub(crate) async fn dump_heappy_rsprof(seconds: u64, frequency: i32) -> HeapReport {
let guard = heappy::HeapProfilerGuard::new(frequency as usize);
pub(crate) async fn dump_heappy_rsprof(seconds: u64, interval: i32) -> HeapReport {
let guard = heappy::HeapProfilerGuard::new(interval as usize);
info!(
"start heappy profiling {} seconds with frequency {} /s",
seconds, frequency
"start allocs profiling {} seconds with interval {} bytes",
seconds, interval
);
tokio::time::sleep(Duration::from_secs(seconds)).await;
info!(
"done heappy profiling {} seconds with frequency {} /s",
seconds, frequency
"done allocs profiling {} seconds with interval {} bytes",
seconds, interval
);
guard.report()