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

Jump to bottom

Fixes #16745: when upgrding rudder from 5.0 to 6.0, the rudder-pkg restaure pkg cannot restart correctly Jetty, so rudder-upgrade doesn't checkk compatibility, and rudder cannot start #2202

Merged
merged 1 commit into from
Feb 21, 2020
Merged

Fixes #16745: when upgrding rudder from 5.0 to 6.0, the rudder-pkg restaure pkg cannot restart correctly Jetty, so rudder-upgrade doesn't checkk compatibility, and rudder cannot start #2202

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 7 additions & 6 deletions rudder-webapp/SOURCES/rudder-webapp-postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,6 @@ if [ $LDAPCHK -eq 0 ]; then
/opt/rudder/bin/rudder-init no auto
fi

# Restore the plugins before checking them
if [ -f /tmp/rudder-plugins-upgrade ]
then
/opt/rudder/bin/rudder-pkg plugin restore-status < /tmp/rudder-plugins-upgrade
fi

# Run any upgrades
echo "INFO: Launching script to check if a migration is needed ..."
/opt/rudder/bin/rudder-upgrade >> ${LOG_FILE}
Expand All @@ -168,6 +162,13 @@ echo "Done"
# Adjust permissions on /var/rudder/configuration-repository
/opt/rudder/bin/rudder-fix-repository-permissions >> ${LOG_FILE}

# Restore the plugins and checking them
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont get this. Currently we restore the status, then rudder-upgrade runs check-compatibility and rudder-postupgrade. Why doing it again just after?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

parent ticket change the order, but it wasn't such a great idea

if [ -f /tmp/rudder-plugins-upgrade ]
then
rudder package plugin restore-status < /tmp/rudder-plugins-upgrade
rudder package check-compatibility
rudder package rudder-postupgrade
fi

cd /
[ -f /tmp/rudder-hooks-upgrade ] && setfacl --restore=/tmp/rudder-hooks-upgrade
Expand Down