Re: [ovs-dev] [PATCH v2 2/2] ovn: Modify restart_controller in ovn-ctl to use --restart

2018-08-02 Thread Ben Pfaff
On Tue, Jul 31, 2018 at 10:27:59AM +0200, Jakub Sitnicki wrote:
> On Mon, 30 Jul 2018 09:47:45 -0400
> Mark Michelson  wrote:
> 
> > The --restart flag allows for uninterrupted packet flowage when exiting
> > ovn-controller. This patch modifies the restart_controller argument to
> > ovn-ctl to use --restart.
> > 
> > Signed-off-by: Mark Michelson 
> > ---
> >  ovn/utilities/ovn-ctl | 4 ++--
> >  utilities/ovs-lib.in  | 2 +-
> >  2 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/ovn/utilities/ovn-ctl b/ovn/utilities/ovn-ctl
> > index 2fce47714..05feed2b6 100755
> > --- a/ovn/utilities/ovn-ctl
> > +++ b/ovn/utilities/ovn-ctl
> > @@ -350,7 +350,7 @@ stop_northd () {
> >  }
> >  
> >  stop_controller () {
> > -OVS_RUNDIR=${OVN_RUNDIR} stop_daemon ovn-controller
> > +OVS_RUNDIR=${OVN_RUNDIR} stop_daemon ovn-controller $@
> >  }
> 
> It needs to be "$@" or the arguments containing whitespace (or
> characters from IFS) will get split up :-C

I made that change and pushed this series to master and branch-2.10.
Thanks Mark and Jakub!
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev


Re: [ovs-dev] [PATCH v2 2/2] ovn: Modify restart_controller in ovn-ctl to use --restart

2018-07-31 Thread Jakub Sitnicki
On Mon, 30 Jul 2018 09:47:45 -0400
Mark Michelson  wrote:

> The --restart flag allows for uninterrupted packet flowage when exiting
> ovn-controller. This patch modifies the restart_controller argument to
> ovn-ctl to use --restart.
> 
> Signed-off-by: Mark Michelson 
> ---
>  ovn/utilities/ovn-ctl | 4 ++--
>  utilities/ovs-lib.in  | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/ovn/utilities/ovn-ctl b/ovn/utilities/ovn-ctl
> index 2fce47714..05feed2b6 100755
> --- a/ovn/utilities/ovn-ctl
> +++ b/ovn/utilities/ovn-ctl
> @@ -350,7 +350,7 @@ stop_northd () {
>  }
>  
>  stop_controller () {
> -OVS_RUNDIR=${OVN_RUNDIR} stop_daemon ovn-controller
> +OVS_RUNDIR=${OVN_RUNDIR} stop_daemon ovn-controller $@
>  }

It needs to be "$@" or the arguments containing whitespace (or
characters from IFS) will get split up :-C

>  
>  stop_controller_vtep () {
> @@ -367,7 +367,7 @@ restart_northd () {
>  }
>  
>  restart_controller () {
> -stop_controller
> +stop_controller --restart
>  start_controller
>  }
>  
> diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
> index 92f98ad92..9f62dfd25 100644
> --- a/utilities/ovs-lib.in
> +++ b/utilities/ovs-lib.in
> @@ -258,7 +258,7 @@ stop_daemon () {
>  case $action in
>  EXIT)
>  action "Exiting $1 ($pid)" \
> -${bindir}/ovs-appctl -T 1 -t $rundir/$1.$pid.ctl 
> exit
> +${bindir}/ovs-appctl -T 1 -t $rundir/$1.$pid.ctl 
> exit $2
>  ;;
>  TERM)
>  action "Killing $1 ($pid)" kill $pid

___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev


[ovs-dev] [PATCH v2 2/2] ovn: Modify restart_controller in ovn-ctl to use --restart

2018-07-30 Thread Mark Michelson
The --restart flag allows for uninterrupted packet flowage when exiting
ovn-controller. This patch modifies the restart_controller argument to
ovn-ctl to use --restart.

Signed-off-by: Mark Michelson 
---
 ovn/utilities/ovn-ctl | 4 ++--
 utilities/ovs-lib.in  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ovn/utilities/ovn-ctl b/ovn/utilities/ovn-ctl
index 2fce47714..05feed2b6 100755
--- a/ovn/utilities/ovn-ctl
+++ b/ovn/utilities/ovn-ctl
@@ -350,7 +350,7 @@ stop_northd () {
 }
 
 stop_controller () {
-OVS_RUNDIR=${OVN_RUNDIR} stop_daemon ovn-controller
+OVS_RUNDIR=${OVN_RUNDIR} stop_daemon ovn-controller $@
 }
 
 stop_controller_vtep () {
@@ -367,7 +367,7 @@ restart_northd () {
 }
 
 restart_controller () {
-stop_controller
+stop_controller --restart
 start_controller
 }
 
diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
index 92f98ad92..9f62dfd25 100644
--- a/utilities/ovs-lib.in
+++ b/utilities/ovs-lib.in
@@ -258,7 +258,7 @@ stop_daemon () {
 case $action in
 EXIT)
 action "Exiting $1 ($pid)" \
-${bindir}/ovs-appctl -T 1 -t $rundir/$1.$pid.ctl 
exit
+${bindir}/ovs-appctl -T 1 -t $rundir/$1.$pid.ctl 
exit $2
 ;;
 TERM)
 action "Killing $1 ($pid)" kill $pid
-- 
2.14.4

___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev