[PATCH] ipvsadm: Fix list daemon to show backup daemon

[PATCH] ipvsadm: Fix list daemon to show backup daemon

[Ryan O'Hara]

The list_daemon function in ipvsadm.c will show the master daemon
twice, but never the backup daemon. This patch replaces the redundant
check for IP_VS_STATE_MASTER with a check for IP_VS_STATE_BACKUP, then
prints the appropriate message.

Signed-off-by: Ryan O'Hara <rohara@redhat.com>
---
 ipvsadm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ipvsadm.c b/ipvsadm.c
index 4c83a8b..755827f 100644
--- a/ipvsadm.c
+++ b/ipvsadm.c
@@ -1732,8 +1732,8 @@ static void list_daemon(void)
 		if (u[i].state & IP_VS_STATE_MASTER)
 			printf("master sync daemon (mcast=%s, syncid=%d)\n",
 			       u[i].mcast_ifn, u[i].syncid);
-		if (u[i].state & IP_VS_STATE_MASTER)
-			printf("master sync daemon (mcast=%s, syncid=%d)\n",
+		if (u[i].state & IP_VS_STATE_BACKUP)
+			printf("backup sync daemon (mcast=%s, syncid=%d)\n",
 			       u[i].mcast_ifn, u[i].syncid);
 	}
 	free(u);
-- 
1.9.0

Re: [PATCH] ipvsadm: Fix list daemon to show backup daemon

[Julian Anastasov]

	Hello,

On Tue, 20 May 2014, Ryan O'Hara wrote:

> The list_daemon function in ipvsadm.c will show the master daemon
> twice, but never the backup daemon. This patch replaces the redundant
> check for IP_VS_STATE_MASTER with a check for IP_VS_STATE_BACKUP, then
> prints the appropriate message.
> 
> Signed-off-by: Ryan O'Hara <rohara@redhat.com>

	In case you still wait for ack:

Acked-by: Julian Anastasov <ja@ssi.bg>

> ---
>  ipvsadm.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/ipvsadm.c b/ipvsadm.c
> index 4c83a8b..755827f 100644
> --- a/ipvsadm.c
> +++ b/ipvsadm.c
> @@ -1732,8 +1732,8 @@ static void list_daemon(void)
>  		if (u[i].state & IP_VS_STATE_MASTER)
>  			printf("master sync daemon (mcast=%s, syncid=%d)\n",
>  			       u[i].mcast_ifn, u[i].syncid);
> -		if (u[i].state & IP_VS_STATE_MASTER)
> -			printf("master sync daemon (mcast=%s, syncid=%d)\n",
> +		if (u[i].state & IP_VS_STATE_BACKUP)
> +			printf("backup sync daemon (mcast=%s, syncid=%d)\n",
>  			       u[i].mcast_ifn, u[i].syncid);
>  	}
>  	free(u);
> -- 
> 1.9.0

Regards

--
Julian Anastasov <ja@ssi.bg>

Re: [PATCH] ipvsadm: Fix list daemon to show backup daemon

[Jesper Dangaard Brouer]

On Fri, 6 Jun 2014 10:24:09 +0300 (EEST) Julian Anastasov <ja@ssi.bg> wrote:

> On Tue, 20 May 2014, Ryan O'Hara wrote:
> 
> > The list_daemon function in ipvsadm.c will show the master daemon
> > twice, but never the backup daemon. This patch replaces the redundant
> > check for IP_VS_STATE_MASTER with a check for IP_VS_STATE_BACKUP, then
> > prints the appropriate message.
> > 
> > Signed-off-by: Ryan O'Hara <rohara@redhat.com>
> 
> 	In case you still wait for ack:
> 
> Acked-by: Julian Anastasov <ja@ssi.bg>

Applied and pushed:
 https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git/commit/?id=4cebeb8ea66

Thank you!
-- 
Best regards,
  Jesper Dangaard Brouer
  MSc.CS, Sr. Network Kernel Developer at Red Hat
  Author of http://www.iptv-analyzer.org
  LinkedIn: http://www.linkedin.com/in/brouer

Re: [PATCH] ipvsadm: Fix list daemon to show backup daemon

[Simon Horman]

On Tue, Jun 10, 2014 at 09:43:50AM +0200, Jesper Dangaard Brouer wrote:
> On Fri, 6 Jun 2014 10:24:09 +0300 (EEST) Julian Anastasov <ja@ssi.bg> wrote:
> 
> > On Tue, 20 May 2014, Ryan O'Hara wrote:
> > 
> > > The list_daemon function in ipvsadm.c will show the master daemon
> > > twice, but never the backup daemon. This patch replaces the redundant
> > > check for IP_VS_STATE_MASTER with a check for IP_VS_STATE_BACKUP, then
> > > prints the appropriate message.
> > > 
> > > Signed-off-by: Ryan O'Hara <rohara@redhat.com>
> > 
> > 	In case you still wait for ack:
> > 
> > Acked-by: Julian Anastasov <ja@ssi.bg>
> 
> Applied and pushed:
>  https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git/commit/?id=4cebeb8ea66

Thanks Jesper,

I wonder if we should consider making a bugfix release in the
not to distant future.

Re: [PATCH] ipvsadm: Fix list daemon to show backup daemon

[Jesper Dangaard Brouer]

On Wed, 11 Jun 2014 08:48:42 +0900
Simon Horman <horms@verge.net.au> wrote:

> On Tue, Jun 10, 2014 at 09:43:50AM +0200, Jesper Dangaard Brouer wrote:
> > On Fri, 6 Jun 2014 10:24:09 +0300 (EEST) Julian Anastasov <ja@ssi.bg> wrote:
> > 
> > > On Tue, 20 May 2014, Ryan O'Hara wrote:
> > > 
> > > > The list_daemon function in ipvsadm.c will show the master daemon
> > > > twice, but never the backup daemon. This patch replaces the redundant
> > > > check for IP_VS_STATE_MASTER with a check for IP_VS_STATE_BACKUP, then
> > > > prints the appropriate message.
> > > > 
> > > > Signed-off-by: Ryan O'Hara <rohara@redhat.com>
> > > 
> > > 	In case you still wait for ack:
> > > 
> > > Acked-by: Julian Anastasov <ja@ssi.bg>
> > 
> > Applied and pushed:
> >  https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git/commit/?id=4cebeb8ea66
> 
> Thanks Jesper,
> 
> I wonder if we should consider making a bugfix release in the
> not to distant future.

We only have two commits/fixes since the last release, both by Ryan
(thanks Ryan)

https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git/commit/?id=cd824937ad6
https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git/commit/?id=4cebeb8ea66
-- 
Best regards,
  Jesper Dangaard Brouer
  MSc.CS, Sr. Network Kernel Developer at Red Hat
  Author of http://www.iptv-analyzer.org
  LinkedIn: http://www.linkedin.com/in/brouer