Skip to content

Revert "Tee output so we can see it in journald logs" for dataproc #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
june-hua merged 1 commit into from
Mar 31, 2026
Merged

Revert "Tee output so we can see it in journald logs" for dataproc #354

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions startupscript/dataproc/startup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,11 @@ readonly GIT_IGNORE="${USER_HOME_DIR}/gitignore_global"
cd /tmp || exit

# Send stdout and stderr from this script to a file for debugging.
# Use tee to also send output to journald logs.
# Make the .wb directory as the user so that they own it and have correct linux permissions.
${RUN_AS_LOGIN_USER} "mkdir -p '${USER_WORKBENCH_CONFIG_DIR}'"
${RUN_AS_LOGIN_USER} "ln -sf '${USER_WORKBENCH_CONFIG_DIR}' '${USER_WORKBENCH_LEGACY_CONFIG_DIR}'"
exec > >(tee -a "${POST_STARTUP_OUTPUT_FILE}") 2>&1
exec >> "${POST_STARTUP_OUTPUT_FILE}"
exec 2>&1

#######################################
# Emit a message with a timestamp
Expand Down Expand Up @@ -917,8 +917,8 @@ cat << EOF >"${WORKBENCH_BOOT_SCRIPT}"
# This script is run on instance boot to configure the instance for Workbench.

# Send stdout and stderr from this script to a file for debugging.
# Use tee to also send output to journald logs.
exec > >(tee -a "${WORKBENCH_BOOT_SERVICE_OUTPUT_FILE}") 2>&1
exec >> "${WORKBENCH_BOOT_SERVICE_OUTPUT_FILE}"
exec 2>&1

# Pick up environment from the ~/.bashrc
source "${USER_BASHRC}"
Expand Down
Loading