Hi
Once this [1] is merged , I will send email to all to start using 04_01 prefix on master

[1] https://gerrit.ovirt.org/#/c/59231/

On Sun, Jun 19, 2016 at 4:19 PM, Yedidyah Bar David <didi@redhat.com> wrote:

On Thu, Jun 9, 2016 at 10:42 PM, Martin Perina <mperina@redhat.com> wrote:
> Hi,
>
> here's patch that should fix 4.0 -> master upgrade issue for now:
>
> https://gerrit.ovirt.org/58936

Still broken with same issue - cluster table has no col mac_pool_id.

Current status is:

master branch has: 04_00_0750_add_mac_pool_id_to_vds_group.sql
4.0 branch does not have this file, nor another with same content.
However, it does have: 04_00_0750_change_cluster_default_policy.sql

So on 4.0 setup, this file is ran, and this fact is saved in the db.

On upgrade to master, the function _dbfunc_common_schema_upgrade
loops over all upgrade scripts, but ignores those with lower version
than "current" (last script processed, supposedly in a previous run).
Pushed a patch [1] to show them. In the logs of current failure [2],
"current" was probably 0750 - guessing this from the setup log, which
has:

Dropping materialized views...
Running upgrade sql script
'/usr/share/ovirt-engine/dbscripts/upgrade/04_00_0760_empty_current_cd_to_null.sql'...

So 0750 was never ran.

Not sure what's the best fix:
1. Stop pushing to master scripts with 04_00, start using 04_01
2. In master, rename 04_00_0810_change_cluster_default_policy.sql
to 04_00_0750_change_cluster_default_policy.sql , which is the
last one in 4.0 (all till 0750 seem ok, following Martin's previous
rename patches).
3. In master, rename these to have 04_01 prefix:
04_00_0750_add_mac_pool_id_to_vds_group.sql
04_00_0760_empty_current_cd_to_null.sql
04_00_0770_remove_mac_pool_id_from_storage_pool.sql
04_00_0780_move_guest_mem_fields_to_statistics.sql
04_00_0790_remove_el7_upgrade_policy_units.sql
04_00_0800_add_switch_type_to_vds_interface_and_cluster.sql
4. Do something that will prevent such things in the future, not sure what.

[1] https://gerrit.ovirt.org/59441
[2] http://jenkins.ovirt.org/job/ovirt-engine_master_upgrade-from-4.0_el7_merged/243/

>
>
> Martin
>
>
> On Thu, Jun 9, 2016 at 5:04 PM, Martin Perina <mperina@redhat.com> wrote:
>>
>> It seems to me, that our 4.0 upgrade scripts in master and
>> ovirt-engine-4.0 are not in sync again. I will investigate and post a new
>> fix for that.
>>
>> This issue will be definitely fixed next week, when Eli posts a patch
>> bumping database version to 4.1 on master branch.
>>
>> Martin
>>
>>
>> On Thu, Jun 9, 2016 at 4:59 PM, Yedidyah Bar David <didi@redhat.com>
>> wrote:
>>>
>>> On Thu, Jun 9, 2016 at 5:38 PM, Jenkins CI <gerrit2@gerrit.ovirt.org>
>>> wrote:
>>> > Jenkins CI has posted comments on this change.
>>> >
>>> > Change subject: packaging: setup: Always update ovirt-engine-dashboard
>>> > ......................................................................
>>> >
>>> >
>>> > Patch Set 3:
>>> >
>>> > Build Failed
>>> >
>>> >
>>> > http://jenkins.ovirt.org/job/ovirt-engine_master_upgrade-from-4.0_el7_merged/150/
>>> > : FAILURE
>>>
>>> In server.log:
>>>
>>> Caused by: org.postgresql.util.PSQLException: ERROR: column
>>> c.mac_pool_id does not exist
>>>
>>> It seems like it was supposed to be fixed by:
>>>
>>> https://gerrit.ovirt.org/58604
>>>
>>> In ovirt-engine-setup-20160609142049-s4dyhe.log I see:
>>>
>>> Skipping upgrade script
>>>
>>> /usr/share/ovirt-engine/dbscripts/upgrade/04_00_0770_remove_filter_from_passthrough_vnics.sql,
>>> already installed by 04000730
>>>
>>> And I see no mention of 0720 anywhere there.
>>>
>>> Adding also Eli.
>>>
>>> >
>>> >
>>> > http://jenkins.ovirt.org/job/ovirt-engine_master_check-merged-el7-x86_64/600/
>>> > : SUCCESS
>>> >
>>> >
>>> > http://jenkins.ovirt.org/job/ovirt-engine_master_check-merged-fc23-x86_64/600/
>>> > : SUCCESS
>>> >
>>> >
>>> > http://jenkins.ovirt.org/job/ovirt-engine_master_upgrade-from-master_el7_merged/615/
>>> > : SUCCESS
>>> >
>>> > --
>>> > To view, visit https://gerrit.ovirt.org/58629
>>> > To unsubscribe, visit https://gerrit.ovirt.org/settings
>>> >
>>> > Gerrit-MessageType: comment
>>> > Gerrit-Change-Id: I21d9bc56278c720ddfc26b00f8bb64932fbab465
>>> > Gerrit-PatchSet: 3
>>> > Gerrit-Project: ovirt-engine
>>> > Gerrit-Branch: master
>>> > Gerrit-Owner: Yedidyah Bar David <didi@redhat.com>
>>> > Gerrit-Reviewer: Jenkins CI
>>> > Gerrit-Reviewer: Martin Peřina <mperina@redhat.com>
>>> > Gerrit-Reviewer: Simone Tiraboschi <stirabos@redhat.com>
>>> > Gerrit-Reviewer: Yedidyah Bar David <didi@redhat.com>
>>> > Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>
>>> > Gerrit-HasComments: No
>>>
>>>
>>>
>>> --
>>> Didi
>>
>>
>



--
Didi