Code review fixes

This commit is contained in:
Kirill Bulatov
2022-01-11 15:44:23 +02:00
committed by Kirill Bulatov
parent 7c4a653230
commit 8ab4c8a050
6 changed files with 69 additions and 72 deletions
+5
View File
@@ -36,6 +36,11 @@ pub fn read_pidfile(pidfile: &Path) -> Result<i32> {
fn fill_rust_env_vars(cmd: &mut Command) -> &mut Command {
let cmd = cmd.env_clear().env("RUST_BACKTRACE", "1");
let var = "LLVM_PROFILE_FILE";
if let Some(val) = std::env::var_os(var) {
cmd.env(var, val);
}
const RUST_LOG_KEY: &str = "RUST_LOG";
if let Ok(rust_log_value) = std::env::var(RUST_LOG_KEY) {
cmd.env(RUST_LOG_KEY, rust_log_value)
-5
View File
@@ -129,11 +129,6 @@ impl SafekeeperNode {
cmd.arg("--no-sync");
}
let var = "LLVM_PROFILE_FILE";
if let Some(val) = std::env::var_os(var) {
cmd.env(var, val);
}
if !cmd.status()?.success() {
bail!(
"Safekeeper failed to start. See '{}' for details.",
-9
View File
@@ -102,10 +102,6 @@ impl PageServerNode {
config_overrides: &[&str],
) -> anyhow::Result<()> {
let mut cmd = Command::new(self.env.pageserver_bin()?);
let var = "LLVM_PROFILE_FILE";
if let Some(val) = std::env::var_os(var) {
cmd.env(var, val);
}
// FIXME: the paths should be shell-escaped to handle paths with spaces, quotas etc.
let base_data_dir_param = self.env.base_data_dir.display().to_string();
@@ -180,11 +176,6 @@ impl PageServerNode {
fill_rust_env_vars(cmd.args(&args).arg("--daemonize"));
let var = "LLVM_PROFILE_FILE";
if let Some(val) = std::env::var_os(var) {
cmd.env(var, val);
}
if !cmd.status()?.success() {
bail!(
"Pageserver failed to start. See '{}' for details.",