From d6b8dfbbb94577b58b749ce9de03b47f8b4296fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Membr=C3=A9?= Date: Wed, 26 Oct 2016 15:44:55 +0200 Subject: [PATCH] Fixes #9555: Remove creation of index on expectedreportsnodes table in rudder-upgrade --- rudder-webapp/SOURCES/rudder-upgrade | 9 --------- rudder-webapp/SPECS/rudder-webapp.spec | 1 - rudder-webapp/debian/rules | 1 - 3 files changed, 11 deletions(-) diff --git a/rudder-webapp/SOURCES/rudder-upgrade b/rudder-webapp/SOURCES/rudder-upgrade index 6d76b08b2..a92df97c0 100755 --- a/rudder-webapp/SOURCES/rudder-upgrade +++ b/rudder-webapp/SOURCES/rudder-upgrade @@ -47,7 +47,6 @@ trap anomaly_handler ERR INT TERM # - 2.10.17 : Migration DB schema to add historization of global agent schedule # - 2.11.19 : Add index on fileformat for eventlog # - 2.11.23 : Add 'api compatibility' property -# - 3.0.14 : Add index on nodeconfigids for expectedreportsnodes # - 3.0.17 : Add index on eventType and executionTimeStamp on RudderSysEvents # - 3.1.10 : Add masterfiles in the server # - 3.2.0 : Add the properties to configuration authentication provider and master admin account @@ -513,14 +512,6 @@ upgrade_database() { echo " Done" fi - # - 2.11.19, 3.0.14, 3.1.8 and 3.2.1 : Migration DB schema to add an indexes on nodeconfigids on table expectedreportsnodes - RES=$(${PSQL} -t -d rudder -c "select count(oid) from pg_class where lower(relname) = 'nodeconfigids_idx'") - if [ $RES -eq 0 ]; then - echo -n "INFO: Updating the PostgreSQL indexes, this may take several minutes..." - ${PSQL} -d rudder -f ${RUDDER_UPGRADE_TOOLS}/dbMigration-3.0-3.0-add-index-nodeconfigids.sql > /dev/null - echo " Done" - fi - # - 3.0.17, 3.1.11 and 3.2.4 : Migration DB schema to add an indexes on eventType and executionTimeStamp on table RudderSysEvents RES=$(${PSQL} -t -d rudder -c "select count(oid) from pg_class where lower(relname) = 'changes_executiontimestamp_idx'") if [ $RES -eq 0 ]; then diff --git a/rudder-webapp/SPECS/rudder-webapp.spec b/rudder-webapp/SPECS/rudder-webapp.spec index e86ebf4c6..92e17d5c9 100644 --- a/rudder-webapp/SPECS/rudder-webapp.spec +++ b/rudder-webapp/SPECS/rudder-webapp.spec @@ -261,7 +261,6 @@ sed -i "s%^DocumentRoot /var/www$%DocumentRoot /srv/www%" %{buildroot}%{rudderdi cp %{_sourcedir}/rudder-sources/rudder/rudder-core/src/main/resources/Migration/dbMigration-2.10-2.10-historization-of-groups-in-rules.sql %{buildroot}%{rudderdir}/share/upgrade-tools/ cp %{_sourcedir}/rudder-sources/rudder/rudder-core/src/main/resources/Migration/dbMigration-2.10-2.10-historization-of-agent-schedule.sql %{buildroot}%{rudderdir}/share/upgrade-tools/ cp %{_sourcedir}/rudder-sources/rudder/rudder-core/src/main/resources/Migration/dbMigration-2.11-2.11-index-eventlog.sql %{buildroot}%{rudderdir}/share/upgrade-tools/ -cp %{_sourcedir}/rudder-sources/rudder/rudder-core/src/main/resources/Migration/dbMigration-3.0-3.0-add-index-nodeconfigids.sql %{buildroot}%{rudderdir}/share/upgrade-tools/ cp %{_sourcedir}/rudder-sources/rudder/rudder-core/src/main/resources/Migration/dbMigration-3.0-3.0-add-index-changes-executiontimestamp.sql %{buildroot}%{rudderdir}/share/upgrade-tools/ cp %{_sourcedir}/rudder-sources/rudder/rudder-core/src/main/resources/Migration/dbMigration-3.2.x-4.0-add-nodeconfigurations.sql %{buildroot}%{rudderdir}/share/upgrade-tools/ cp %{_sourcedir}/rudder-sources/rudder/rudder-core/src/main/resources/Migration/dbMigration-3.2.x-4.0-add-archived-tables.sql %{buildroot}%{rudderdir}/share/upgrade-tools/ diff --git a/rudder-webapp/debian/rules b/rudder-webapp/debian/rules index 3d3e8509a..dbfd55a2b 100755 --- a/rudder-webapp/debian/rules +++ b/rudder-webapp/debian/rules @@ -94,7 +94,6 @@ binary-arch: install dh_install --SOURCEDIR=$(CURDIR)/SOURCES/rudder-sources/rudder/rudder-core/src/main/resources/Migration/ dbMigration-2.10-2.10-historization-of-groups-in-rules.sql /opt/rudder/share/upgrade-tools/ dh_install --SOURCEDIR=$(CURDIR)/SOURCES/rudder-sources/rudder/rudder-core/src/main/resources/Migration/ dbMigration-2.10-2.10-historization-of-agent-schedule.sql /opt/rudder/share/upgrade-tools/ dh_install --SOURCEDIR=$(CURDIR)/SOURCES/rudder-sources/rudder/rudder-core/src/main/resources/Migration/ dbMigration-2.11-2.11-index-eventlog.sql /opt/rudder/share/upgrade-tools/ - dh_install --SOURCEDIR=$(CURDIR)/SOURCES/rudder-sources/rudder/rudder-core/src/main/resources/Migration/ dbMigration-3.0-3.0-add-index-nodeconfigids.sql /opt/rudder/share/upgrade-tools/ dh_install --SOURCEDIR=$(CURDIR)/SOURCES/rudder-sources/rudder/rudder-core/src/main/resources/Migration/ dbMigration-3.0-3.0-add-index-changes-executiontimestamp.sql /opt/rudder/share/upgrade-tools/ dh_install --SOURCEDIR=$(CURDIR)/SOURCES/rudder-sources/rudder/rudder-core/src/main/resources/Migration/ dbMigration-3.2.x-4.0-add-nodeconfigurations.sql /opt/rudder/share/upgrade-tools/ dh_install --SOURCEDIR=$(CURDIR)/SOURCES/rudder-sources/rudder/rudder-core/src/main/resources/Migration/ dbMigration-3.2.x-4.0-add-archived-tables.sql /opt/rudder/share/upgrade-tools/