Message ID | 20210121173025.413591-1-i.maximets@ovn.org |
---|---|
State | Accepted |
Headers | show |
Series | [ovs-dev] sandbox: Fix path to Sb DB socket for ovn-controller-vtep. | expand |
On Thu, Jan 21, 2021 at 9:30 AM Ilya Maximets <i.maximets@ovn.org> wrote: > > There was a race between > commit ff4439dbdbc0 ("Build OVN using external OVS directory") and > commit 381c9319b1f0 ("ovn-ic: Interconnection controller with AZ registeration.") > Both touched sandbox code, but were accepted in the oppisite order > to one they were prepared and sent to the mail list. > > This led to the case where new code from the first commit wasn't > updated by the second one leaving ovn-controller-vtep with > incorrect Southbound DB socket configuration, so it doesn't > work inside the sandbox: > > sandbox/ovn-controller-vtep.log: > |reconnect|INFO|unix:ovn/tutorial/sandbox/ovnsb_db.sock: > connection attempt failed (No such file or directory) > > Fixes: 381c9319b1f0 ("ovn-ic: Interconnection controller with AZ registeration.") > Signed-off-by: Ilya Maximets <i.maximets@ovn.org> > --- > tutorial/ovs-sandbox | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox > index 1841776a4..525151a68 100755 > --- a/tutorial/ovs-sandbox > +++ b/tutorial/ovs-sandbox > @@ -626,7 +626,7 @@ done > rungdb $gdb_ovn_controller_vtep $gdb_ovn_controller_vtep_ex \ > ovn-controller-vtep --detach --no-chdir --pidfile -vconsole:off \ > $OVN_CTRLR_PKI --log-file -vsyslog:off \ > - --ovnsb-db=unix:"$sandbox"/ovnsb_db.sock > + --ovnsb-db="$OVN_SB_DB" > > cat <<EOF > > -- > 2.26.2 > Oops... Thanks Ilya for fixing it. Acked-by: Han Zhou <hzhou@ovn.org>
On Mon, Jan 25, 2021 at 7:44 AM Han Zhou <hzhou@ovn.org> wrote: > On Thu, Jan 21, 2021 at 9:30 AM Ilya Maximets <i.maximets@ovn.org> wrote: > > > > There was a race between > > commit ff4439dbdbc0 ("Build OVN using external OVS directory") and > > commit 381c9319b1f0 ("ovn-ic: Interconnection controller with AZ > registeration.") > > Both touched sandbox code, but were accepted in the oppisite order > > to one they were prepared and sent to the mail list. > > > > This led to the case where new code from the first commit wasn't > > updated by the second one leaving ovn-controller-vtep with > > incorrect Southbound DB socket configuration, so it doesn't > > work inside the sandbox: > > > > sandbox/ovn-controller-vtep.log: > > |reconnect|INFO|unix:ovn/tutorial/sandbox/ovnsb_db.sock: > > connection attempt failed (No such file or directory) > > > > Fixes: 381c9319b1f0 ("ovn-ic: Interconnection controller with AZ > registeration.") > > Signed-off-by: Ilya Maximets <i.maximets@ovn.org> > > --- > > tutorial/ovs-sandbox | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox > > index 1841776a4..525151a68 100755 > > --- a/tutorial/ovs-sandbox > > +++ b/tutorial/ovs-sandbox > > @@ -626,7 +626,7 @@ done > > rungdb $gdb_ovn_controller_vtep $gdb_ovn_controller_vtep_ex \ > > ovn-controller-vtep --detach --no-chdir --pidfile -vconsole:off \ > > $OVN_CTRLR_PKI --log-file -vsyslog:off \ > > - --ovnsb-db=unix:"$sandbox"/ovnsb_db.sock > > + --ovnsb-db="$OVN_SB_DB" > > > > cat <<EOF > > > > -- > > 2.26.2 > > > > Oops... Thanks Ilya for fixing it. > > Acked-by: Han Zhou <hzhou@ovn.org> > Thanks Ilya and Han. I applied this patch to master and back ported to all the branches. Numan > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > >
diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox index 1841776a4..525151a68 100755 --- a/tutorial/ovs-sandbox +++ b/tutorial/ovs-sandbox @@ -626,7 +626,7 @@ done rungdb $gdb_ovn_controller_vtep $gdb_ovn_controller_vtep_ex \ ovn-controller-vtep --detach --no-chdir --pidfile -vconsole:off \ $OVN_CTRLR_PKI --log-file -vsyslog:off \ - --ovnsb-db=unix:"$sandbox"/ovnsb_db.sock + --ovnsb-db="$OVN_SB_DB" cat <<EOF
There was a race between commit ff4439dbdbc0 ("Build OVN using external OVS directory") and commit 381c9319b1f0 ("ovn-ic: Interconnection controller with AZ registeration.") Both touched sandbox code, but were accepted in the oppisite order to one they were prepared and sent to the mail list. This led to the case where new code from the first commit wasn't updated by the second one leaving ovn-controller-vtep with incorrect Southbound DB socket configuration, so it doesn't work inside the sandbox: sandbox/ovn-controller-vtep.log: |reconnect|INFO|unix:ovn/tutorial/sandbox/ovnsb_db.sock: connection attempt failed (No such file or directory) Fixes: 381c9319b1f0 ("ovn-ic: Interconnection controller with AZ registeration.") Signed-off-by: Ilya Maximets <i.maximets@ovn.org> --- tutorial/ovs-sandbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)