diff --git a/pageserver/flamegraph.svg b/pageserver/flamegraph.svg
deleted file mode 100644
index 869a445d4c..0000000000
--- a/pageserver/flamegraph.svg
+++ /dev/null
@@ -1,414 +0,0 @@
-
\ No newline at end of file
diff --git a/pageserver/src/bin/pageserver.rs b/pageserver/src/bin/pageserver.rs
index c8af06fdfa..f8bf3a6cec 100644
--- a/pageserver/src/bin/pageserver.rs
+++ b/pageserver/src/bin/pageserver.rs
@@ -677,13 +677,12 @@ fn start_pageserver(
signal.name()
);
- #[cfg(feature = "profiling")]
pageserver::profiling::exit_profiler(&profiler_guard);
std::process::exit(111);
}
- Signal::Quit | Signal::Interrupt | Signal::Terminate => {
+ Signal::Interrupt | Signal::Terminate => {
info!(
"Got {}. Terminating gracefully in fast shutdown mode",
signal.name()
@@ -696,7 +695,6 @@ fn start_pageserver(
let bg_remote_storage = remote_storage.clone();
let bg_deletion_queue = deletion_queue.clone();
- #[cfg(feature = "profiling")]
pageserver::profiling::exit_profiler(&profiler_guard);
BACKGROUND_RUNTIME.block_on(pageserver::shutdown_pageserver(
diff --git a/pageserver/src/import_datadir.rs b/pageserver/src/import_datadir.rs
index f148d21d9c..bb21713fc0 100644
--- a/pageserver/src/import_datadir.rs
+++ b/pageserver/src/import_datadir.rs
@@ -655,9 +655,13 @@ mod tests {
let started_at = std::time::Instant::now();
// Feed bytes to the decoder
+ // TODO try feeding in many small chunks
let xlogoff: usize = startpoint.segment_offset(WAL_SEGMENT_SIZE);
let mut decoder = WalStreamDecoder::new(startpoint, pg_version);
- decoder.feed_bytes(&bytes[xlogoff..]);
+ // decoder.feed_bytes(&bytes[xlogoff..]);
+ for chunk in bytes[xlogoff..].chunks(50) {
+ decoder.feed_bytes(chunk);
+ }
println!("decoding {} bytes", bytes.len() - xlogoff);
// Decode and ingest wal
@@ -674,7 +678,6 @@ mod tests {
println!("done in {:?}", duration);
drop(prof_guard);
- #[cfg(feature = "profiling")]
crate::profiling::exit_profiler(&profiler_guard);
Ok(())
diff --git a/pageserver/src/profiling.rs b/pageserver/src/profiling.rs
index af59b0b491..b6b3658546 100644
--- a/pageserver/src/profiling.rs
+++ b/pageserver/src/profiling.rs
@@ -83,5 +83,5 @@ mod profiling_impl {
None
}
- // pub fn exit_profiler(profiler_guard: &Option) {}
+ pub fn exit_profiler(profiler_guard: &Option) {}
}
diff --git a/pageserver/src/tenant/blob_io.rs b/pageserver/src/tenant/blob_io.rs
index 050eeba7fe..760c64663d 100644
--- a/pageserver/src/tenant/blob_io.rs
+++ b/pageserver/src/tenant/blob_io.rs
@@ -356,7 +356,6 @@ mod tests {
round_trip_test::(&blobs).await?;
round_trip_test::(&blobs).await?;
- #[cfg(feature = "profiling")]
crate::profiling::exit_profiler(&profiler_guard);
Ok(())
}