From 198fc9ea53952fa67d1798a1790396462d88b0bd Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Wed, 7 Apr 2021 18:51:34 +0300
Subject: [PATCH] Capture initdb's stdout/stderr, to avoid messing with log
 formatting.

Especially with --interactive.
---
 pageserver/src/walredo.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pageserver/src/walredo.rs b/pageserver/src/walredo.rs
index a06c87d584..2eb1ea3a57 100644
--- a/pageserver/src/walredo.rs
+++ b/pageserver/src/walredo.rs
@@ -155,12 +155,14 @@ impl WalRedoProcess {
                 Command::new("initdb")
                     .args(&["-D", datadir.to_str().unwrap()])
                     .arg("-N")
-                    .status(),
+                    .output(),
             )
             .expect("failed to execute initdb");
 
-        if !initdb.success() {
-            panic!("initdb failed");
+        if !initdb.status.success() {
+            panic!("initdb failed: {}\nstderr:\n{}",
+                   std::str::from_utf8(&initdb.stdout).unwrap(),
+                   std::str::from_utf8(&initdb.stderr).unwrap());
         }
 
         // Start postgres itself