| Message ID | 1534145820-119903-21-git-send-email-hzhou8@ebay.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ovn-controller incremental processing | expand |
Bleep bloop. Greetings Han Zhou, I am a robot and I have tried out your patch. Thanks for your contribution. I encountered some error that I wasn't expecting. See the details below. git-am: fatal: sha1 information is lacking or useless (tests/ovn-performance.at). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 ovn-performance.at: Test port group incremental processing. The copy of the patch that failed is found in: /var/lib/jenkins/jobs/upstream_build_from_pw/workspace/.git/rebase-apply/patch When you have resolved this problem, run "git am --resolved". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Please check this out. If you feel there has been an error, please email aconole@bytheb.org Thanks, 0-day Robot
On Mon, Aug 13, 2018 at 1:06 AM, 0-day Robot <robot@bytheb.org> wrote: > > Bleep bloop. Greetings Han Zhou, I am a robot and I have tried out your patch. > Thanks for your contribution. > > I encountered some error that I wasn't expecting. See the details below. > > > git-am: > fatal: sha1 information is lacking or useless (tests/ovn-performance.at). > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. > Patch failed at 0001 ovn-performance.at: Test port group incremental processing. > The copy of the patch that failed is found in: > /var/lib/jenkins/jobs/upstream_build_from_pw/workspace/.git/rebase-apply/patch > When you have resolved this problem, run "git am --resolved". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > > > Please check this out. If you feel there has been an error, please email aconole@bytheb.org > > Thanks, > 0-day Robot This should not fail if patching following the order of the patch series, unless it skipped the 2 patches authored by Jakub.
Han Zhou <zhouhan@gmail.com> writes: > On Mon, Aug 13, 2018 at 1:06 AM, 0-day Robot <robot@bytheb.org> wrote: >> >> Bleep bloop. Greetings Han Zhou, I am a robot and I have tried out your > patch. >> Thanks for your contribution. >> >> I encountered some error that I wasn't expecting. See the details below. >> >> >> git-am: >> fatal: sha1 information is lacking or useless (tests/ovn-performance.at). >> Repository lacks necessary blobs to fall back on 3-way merge. >> Cannot fall back to three-way merge. >> Patch failed at 0001 ovn-performance.at: Test port group incremental > processing. >> The copy of the patch that failed is found in: >> > /var/lib/jenkins/jobs/upstream_build_from_pw/workspace/.git/rebase-apply/patch >> When you have resolved this problem, run "git am --resolved". >> If you prefer to skip this patch, run "git am --skip" instead. >> To restore the original branch and stop patching, run "git am --abort". >> >> >> Please check this out. If you feel there has been an error, please email > aconole@bytheb.org >> >> Thanks, >> 0-day Robot > > This should not fail if patching following the order of the patch series, > unless it skipped the 2 patches authored by Jakub. So, the curl response the bot received from the patchwork server is missing patch 19, which explains why the bot failed to apply this. It looks like the bot grabbed the series, but for some reason patchwork hadn't seen the final patch yet (possibly stuck processing): "total":20,"received_total":19 It's strange, because the times are so far apart. I'll put in a catch for this case and make the bot resubmit the job when this happens. Sorry for the noise.
diff --git a/tests/ovn-performance.at b/tests/ovn-performance.at index 671dd6e..6a213eb 100644 --- a/tests/ovn-performance.at +++ b/tests/ovn-performance.at @@ -279,6 +279,12 @@ for i in 1 2; do ) done +get_lsp_uuid () { + ovn-nbctl lsp-list ls${1#lp} | grep $1 | awk '{ print $1 }' +} + +pg_ports= + for i in 1 2; do j=$((i%2 + 1)) as=as$i @@ -291,6 +297,9 @@ for i in 1 2; do [hv1 hv2], [lflow_run], [ovn-nbctl --wait=hv lsp-add $ls $lp] ) + + pg_ports="$pg_port `get_lsp_uuid $lp`" + OVN_CONTROLLER_EXPECT_NO_HIT( [hv1 hv2], [lflow_run], [ovn-nbctl --wait=hv lsp-set-addresses $lp "dynamic"] @@ -341,12 +350,6 @@ for i in 1 2; do ls=ls$i lp=lp$i - # Delete port $lp - OVN_CONTROLLER_EXPECT_HIT_COND( - [hv$i hv$j], [lflow_run], [>0 =0], - [ovn-nbctl --wait=hv lsp-del $lp] - ) - # Delete ACLs for port $lp OVN_CONTROLLER_EXPECT_NO_HIT( [hv1 hv2], [lflow_run], @@ -368,6 +371,34 @@ for i in 1 2; do ) done +OVN_CONTROLLER_EXPECT_NO_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv create Port_Group name=pg1 ports=\"$pg_ports\"] +) + +# Add ACLs for port group pg1 +OVN_CONTROLLER_EXPECT_NO_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv acl-add pg1 to-lport 1001 'outport == @pg1 && ip4.src == $pg1_ip4' allow] +) + +for i in 1 2; do + j=$((i%2 + 1)) + lp=lp$i + + # Delete port $lp + OVN_CONTROLLER_EXPECT_HIT_COND( + [hv$i hv$j], [lflow_run], [>0 =0], + [ovn-nbctl --wait=hv lsp-del $lp] + ) +done + +# Delete port group pg1 +OVN_CONTROLLER_EXPECT_NO_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv destroy Port_Group pg1] +) + for i in 1 2; do ls=ls$i
Add tests to make sure port group change doesn't trigger recomputing. Signed-off-by: Han Zhou <hzhou8@ebay.com> --- tests/ovn-performance.at | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-)