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 #8002: Merge error in branch 3.1 for fileFormat detection #895

Merged
merged 1 commit into from
Mar 1, 2016
Merged

Fixes #8002: Merge error in branch 3.1 for fileFormat detection #895

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
37 changes: 0 additions & 37 deletions rudder-webapp/SOURCES/rudder-upgrade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,43 +427,6 @@ rudder.jdbc.maxPoolSize=25"
# This has been separated from the upgrade_database to be run after, as it would allow to create the indexes for eventlog if necessary
# and have only one location for all the eventlog upgrade part
upgrade_eventlog() {
# Upgrade database schema from 2.3 to 2.4 if necessary - seventh part: Check the lowest fileFormat version in the eventLog and update the date if necessary
STEP="Upgrade database schema from 2.3 to 2.4 if necessary - seventh part: Check the lowest fileFormat version in the eventLog and update the date if necessary"

OLDEST_EVENTLOG_VERSION=0
for EVENTLOG_VERSION in 2 1
do
CHK_EVENTLOG=$(${PSQL} -t -d rudder -c "select count(*) from (select ((xpath('/entry//@fileFormat',data))[1]::text) as id from eventlog) as T where id='${EVENTLOG_VERSION}';")
if [ ${CHK_EVENTLOG} -ne 0 ]; then
OLDEST_EVENTLOG_VERSION=${EVENTLOG_VERSION}
fi
done
if [ ${OLDEST_EVENTLOG_VERSION} -eq 1 ]; then
# File Format migration : version 1 (2.3) to 2 (2.4) : Check if an event log has File format 1
# The migration is not supported anymore, explain that you should upgrade first to 2.6 before
echo "WARNING: Some event log are still based on an old file format (file format 1), please upgrade first to Rudder 2.6 or later to make this migration"
elif [ ${OLDEST_EVENTLOG_VERSION} -eq 2 ]; then
# File Format migration : version 2 (2.4) to 3 (2.4) : Check if an event log has File format 2 and set migration flag if needed
# Launch this script if eventlogs v2 are found
${PSQL} -d rudder -f ${RUDDER_UPGRADE_TOOLS}/dbMigration-2.4-2.4-set-migration-needed-flag-for-EventLog.sql > /dev/null
fi

# 2.7.0: File Format migration from 3 to 4
STEP="2.7.0: File Format migration from 3 to 4"

RES=$(${PSQL} -t -d rudder -c "select count(*) from (select ((xpath('/entry//@fileFormat',data))[1]::text) as id from eventlog) as T where id='3';")
if [ $RES -ne 0 ]; then
${PSQL} -d rudder -f ${RUDDER_UPGRADE_TOOLS}/dbMigration-2.6-2.7-set-migration-needed-flag-for-EventLog.sql > /dev/null 2>&1
fi

# 2.9.0: File Format migration from 4 to 5
STEP="2.9.0: File Format migration from 4 to 5"

RES=$(${PSQL} -t -d rudder -c "select count(*) from (select ((xpath('/entry//@fileFormat',data))[1]::text) as id from eventlog) as T where id='4';")
if [ $RES -ne 0 ]; then
${PSQL} -d rudder -f ${RUDDER_UPGRADE_TOOLS}/dbMigration-2.8-2.9-set-migration-needed-flag-for-EventLog.sql > /dev/null 2>&1
fi

# - 3.0.0 : File Format migration from 5 to 6
STEP="3.0.0: File Format migration from 5 to 6"

Expand Down