Skip to content

Adjusted hub upgrade database migration to show only actionable logs (3.21) #1513

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
craigcomstock merged 3 commits into from
Nov 18, 2024
Merged

Adjusted hub upgrade database migration to show only actionable logs (3.21) #1513

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
918f38a
Adjusted hub upgrade database migration to show only actionable logs
craigcomstock Oct 15, 2024
8a61122
Revert "Adjusted calling pg_upgrade during upgrade to include LD_LIBR…
craigcomstock Oct 16, 2024
52edfbf
Fixed problem with package upgrade not trying other migration methods…
craigcomstock Oct 21, 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
21 changes: 14 additions & 7 deletions packaging/common/cfengine-hub/postinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ check_disk_space() {
# and then importing it into new one

migrate_db_using_pg_upgrade() {
su cfpostgres -c "LD_LIBRARY_PATH=$BACKUP_DIR/lib/ $PREFIX/bin/pg_upgrade --old-bindir=$BACKUP_DIR/bin --new-bindir=$PREFIX/bin --old-datadir=$BACKUP_DIR/data --new-datadir=$PREFIX/state/pg/data"
su cfpostgres -c "$PREFIX/bin/pg_upgrade --old-bindir=$BACKUP_DIR/bin --new-bindir=$PREFIX/bin --old-datadir=$BACKUP_DIR/data --new-datadir=$PREFIX/state/pg/data"
}

migrate_db_using_pipe() {
Expand Down Expand Up @@ -699,16 +699,23 @@ do_migration() {
cd /tmp
cf_console echo "Migrating database using pg_upgrade utility..."
cf_console echo
if migrate_db_using_pg_upgrade && [ $DEBUG -lt 1 ]; then
_pg_upgrade_log="/tmp/cfengine_pg_upgrade.log"
if migrate_db_using_pg_upgrade >"${_pg_upgrade_log}" 2>&1 && [ $DEBUG -lt 1 ]; then
# Succeeded
cat "${_pg_upgrade_log}" # might as well see the details of how it worked
rm "${_pg_upgrade_log}" # clean up
exit 0 # exits only from (...)
fi
cf_console echo "Migration using pg_upgrade failed."
# here pg_upgrade probably said something like
# Consult the last few lines of "/var/cfengine/state/pg/data/pg_upgrade_output.d/20230913T150025.959/log/pg_upgrade_server.log" for the probable cause of the failure.
cf_console echo "Showing last lines of any related log files:"
_daysearch=$(date +%Y%m%d)
find "$PREFIX"/state/pg/data/pg_upgrade_output.d -name '*.log' | grep "$_daysearch" | cf_console xargs tail
if [ $DEBUG -gt 0 ]; then
cat "${_pg_upgrade_log}"
rm "${_pg_upgrade_log}"
# pg_upgrade probably said something like
# Consult the last few lines of "/var/cfengine/state/pg/data/pg_upgrade_output.d/20230913T150025.959/log/pg_upgrade_server.log" for the probable cause of the failure.
cf_console echo "Showing last lines of any related log files:"
_daysearch=$(date +%Y%m%d)
find "$PREFIX"/state/pg/data/pg_upgrade_output.d -name '*.log' | grep "$_daysearch" | cf_console xargs tail
fi
cf_console echo
check_disk_space # will abort if low on disk space
init_postgres_dir "$new_pgconfig_file" "$pgconfig_type"
Expand Down