<div dir="ltr"><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">Hi,<br><br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">here's fix for current situation [2], but we really need to merge [1] asap.<br><br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">Thanks<br><br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">Martin<br><br>[2] <a href="https://gerrit.ovirt.org/#/c/59459/">https://gerrit.ovirt.org/#/c/59459/</a><br><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Jun 19, 2016 at 4:15 PM, Eli Mesika <span dir="ltr"><<a href="mailto:emesika@redhat.com" target="_blank">emesika@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div style="font-size:large">Hi<br>Once this [1] is merged , I will send email to all to start using 04_01 prefix on master <br><br>[1] <a href="https://gerrit.ovirt.org/#/c/59231/" target="_blank">https://gerrit.ovirt.org/#/c/59231/</a><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Jun 19, 2016 at 4:19 PM, Yedidyah Bar David <span dir="ltr"><<a href="mailto:didi@redhat.com" target="_blank">didi@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Thu, Jun 9, 2016 at 10:42 PM, Martin Perina <<a href="mailto:mperina@redhat.com" target="_blank">mperina@redhat.com</a>> wrote:<br>
> Hi,<br>
><br>
> here's patch that should fix 4.0 -> master upgrade issue for now:<br>
><br>
> <a href="https://gerrit.ovirt.org/58936" rel="noreferrer" target="_blank">https://gerrit.ovirt.org/58936</a><br>
<br>
Still broken with same issue - cluster table has no col mac_pool_id.<br>
<br>
Current status is:<br>
<br>
master branch has: 04_00_0750_add_mac_pool_id_to_vds_group.sql<br>
4.0 branch does not have this file, nor another with same content.<br>
However, it does have: 04_00_0750_change_cluster_default_policy.sql<br>
<br>
So on 4.0 setup, this file is ran, and this fact is saved in the db.<br>
<br>
On upgrade to master, the function _dbfunc_common_schema_upgrade<br>
loops over all upgrade scripts, but ignores those with lower version<br>
than "current" (last script processed, supposedly in a previous run).<br>
Pushed a patch [1] to show them. In the logs of current failure [2],<br>
"current" was probably 0750 - guessing this from the setup log, which<br>
has:<br>
<br>
Dropping materialized views...<br>
Running upgrade sql script<br>
'/usr/share/ovirt-engine/dbscripts/upgrade/04_00_0760_empty_current_cd_to_null.sql'...<br>
<br>
So 0750 was never ran.<br>
<br>
Not sure what's the best fix:<br>
1. Stop pushing to master scripts with 04_00, start using 04_01<br>
2. In master, rename 04_00_0810_change_cluster_default_policy.sql<br>
to 04_00_0750_change_cluster_default_policy.sql , which is the<br>
last one in 4.0 (all till 0750 seem ok, following Martin's previous<br>
rename patches).<br>
3. In master, rename these to have 04_01 prefix:<br>
04_00_0750_add_mac_pool_id_to_vds_group.sql<br>
04_00_0760_empty_current_cd_to_null.sql<br>
04_00_0770_remove_mac_pool_id_from_storage_pool.sql<br>
04_00_0780_move_guest_mem_fields_to_statistics.sql<br>
04_00_0790_remove_el7_upgrade_policy_units.sql<br>
04_00_0800_add_switch_type_to_vds_interface_and_cluster.sql<br>
4. Do something that will prevent such things in the future, not sure what.<br>
<br>
[1] <a href="https://gerrit.ovirt.org/59441" rel="noreferrer" target="_blank">https://gerrit.ovirt.org/59441</a><br>
[2] <a href="http://jenkins.ovirt.org/job/ovirt-engine_master_upgrade-from-4.0_el7_merged/243/" rel="noreferrer" target="_blank">http://jenkins.ovirt.org/job/ovirt-engine_master_upgrade-from-4.0_el7_merged/243/</a><br>
<br>
><br>
><br>
> Martin<br>
><br>
><br>
> On Thu, Jun 9, 2016 at 5:04 PM, Martin Perina <<a href="mailto:mperina@redhat.com" target="_blank">mperina@redhat.com</a>> wrote:<br>
>><br>
>> It seems to me, that our 4.0 upgrade scripts in master and<br>
>> ovirt-engine-4.0 are not in sync again. I will investigate and post a new<br>
>> fix for that.<br>
>><br>
>> This issue will be definitely fixed next week, when Eli posts a patch<br>
>> bumping database version to 4.1 on master branch.<br>
>><br>
>> Martin<br>
>><br>
>><br>
>> On Thu, Jun 9, 2016 at 4:59 PM, Yedidyah Bar David <<a href="mailto:didi@redhat.com" target="_blank">didi@redhat.com</a>><br>
>> wrote:<br>
>>><br>
>>> On Thu, Jun 9, 2016 at 5:38 PM, Jenkins CI <<a href="mailto:gerrit2@gerrit.ovirt.org" target="_blank">gerrit2@gerrit.ovirt.org</a>><br>
>>> wrote:<br>
>>> > Jenkins CI has posted comments on this change.<br>
>>> ><br>
>>> > Change subject: packaging: setup: Always update ovirt-engine-dashboard<br>
>>> > ......................................................................<br>
>>> ><br>
>>> ><br>
>>> > Patch Set 3:<br>
>>> ><br>
>>> > Build Failed<br>
>>> ><br>
>>> ><br>
>>> > <a href="http://jenkins.ovirt.org/job/ovirt-engine_master_upgrade-from-4.0_el7_merged/150/" rel="noreferrer" target="_blank">http://jenkins.ovirt.org/job/ovirt-engine_master_upgrade-from-4.0_el7_merged/150/</a><br>
>>> > : FAILURE<br>
>>><br>
>>> In server.log:<br>
>>><br>
>>> Caused by: org.postgresql.util.PSQLException: ERROR: column<br>
>>> c.mac_pool_id does not exist<br>
>>><br>
>>> It seems like it was supposed to be fixed by:<br>
>>><br>
>>> <a href="https://gerrit.ovirt.org/58604" rel="noreferrer" target="_blank">https://gerrit.ovirt.org/58604</a><br>
>>><br>
>>> In ovirt-engine-setup-20160609142049-s4dyhe.log I see:<br>
>>><br>
>>> Skipping upgrade script<br>
>>><br>
>>> /usr/share/ovirt-engine/dbscripts/upgrade/04_00_0770_remove_filter_from_passthrough_vnics.sql,<br>
>>> already installed by 04000730<br>
>>><br>
>>> And I see no mention of 0720 anywhere there.<br>
>>><br>
>>> Adding also Eli.<br>
>>><br>
>>> ><br>
>>> ><br>
>>> > <a href="http://jenkins.ovirt.org/job/ovirt-engine_master_check-merged-el7-x86_64/600/" rel="noreferrer" target="_blank">http://jenkins.ovirt.org/job/ovirt-engine_master_check-merged-el7-x86_64/600/</a><br>
>>> > : SUCCESS<br>
>>> ><br>
>>> ><br>
>>> > <a href="http://jenkins.ovirt.org/job/ovirt-engine_master_check-merged-fc23-x86_64/600/" rel="noreferrer" target="_blank">http://jenkins.ovirt.org/job/ovirt-engine_master_check-merged-fc23-x86_64/600/</a><br>
>>> > : SUCCESS<br>
>>> ><br>
>>> ><br>
>>> > <a href="http://jenkins.ovirt.org/job/ovirt-engine_master_upgrade-from-master_el7_merged/615/" rel="noreferrer" target="_blank">http://jenkins.ovirt.org/job/ovirt-engine_master_upgrade-from-master_el7_merged/615/</a><br>
>>> > : SUCCESS<br>
>>> ><br>
>>> > --<br>
>>> > To view, visit <a href="https://gerrit.ovirt.org/58629" rel="noreferrer" target="_blank">https://gerrit.ovirt.org/58629</a><br>
>>> > To unsubscribe, visit <a href="https://gerrit.ovirt.org/settings" rel="noreferrer" target="_blank">https://gerrit.ovirt.org/settings</a><br>
>>> ><br>
>>> > Gerrit-MessageType: comment<br>
>>> > Gerrit-Change-Id: I21d9bc56278c720ddfc26b00f8bb64932fbab465<br>
>>> > Gerrit-PatchSet: 3<br>
>>> > Gerrit-Project: ovirt-engine<br>
>>> > Gerrit-Branch: master<br>
>>> > Gerrit-Owner: Yedidyah Bar David <<a href="mailto:didi@redhat.com" target="_blank">didi@redhat.com</a>><br>
>>> > Gerrit-Reviewer: Jenkins CI<br>
>>> > Gerrit-Reviewer: Martin Peřina <<a href="mailto:mperina@redhat.com" target="_blank">mperina@redhat.com</a>><br>
>>> > Gerrit-Reviewer: Simone Tiraboschi <<a href="mailto:stirabos@redhat.com" target="_blank">stirabos@redhat.com</a>><br>
>>> > Gerrit-Reviewer: Yedidyah Bar David <<a href="mailto:didi@redhat.com" target="_blank">didi@redhat.com</a>><br>
>>> > Gerrit-Reviewer: gerrit-hooks <<a href="mailto:automation@ovirt.org" target="_blank">automation@ovirt.org</a>><br>
>>> > Gerrit-HasComments: No<br>
>>><br>
>>><br>
<span><font color="#888888">>>><br>
>>> --<br>
>>> Didi<br>
>><br>
>><br>
><br>
<br>
<br><span class=""><font color="#888888">
<br>
--<br>
Didi<br>
</font></span></font></span></blockquote></div><br></div>
</blockquote></div><br></div></div>