Skip to content
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

feat(RHIDP-2178): Enable postgresql logging #48

Merged
merged 3 commits into from
Jul 20, 2024
Merged

feat(RHIDP-2178): Enable postgresql logging #48

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7f77bf
Enable postgresql logging
yogananth-subramanian Jun 4, 2024
3eec03f
Update Makefile
yogananth-subramanian Jul 19, 2024
788ca9a
fix(RHIDP-2178): restart RHDH after DB is restarted with psql_debug
pmacik Jul 20, 2024
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
5 changes: 5 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,11 @@ endif
@echo "Getting locust master log:"
kubectl logs --namespace $(LOCUST_NAMESPACE) -f -l performance-test-pod-name=$(SCENARIO)-test-master | tee load-test.log
date --utc -Ins>$(TMP_DIR)/benchmark-after
ifeq ($(RHDH_INSTALL_METHOD),helm)
oc exec rhdh-postgresql-primary-0 -n $(RHDH_NAMESPACE) -- sh -c 'cat /var/lib/pgsql/data/userdata/log/postgresql*.log'>postgresql.log
else
oc exec backstage-psql-developer-hub-0 -n $(RHDH_NAMESPACE) -- sh -c 'cat /var/lib/pgsql/data/userdata/log/postgresql*.log'>postgresql.log
endif
@echo "All done!!!"

## Run the scalability test
Expand Down
1 change: 1 addition & 0 deletions ci-scripts/collect-results.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ try_gather_file "${TMP_DIR}/create_group.log"
try_gather_file "${TMP_DIR}/create_user.log"
try_gather_file "${TMP_DIR}/get_token.log"
try_gather_file load-test.log
try_gather_file postgresql.log

PYTHON_VENV_DIR=.venv

Expand Down
21 changes: 21 additions & 0 deletions ci-scripts/rhdh-setup/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ export KEYCLOAK_USER_PASS=${KEYCLOAK_USER_PASS:-$(mktemp -u XXXXXXXXXX)}
export AUTH_PROVIDER="${AUTH_PROVIDER:-''}"
export ENABLE_RBAC="${ENABLE_RBAC:-false}"

export PSQL_LOG="${PSQL_LOG:-true}"
export LOG_MIN_DURATION_STATEMENT="${LOG_MIN_DURATION_STATEMENT:-65}"
export LOG_MIN_DURATION_SAMPLE="${LOG_MIN_DURATION_SAMPLE:-50}"
export LOG_STATEMENT_SAMPLE_RATE="${LOG_STATEMENT_SAMPLE_RATE:-0.7}"

export INSTALL_METHOD=helm

TMP_DIR=$(readlink -m "${TMP_DIR:-.tmp}")
Expand Down Expand Up @@ -147,6 +152,7 @@ install() {
fi

backstage_install
psql_debug
setup_monitoring
}

Expand Down Expand Up @@ -284,6 +290,21 @@ install_rhdh_with_olm() {
wait_to_start deployment "backstage-developer-hub" 300 300
}

# shellcheck disable=SC2016,SC1001,SC2086
psql_debug() {
if [ "$INSTALL_METHOD" == "helm" ]; then
psql_db=rhdh-postgresql-primary-0
elif [ "$INSTALL_METHOD" == "olm" ]; then
psql_db=backstage-psql-developer-hub-0
fi
if ${PSQL_LOG}; then
oc exec "${psql_db}" -n "${RHDH_NAMESPACE}" -- sh -c "sed -i "s/^\s*#log_min_duration_statement.*/log_min_duration_statement=${LOG_MIN_DURATION_STATEMENT}/" /var/lib/pgsql/data/userdata/postgresql.conf "
oc exec "${psql_db}" -n "${RHDH_NAMESPACE}" -- sh -c "sed -i "s/^\s*#log_min_duration_sample.*/log_min_duration_sample=${LOG_MIN_DURATION_SAMPLE}/" /var/lib/pgsql/data/userdata/postgresql.conf "
oc exec "${psql_db}" -n "${RHDH_NAMESPACE}" -- sh -c "sed -i "s/^\s*#log_statement_sample_rate.*/log_statement_sample_rate=${LOG_STATEMENT_SAMPLE_RATE}/" /var/lib/pgsql/data/userdata/postgresql.conf "
fi
oc exec "${psql_db}" -n "${RHDH_NAMESPACE}" -- sh -c 'pg_ctl -D $PGDATA restart -mf'
}

pmacik marked this conversation as resolved.
Show resolved Hide resolved
setup_monitoring() {
echo "Enabling user workload monitoring"
rm -f config.yaml
Expand Down