Message ID | 20210218195112.1391467-1-blp@ovn.org |
---|---|
Headers | show |
Series | Add DDlog implementation of ovn-northd | expand |
This passed in the ovsrobot CI: https://github.com/ovsrobot/ovn/actions/runs/579307688 I think that we have arrived at consensus to push this to ovn master after branching happens tomorrow. Please, let me know if I misunderstood!
On Fri, Feb 19, 2021 at 4:10 AM Ben Pfaff <blp@ovn.org> wrote: > > This passed in the ovsrobot CI: > https://github.com/ovsrobot/ovn/actions/runs/579307688 > > I think that we have arrived at consensus to push this to ovn master > after branching happens tomorrow. Please, let me know if I > misunderstood! I think understanding is correct. I think Mark needs to create the branch. Thanks Numan > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
On Tue, Feb 23, 2021 at 4:10 PM Numan Siddique <numans@ovn.org> wrote: > > On Fri, Feb 19, 2021 at 4:10 AM Ben Pfaff <blp@ovn.org> wrote: > > > > This passed in the ovsrobot CI: > > https://github.com/ovsrobot/ovn/actions/runs/579307688 > > > > I think that we have arrived at consensus to push this to ovn master > > after branching happens tomorrow. Please, let me know if I > > misunderstood! > > I think understanding is correct. I think Mark needs to create the branch. Hi Ben, I am trying to compile with ddlog configured, but the compilation is failing for me for some reason. Can you please help me with this ? I tried both on Fedora 33 and also on ubuntu. Below is the log ---- vagrant@vagrant:~/ovs/ovn$ make cd . && /bin/bash /home/vagrant/ovs/ovn/build-aux/missing automake-1.16 --foreign Makefile cd . && /bin/bash ./config.status Makefile depfiles config.status: creating Makefile config.status: executing depfiles commands PYTHONPATH=/home/vagrant/ovs/ovn/ovs/python":"$PYTHONPATH PYTHONDONTWRITEBYTECODE=yes /usr/bin/python3 /home/vagrant/ovs/ovn/ovs/ovsdb/ovsdb-idlc.in annotate ./ovn-sb.ovsschema ./lib/ovn-sb-idl.ann > lib/ovn-sb-idl.ovsidl.tmp && \ mv lib/ovn-sb-idl.ovsidl.tmp lib/ovn-sb-idl.ovsidl PYTHONPATH=/home/vagrant/ovs/ovn/ovs/python":"$PYTHONPATH PYTHONDONTWRITEBYTECODE=yes /usr/bin/python3 /home/vagrant/ovs/ovn/ovs/ovsdb/ovsdb-idlc.in c-idl-source lib/ovn-sb-idl.ovsidl > lib/ovn-sb-idl.c.tmp && mv lib/ovn-sb-idl.c.tmp lib/ovn-sb-idl.c PYTHONPATH=/home/vagrant/ovs/ovn/ovs/python":"$PYTHONPATH PYTHONDONTWRITEBYTECODE=yes /usr/bin/python3 /home/vagrant/ovs/ovn/ovs/ovsdb/ovsdb-idlc.in c-idl-header lib/ovn-sb-idl.ovsidl > lib/ovn-sb-idl.h.tmp && mv lib/ovn-sb-idl.h.tmp lib/ovn-sb-idl.h PYTHONPATH=/home/vagrant/ovs/ovn/ovs/python":"$PYTHONPATH PYTHONDONTWRITEBYTECODE=yes /usr/bin/python3 ./northd/ovsdb2ddlog2c -p sb_ -f ovn-sb.ovsschema --output-file northd/ovn-northd-ddlog-sb.inc $(cat ./northd/ovn-sb.dlopts) PYTHONPATH=/home/vagrant/ovs/ovn/ovs/python":"$PYTHONPATH PYTHONDONTWRITEBYTECODE=yes /usr/bin/python3 ./northd/ovsdb2ddlog2c -p nb_ -f ovn-nb.ovsschema --output-file northd/ovn-northd-ddlog-nb.inc $(cat ./northd/ovn-nb.dlopts) ddlog -i northd/ovn_northd.dl -o ./northd -L /home/vagrant/.local/ddlog/lib -L ./northd error: module 'OVN_Northbound' imported by northd/ovn_northd.dl not found. Paths searched: /home/vagrant/ovs/ovn/northd/OVN_Northbound.dl /home/vagrant/.local/ddlog/lib/OVN_Northbound.dl ----- For some reason the below target define in northd/automake.mk is not getting invoked ---- northd/OVN_Northbound.dl: ovn-nb.ovsschema northd/ovn-nb.dlopts $(AM_V_GEN)ovsdb2ddlog -f $< --output-file $@ $(nb_opts) ---- FYI - The branch-21.03 is now created and I think we can accept these patches. Thanks Numan > > Thanks > Numan > > > _______________________________________________ > > dev mailing list > > dev@openvswitch.org > > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > >
On Tue, Feb 23, 2021 at 7:38 PM Numan Siddique <numans@ovn.org> wrote: > > On Tue, Feb 23, 2021 at 4:10 PM Numan Siddique <numans@ovn.org> wrote: > > > > On Fri, Feb 19, 2021 at 4:10 AM Ben Pfaff <blp@ovn.org> wrote: > > > > > > This passed in the ovsrobot CI: > > > https://github.com/ovsrobot/ovn/actions/runs/579307688 > > > > > > I think that we have arrived at consensus to push this to ovn master > > > after branching happens tomorrow. Please, let me know if I > > > misunderstood! > > > > I think understanding is correct. I think Mark needs to create the branch. > > Hi Ben, > > I am trying to compile with ddlog configured, but the compilation is > failing for me > for some reason. Can you please help me with this ? > > I tried both on Fedora 33 and also on ubuntu. > > Below is the log > > ---- > vagrant@vagrant:~/ovs/ovn$ make > cd . && /bin/bash /home/vagrant/ovs/ovn/build-aux/missing > automake-1.16 --foreign Makefile > cd . && /bin/bash ./config.status Makefile depfiles > config.status: creating Makefile > config.status: executing depfiles commands > PYTHONPATH=/home/vagrant/ovs/ovn/ovs/python":"$PYTHONPATH > PYTHONDONTWRITEBYTECODE=yes /usr/bin/python3 > /home/vagrant/ovs/ovn/ovs/ovsdb/ovsdb-idlc.in annotate > ./ovn-sb.ovsschema ./lib/ovn-sb-idl.ann > lib/ovn-sb-idl.ovsidl.tmp && > \ > mv lib/ovn-sb-idl.ovsidl.tmp lib/ovn-sb-idl.ovsidl > PYTHONPATH=/home/vagrant/ovs/ovn/ovs/python":"$PYTHONPATH > PYTHONDONTWRITEBYTECODE=yes /usr/bin/python3 > /home/vagrant/ovs/ovn/ovs/ovsdb/ovsdb-idlc.in c-idl-source > lib/ovn-sb-idl.ovsidl > lib/ovn-sb-idl.c.tmp && mv > lib/ovn-sb-idl.c.tmp lib/ovn-sb-idl.c > PYTHONPATH=/home/vagrant/ovs/ovn/ovs/python":"$PYTHONPATH > PYTHONDONTWRITEBYTECODE=yes /usr/bin/python3 > /home/vagrant/ovs/ovn/ovs/ovsdb/ovsdb-idlc.in c-idl-header > lib/ovn-sb-idl.ovsidl > lib/ovn-sb-idl.h.tmp && mv > lib/ovn-sb-idl.h.tmp lib/ovn-sb-idl.h > PYTHONPATH=/home/vagrant/ovs/ovn/ovs/python":"$PYTHONPATH > PYTHONDONTWRITEBYTECODE=yes /usr/bin/python3 ./northd/ovsdb2ddlog2c -p > sb_ -f ovn-sb.ovsschema --output-file northd/ovn-northd-ddlog-sb.inc > $(cat ./northd/ovn-sb.dlopts) > PYTHONPATH=/home/vagrant/ovs/ovn/ovs/python":"$PYTHONPATH > PYTHONDONTWRITEBYTECODE=yes /usr/bin/python3 ./northd/ovsdb2ddlog2c -p > nb_ -f ovn-nb.ovsschema --output-file northd/ovn-northd-ddlog-nb.inc > $(cat ./northd/ovn-nb.dlopts) > ddlog -i northd/ovn_northd.dl -o ./northd -L > /home/vagrant/.local/ddlog/lib -L ./northd > > error: module 'OVN_Northbound' imported by northd/ovn_northd.dl not > found. Paths searched: > /home/vagrant/ovs/ovn/northd/OVN_Northbound.dl > /home/vagrant/.local/ddlog/lib/OVN_Northbound.dl > ----- > > For some reason the below target define in northd/automake.mk is not > getting invoked > ---- > northd/OVN_Northbound.dl: ovn-nb.ovsschema northd/ovn-nb.dlopts > $(AM_V_GEN)ovsdb2ddlog -f $< --output-file $@ $(nb_opts) > ---- > I worked around the problem by manually running -- nb_opts=$(cat northd/ovn-nb.dlopts) ovsdb2ddlog -f ovn-nb.ovsschema --output-file northd/OVN_Northbound.dl $nb_opts sb_opts=$(cat northd/ovn-sb.dlopts) ovsdb2ddlog -f ovn-sb.ovsschema --output-file northd/OVN_Soutbound.dl $sb_opts --- Thanks Numan > FYI - The branch-21.03 is now created and I think we can accept these patches. > > Thanks > Numan > > > > > Thanks > > Numan > > > > > _______________________________________________ > > > dev mailing list > > > dev@openvswitch.org > > > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > > >
On Tue, Feb 23, 2021 at 07:38:12PM +0530, Numan Siddique wrote: > On Tue, Feb 23, 2021 at 4:10 PM Numan Siddique <numans@ovn.org> wrote: > > > > On Fri, Feb 19, 2021 at 4:10 AM Ben Pfaff <blp@ovn.org> wrote: > > > > > > This passed in the ovsrobot CI: > > > https://github.com/ovsrobot/ovn/actions/runs/579307688 > > > > > > I think that we have arrived at consensus to push this to ovn master > > > after branching happens tomorrow. Please, let me know if I > > > misunderstood! > > > > I think understanding is correct. I think Mark needs to create the branch. > > Hi Ben, > > I am trying to compile with ddlog configured, but the compilation is > failing for me > for some reason. Can you please help me with this ? Oops. I made a dumb typo. It didn't show up in my testing because I guess a -j12 build typically built OVN_Northbound.dl and OVN_Southbound.dl early enough. Here's the fix: diff --git a/northd/automake.mk b/northd/automake.mk index 17c394c82082..d64d1d197c77 100644 --- a/northd/automake.mk +++ b/northd/automake.mk @@ -29,7 +29,7 @@ ddlog_sources = \ northd/ovn.dl \ northd/ovn.rs \ northd/helpers.dl -ddlog_nodist_source = \ +ddlog_nodist_sources = \ northd/OVN_Northbound.dl \ northd/OVN_Southbound.dl
On Tue, Feb 23, 2021 at 11:16 PM Ben Pfaff <blp@ovn.org> wrote: > > On Tue, Feb 23, 2021 at 07:38:12PM +0530, Numan Siddique wrote: > > On Tue, Feb 23, 2021 at 4:10 PM Numan Siddique <numans@ovn.org> wrote: > > > > > > On Fri, Feb 19, 2021 at 4:10 AM Ben Pfaff <blp@ovn.org> wrote: > > > > > > > > This passed in the ovsrobot CI: > > > > https://github.com/ovsrobot/ovn/actions/runs/579307688 > > > > > > > > I think that we have arrived at consensus to push this to ovn master > > > > after branching happens tomorrow. Please, let me know if I > > > > misunderstood! > > > > > > I think understanding is correct. I think Mark needs to create the branch. > > > > Hi Ben, > > > > I am trying to compile with ddlog configured, but the compilation is > > failing for me > > for some reason. Can you please help me with this ? > > Oops. I made a dumb typo. It didn't show up in my testing because I > guess a -j12 build typically built OVN_Northbound.dl and > OVN_Southbound.dl early enough. Here's the fix: > > diff --git a/northd/automake.mk b/northd/automake.mk > index 17c394c82082..d64d1d197c77 100644 > --- a/northd/automake.mk > +++ b/northd/automake.mk > @@ -29,7 +29,7 @@ ddlog_sources = \ > northd/ovn.dl \ > northd/ovn.rs \ > northd/helpers.dl > -ddlog_nodist_source = \ > +ddlog_nodist_sources = \ > northd/OVN_Northbound.dl \ > northd/OVN_Southbound.dl Thank you. It works. For the whole series Acked-by: Numan Siddique <numans@ovn.org> Unfortunately because of a couple of recent commits [1], you have to rebase the code and you may have to add some more code in northd-ddlog to sync up with c northd. [1] - https://github.com/ovn-org/ovn/commit/679d3550303ad1e5998e56bbcc63e9c4948522fc https://github.com/ovn-org/ovn/commit/dd94f1266ca4f3c750bc59c474ea342ef3ff9983 https://github.com/ovn-org/ovn/commit/f1f0de254157520a1bc754744e258eff9017a145 Thanks Numan > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
On Wed, Feb 24, 2021 at 12:40:17AM +0530, Numan Siddique wrote: > On Tue, Feb 23, 2021 at 11:16 PM Ben Pfaff <blp@ovn.org> wrote: > > > > On Tue, Feb 23, 2021 at 07:38:12PM +0530, Numan Siddique wrote: > > > On Tue, Feb 23, 2021 at 4:10 PM Numan Siddique <numans@ovn.org> wrote: > > > > > > > > On Fri, Feb 19, 2021 at 4:10 AM Ben Pfaff <blp@ovn.org> wrote: > > > > > > > > > > This passed in the ovsrobot CI: > > > > > https://github.com/ovsrobot/ovn/actions/runs/579307688 > > > > > > > > > > I think that we have arrived at consensus to push this to ovn master > > > > > after branching happens tomorrow. Please, let me know if I > > > > > misunderstood! > > > > > > > > I think understanding is correct. I think Mark needs to create the branch. > > > > > > Hi Ben, > > > > > > I am trying to compile with ddlog configured, but the compilation is > > > failing for me > > > for some reason. Can you please help me with this ? > > > > Oops. I made a dumb typo. It didn't show up in my testing because I > > guess a -j12 build typically built OVN_Northbound.dl and > > OVN_Southbound.dl early enough. Here's the fix: > > > > diff --git a/northd/automake.mk b/northd/automake.mk > > index 17c394c82082..d64d1d197c77 100644 > > --- a/northd/automake.mk > > +++ b/northd/automake.mk > > @@ -29,7 +29,7 @@ ddlog_sources = \ > > northd/ovn.dl \ > > northd/ovn.rs \ > > northd/helpers.dl > > -ddlog_nodist_source = \ > > +ddlog_nodist_sources = \ > > northd/OVN_Northbound.dl \ > > northd/OVN_Southbound.dl > > Thank you. It works. > > For the whole series > Acked-by: Numan Siddique <numans@ovn.org> > > Unfortunately because of a couple of recent commits [1], you have to > rebase the code and you may have to add some more code in northd-ddlog to > sync up with c northd. Thanks so much. I rebased, added the missing features, tested, fixed my bugs, and applied this series to OVN master.
On Thu, Feb 25, 2021 at 12:35 PM Ben Pfaff <blp@ovn.org> wrote: > > On Wed, Feb 24, 2021 at 12:40:17AM +0530, Numan Siddique wrote: > > On Tue, Feb 23, 2021 at 11:16 PM Ben Pfaff <blp@ovn.org> wrote: > > > > > > On Tue, Feb 23, 2021 at 07:38:12PM +0530, Numan Siddique wrote: > > > > On Tue, Feb 23, 2021 at 4:10 PM Numan Siddique <numans@ovn.org> wrote: > > > > > > > > > > On Fri, Feb 19, 2021 at 4:10 AM Ben Pfaff <blp@ovn.org> wrote: > > > > > > > > > > > > This passed in the ovsrobot CI: > > > > > > https://github.com/ovsrobot/ovn/actions/runs/579307688 > > > > > > > > > > > > I think that we have arrived at consensus to push this to ovn master > > > > > > after branching happens tomorrow. Please, let me know if I > > > > > > misunderstood! > > > > > > > > > > I think understanding is correct. I think Mark needs to create the branch. > > > > > > > > Hi Ben, > > > > > > > > I am trying to compile with ddlog configured, but the compilation is > > > > failing for me > > > > for some reason. Can you please help me with this ? > > > > > > Oops. I made a dumb typo. It didn't show up in my testing because I > > > guess a -j12 build typically built OVN_Northbound.dl and > > > OVN_Southbound.dl early enough. Here's the fix: > > > > > > diff --git a/northd/automake.mk b/northd/automake.mk > > > index 17c394c82082..d64d1d197c77 100644 > > > --- a/northd/automake.mk > > > +++ b/northd/automake.mk > > > @@ -29,7 +29,7 @@ ddlog_sources = \ > > > northd/ovn.dl \ > > > northd/ovn.rs \ > > > northd/helpers.dl > > > -ddlog_nodist_source = \ > > > +ddlog_nodist_sources = \ > > > northd/OVN_Northbound.dl \ > > > northd/OVN_Southbound.dl > > > > Thank you. It works. > > > > For the whole series > > Acked-by: Numan Siddique <numans@ovn.org> > > > > Unfortunately because of a couple of recent commits [1], you have to > > rebase the code and you may have to add some more code in northd-ddlog to > > sync up with c northd. > > Thanks so much. I rebased, added the missing features, tested, fixed my > bugs, and applied this series to OVN master. Thanks to you, Leonid and Justin for adding the ddlog support. Numan > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >