Sandro Bonazzola has uploaded a new change for review. Change subject: build: ovirt-engine-dwh-3.3.4 ......................................................................
build: ovirt-engine-dwh-3.3.4 Change-Id: Id2fe97afac0c86ae64f6dc32053aca042830c924 Signed-off-by: Sandro Bonazzola <[email protected]> --- M data-warehouse/history_etl/context_files/ovirt_engine_dwh/minimalversioncheck_3_3/contexts/Default.properties M data-warehouse/history_etl/context_files/ovirt_engine_dwh/parallelrun_3_3/contexts/Default.properties M data-warehouse/history_etl/etl_sources/advancedPersistentLookupLib/pom.xml M data-warehouse/history_etl/etl_sources/historyETLProcedure/pom.xml M data-warehouse/history_etl/etl_sources/packaging/pom.xml M data-warehouse/history_etl/etl_sources/pom.xml M data-warehouse/history_etl/etl_sources/talendRoutines/pom.xml M data-warehouse/history_etl/pom.xml M data-warehouse/history_etl/tos_project/context/connectionJDBC_3.3.item M data-warehouse/history_etl/tos_project/process/MinimalVersionCheck_3.3.item M data-warehouse/history_etl/tos_project/process/ParallelRun_3.3.item M data-warehouse/historydbscripts_postgres/upgrade/pre_upgrade/set_etl_minimal_version.sql M data-warehouse/pom.xml M packaging/ovirt-engine-dwh.spec.in M pom.xml M version.mak 16 files changed, 26 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/85/24985/1 diff --git a/data-warehouse/history_etl/context_files/ovirt_engine_dwh/minimalversioncheck_3_3/contexts/Default.properties b/data-warehouse/history_etl/context_files/ovirt_engine_dwh/minimalversioncheck_3_3/contexts/Default.properties index 1666a74..f3ecdb7 100644 --- a/data-warehouse/history_etl/context_files/ovirt_engine_dwh/minimalversioncheck_3_3/contexts/Default.properties +++ b/data-warehouse/history_etl/context_files/ovirt_engine_dwh/minimalversioncheck_3_3/contexts/Default.properties @@ -3,7 +3,7 @@ ovirtEngineHistoryDbDriverClass=org.postgresql.Driver ovirtEngineHistoryMinimalETL=null ovirtEngineHistoryDbUser=postgres -etlVersion=3.3.3 +etlVersion=3.3.4 ovirtMinimalETL=null ovirtEngineHistoryDbJdbcConnection=jdbc\:postgresql\://localhost\:5432/ovirt_engine_history?stringtype\=unspecified ovirtEngineDbPassword= diff --git a/data-warehouse/history_etl/context_files/ovirt_engine_dwh/parallelrun_3_3/contexts/Default.properties b/data-warehouse/history_etl/context_files/ovirt_engine_dwh/parallelrun_3_3/contexts/Default.properties index 8ace3d8..ec3a20c 100644 --- a/data-warehouse/history_etl/context_files/ovirt_engine_dwh/parallelrun_3_3/contexts/Default.properties +++ b/data-warehouse/history_etl/context_files/ovirt_engine_dwh/parallelrun_3_3/contexts/Default.properties @@ -15,7 +15,7 @@ timeBetweenErrorEvents=300000 hoursToKeepSamples=24 ovirtEnginePortalAddress=localhost -etlVersion=3.3.3 +etlVersion=3.3.4 ovirtEngineHistoryDbDriverClass=org.postgresql.Driver runTime=yyyy-MM-dd HH\:mm\:ss.SSSSSS;2011-07-03 12\:46\:47.000000 ovirtEngineHistoryDbPassword= diff --git a/data-warehouse/history_etl/etl_sources/advancedPersistentLookupLib/pom.xml b/data-warehouse/history_etl/etl_sources/advancedPersistentLookupLib/pom.xml index 18b9451..927782c 100644 --- a/data-warehouse/history_etl/etl_sources/advancedPersistentLookupLib/pom.xml +++ b/data-warehouse/history_etl/etl_sources/advancedPersistentLookupLib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ovirt_engine_dwh</groupId> <artifactId>etl_sources</artifactId> - <version>3.3.3</version> + <version>3.3.4</version> </parent> <groupId>ovirt_engine_dwh</groupId> diff --git a/data-warehouse/history_etl/etl_sources/historyETLProcedure/pom.xml b/data-warehouse/history_etl/etl_sources/historyETLProcedure/pom.xml index 0e93c61..32cfccf 100644 --- a/data-warehouse/history_etl/etl_sources/historyETLProcedure/pom.xml +++ b/data-warehouse/history_etl/etl_sources/historyETLProcedure/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>ovirt_engine_dwh</groupId> <artifactId>etl_sources</artifactId> - <version>3.3.3</version> + <version>3.3.4</version> </parent> <groupId>ovirt_engine_dwh</groupId> <artifactId>historyETLProcedure</artifactId> <packaging>jar</packaging> - <version>3.3.3</version> + <version>3.3.4</version> <name>History's ETL Procedure</name> <description>The jar that contains the oVirt Engine History DB ETL module</description> diff --git a/data-warehouse/history_etl/etl_sources/packaging/pom.xml b/data-warehouse/history_etl/etl_sources/packaging/pom.xml index 628d772..2f5688f 100644 --- a/data-warehouse/history_etl/etl_sources/packaging/pom.xml +++ b/data-warehouse/history_etl/etl_sources/packaging/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>ovirt_engine_dwh</groupId> <artifactId>etl_sources</artifactId> - <version>3.3.3</version> + <version>3.3.4</version> </parent> <groupId>ovirt_engine_dwh</groupId> <artifactId>packaging</artifactId> <packaging>pom</packaging> - <version>3.3.3</version> + <version>3.3.4</version> <name>History's ETL Packaging</name> <description>Packaging</description> @@ -19,7 +19,7 @@ <dependency> <groupId>ovirt_engine_dwh</groupId> <artifactId>historyETLProcedure</artifactId> - <version>3.3.3</version> + <version>3.3.4</version> </dependency> <dependency> <groupId>postgresql</groupId> diff --git a/data-warehouse/history_etl/etl_sources/pom.xml b/data-warehouse/history_etl/etl_sources/pom.xml index f134869..160a4fc 100644 --- a/data-warehouse/history_etl/etl_sources/pom.xml +++ b/data-warehouse/history_etl/etl_sources/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ovirt_engine_dwh</groupId> <artifactId>history_etl</artifactId> - <version>3.3.3</version> + <version>3.3.4</version> </parent> <groupId>ovirt_engine_dwh</groupId> diff --git a/data-warehouse/history_etl/etl_sources/talendRoutines/pom.xml b/data-warehouse/history_etl/etl_sources/talendRoutines/pom.xml index 5c183ef..31e97a9 100644 --- a/data-warehouse/history_etl/etl_sources/talendRoutines/pom.xml +++ b/data-warehouse/history_etl/etl_sources/talendRoutines/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ovirt_engine_dwh</groupId> <artifactId>etl_sources</artifactId> - <version>3.3.3</version> + <version>3.3.4</version> </parent> <groupId>ovirt_engine_dwh</groupId> diff --git a/data-warehouse/history_etl/pom.xml b/data-warehouse/history_etl/pom.xml index b8a2b30..2598282 100644 --- a/data-warehouse/history_etl/pom.xml +++ b/data-warehouse/history_etl/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>ovirt_engine_dwh</groupId> <artifactId>data-warehouse</artifactId> - <version>3.3.3</version> + <version>3.3.4</version> </parent> <artifactId>history_etl</artifactId> diff --git a/data-warehouse/history_etl/tos_project/context/connectionJDBC_3.3.item b/data-warehouse/history_etl/tos_project/context/connectionJDBC_3.3.item index cb9c6c9..5996ca9 100644 --- a/data-warehouse/history_etl/tos_project/context/connectionJDBC_3.3.item +++ b/data-warehouse/history_etl/tos_project/context/connectionJDBC_3.3.item @@ -14,7 +14,7 @@ <contextParameter comment="Enter the amout of hour to keep Daily level records." name="hoursToKeepDaily" prompt="How many hours to keep of daily data?" promptNeeded="true" type="id_Integer" value="43800"/> <contextParameter comment="Enter the amout of hour to keep Samples level records." name="hoursToKeepSamples" prompt="How many hours to keep of samples data?" promptNeeded="true" type="id_Integer" value="24"/> <contextParameter comment="End run time." name="endTime" prompt="endTime?" promptNeeded="false" type="id_Date" value=""/> - <contextParameter comment="" name="etlVersion" prompt="etlVersion?" promptNeeded="false" type="id_String" value="3.3.3"/> + <contextParameter comment="" name="etlVersion" prompt="etlVersion?" promptNeeded="false" type="id_String" value="3.3.4"/> <contextParameter comment="Enter the time to run the delete job. Can only run on round hour 24 hours clock." name="runDeleteTime" prompt="runDeleteTime?" promptNeeded="true" type="id_Integer" value="3"/> <contextParameter comment="" name="lastErrorSent" prompt="lastErrorSent?" promptNeeded="true" type="id_Date" value="yyyy-MM-dd HH:mm:ss.SSSSSS;2011-07-03 12:46:47.000000"/> <contextParameter comment="Enter the amout of to wait between sending error events to audit log" name="timeBetweenErrorEvents" prompt="timeBetweenErrorEvents?" promptNeeded="true" type="id_Long" value="300000"/> diff --git a/data-warehouse/history_etl/tos_project/process/MinimalVersionCheck_3.3.item b/data-warehouse/history_etl/tos_project/process/MinimalVersionCheck_3.3.item index 598f16d..38e0835 100644 --- a/data-warehouse/history_etl/tos_project/process/MinimalVersionCheck_3.3.item +++ b/data-warehouse/history_etl/tos_project/process/MinimalVersionCheck_3.3.item @@ -3,7 +3,7 @@ <context confirmationNeeded="false" name="Default"> <contextParameter comment="" name="ovirtEngineHistoryMinimalETL" prompt="ovirtEngineHistoryMinimalETL?" promptNeeded="false" type="id_String" value="null"/> <contextParameter comment="" name="ovirtMinimalETL" prompt="ovirtMinimalETL?" promptNeeded="false" type="id_String" value="null"/> - <contextParameter comment="" name="etlVersion" prompt="etlVersion?" promptNeeded="false" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="3.3.3"/> + <contextParameter comment="" name="etlVersion" prompt="etlVersion?" promptNeeded="false" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="3.3.4"/> <contextParameter comment="Enter the JDBC driver class for the ovirt database." name="ovirtEngineDbDriverClass" prompt="Enter the JDBC driver class for the ovirt database." promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="org.postgresql.Driver"/> <contextParameter comment="Enter the JDBC driver class for the ovirt engine history database." name="ovirtEngineHistoryDbDriverClass" prompt="Enter the JDBC driver class for the ovirt engine history database." promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="org.postgresql.Driver"/> <contextParameter comment="Enter the ovirt engine history JDBC connection URL." name="ovirtEngineHistoryDbJdbcConnection" prompt="Enter the ovirt engine history JDBC connection URL." promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="jdbc:postgresql://localhost:5432/ovirt_engine_history?stringtype=unspecified"/> diff --git a/data-warehouse/history_etl/tos_project/process/ParallelRun_3.3.item b/data-warehouse/history_etl/tos_project/process/ParallelRun_3.3.item index b3df7e6..b15afb5 100644 --- a/data-warehouse/history_etl/tos_project/process/ParallelRun_3.3.item +++ b/data-warehouse/history_etl/tos_project/process/ParallelRun_3.3.item @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <talendfile:ProcessType xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"; xmlns:talendfile="platform:/resource/org.talend.model/model/TalendFile.xsd" defaultContext="Default"> <context confirmationNeeded="false" name="Default"> - <contextParameter comment="" name="etlVersion" prompt="etlVersion?" promptNeeded="false" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="3.3.3"/> + <contextParameter comment="" name="etlVersion" prompt="etlVersion?" promptNeeded="false" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="3.3.4"/> <contextParameter comment="Enter the amout of hour to keep Daily level records." name="hoursToKeepDaily" prompt="How many hours to keep of daily data?" promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_Integer" value="43800"/> <contextParameter comment="Enter the amout of hour to keep Hourly level records." name="hoursToKeepHourly" prompt="How many hours to keep of hourly data?" promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_Integer" value="1440"/> <contextParameter comment="Enter the amout of hour to keep Samples level records." name="hoursToKeepSamples" prompt="How many hours to keep of samples data?" promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_Integer" value="24"/> diff --git a/data-warehouse/historydbscripts_postgres/upgrade/pre_upgrade/set_etl_minimal_version.sql b/data-warehouse/historydbscripts_postgres/upgrade/pre_upgrade/set_etl_minimal_version.sql index 9eb7852..7899fa3 100644 --- a/data-warehouse/historydbscripts_postgres/upgrade/pre_upgrade/set_etl_minimal_version.sql +++ b/data-warehouse/historydbscripts_postgres/upgrade/pre_upgrade/set_etl_minimal_version.sql @@ -1,2 +1,2 @@ -INSERT INTO history_configuration(var_name,var_value) SELECT 'MinimalETLVersion','3.3.3' WHERE not exists (SELECT var_name FROM history_configuration WHERE var_name = 'MinimalETLVersion'); -UPDATE history_configuration SET var_value = '3.3.3' WHERE var_name = 'MinimalETLVersion'; +INSERT INTO history_configuration(var_name,var_value) SELECT 'MinimalETLVersion','3.3.4' WHERE not exists (SELECT var_name FROM history_configuration WHERE var_name = 'MinimalETLVersion'); +UPDATE history_configuration SET var_value = '3.3.4' WHERE var_name = 'MinimalETLVersion'; diff --git a/data-warehouse/pom.xml b/data-warehouse/pom.xml index 612e064..5e947b1 100644 --- a/data-warehouse/pom.xml +++ b/data-warehouse/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>ovirt_engine_dwh</groupId> <artifactId>root</artifactId> - <version>3.3.3</version> + <version>3.3.4</version> </parent> <artifactId>data-warehouse</artifactId> diff --git a/packaging/ovirt-engine-dwh.spec.in b/packaging/ovirt-engine-dwh.spec.in index 4adfe4b..920ca39 100644 --- a/packaging/ovirt-engine-dwh.spec.in +++ b/packaging/ovirt-engine-dwh.spec.in @@ -34,7 +34,7 @@ Group: Virtualization/Management URL: http://www.ovirt.org BuildArch: noarch -Source: @PACKAGE_NAME@-@[email protected] +Source: http://ovirt.org/releases/stable/src/@PACKAGE_NAME@-@[email protected] BuildRequires: jpackage-utils BuildRequires: make @@ -140,6 +140,9 @@ %config(noreplace) %attr(-, %{engine_user}, %{engine_group}) %{_sysconfdir}/ovirt-engine/%{dwh_name}/Default.properties %changelog +* Tue Feb 25 2014 Sandro Bonazzola <[email protected]> - 3.3.4-1 +- 3.3.4-1 + * Mon Feb 03 2014 Yaniv Dary <[email protected]> - 3.3 Fixed issues: - dwh-setup confusingly informs about doing upgrade when doing clean remote install (#1059270) @@ -298,7 +301,7 @@ Reverted: 913384 - Upgrade - Error Can't start the ovirt-engine-dwhd service (Upgrade from si25.4 to si27.1) -Change on the engine side caused engine DB deadlock of nested transactions attempting to update the same +Change on the engine side caused engine DB deadlock of nested transactions attempting to update the same record. Without that change this patch will not work. * Wed Mar 06 2013 Yaniv Dary <[email protected]> - 3.2.0 diff --git a/pom.xml b/pom.xml index 48ca83d..27e26da 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ <groupId>ovirt_engine_dwh</groupId> <artifactId>root</artifactId> - <version>3.3.3</version> + <version>3.3.4</version> <packaging>pom</packaging> <name>oVirt Engine DWH Root Project</name> @@ -14,7 +14,7 @@ <properties> <!-- dependency versions --> - <ovirt-dwh.version>3.3.3</ovirt-dwh.version> + <ovirt-dwh.version>3.3.4</ovirt-dwh.version> <version.commons-collections>3.2.1</version.commons-collections> <version.log4j>1.2.14</version.log4j> <version.dom4j>1.6.1</version.dom4j> diff --git a/version.mak b/version.mak index dbf484f..f991a4b 100644 --- a/version.mak +++ b/version.mak @@ -21,7 +21,7 @@ # - master # - <none> # -MILESTONE=master +MILESTONE= # RPM release is manually specified, # For pre-release: @@ -32,4 +32,4 @@ # RPM_RELEASE=N # while N is incremented each re-release # -RPM_RELEASE=0.2.$(MILESTONE).$(shell date -u +%Y%m%d%H%M%S) +RPM_RELEASE=1 -- To view, visit http://gerrit.ovirt.org/24985 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id2fe97afac0c86ae64f6dc32053aca042830c924 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
