Re: [PATCH v4 02/15] xencommons: use the retry limit instead of implementing our own timeout

["Luis R. Rodriguez" <mcgrof@suse.com>]

On Wed, Apr 30, 2014 at 10:33:30AM +0100, Andrew Cooper wrote:
> On 30/04/14 02:11, Luis R. Rodriguez wrote:
> > From: "Luis R. Rodriguez" <mcgrof@suse.com>
> >
> > xenstore-read now has support to retry opening the xenstored unix domain
> > socket a certain amount of times, once each second, use that instead of
> > implementing our own timeout.
> >
> > For systemd we'll be using socket activation. Details for that will follow.
> >
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > Cc: Ian Campbell <ian.campbell@citrix.com>
> > Cc: Jan Rękorajski <baggins@pld-linux.org>
> > Cc: M A Young <m.a.young@durham.ac.uk>
> > Cc: Jacek Konieczny <jajcus@jajcus.net>
> > Cc: xen-devel@lists.xenproject.org
> > Acked-by: Ian Campbell <ian.campbell@citrix.com>
> > Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
> > ---
> >  tools/hotplug/Linux/init.d/xencommons | 19 +++++--------------
> >  1 file changed, 5 insertions(+), 14 deletions(-)
> >
> > diff --git a/tools/hotplug/Linux/init.d/xencommons b/tools/hotplug/Linux/init.d/xencommons
> > index 4ebd636..7195413 100644
> > --- a/tools/hotplug/Linux/init.d/xencommons
> > +++ b/tools/hotplug/Linux/init.d/xencommons
> > @@ -54,9 +54,6 @@ if test -f /proc/xen/capabilities && \
> >  fi
> >  
> >  do_start () {
> > -        local time=0
> > -	local timeout=30
> > -
> >  	modprobe xen-evtchn 2>/dev/null
> >  	modprobe xen-gntdev 2>/dev/null
> >  	modprobe xen-gntalloc 2>/dev/null
> > @@ -93,17 +90,11 @@ do_start () {
> >  		    echo "No xenstored found"
> >  		    exit 1
> >  		fi
> > -
> > -		# Wait for xenstored to actually come up, timing out after 30 seconds
> > -                while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do
> > -                    echo -n .
> > -		    time=$(($time+1))
> > -                    sleep 1
> > -                done
> > -		echo
> > -
> > -		# Exit if we timed out
> > -		if ! [ $time -lt $timeout ] ; then
> > +		# We try opening the xenstored socket every second up to the
> > +		# limit specified, if it hasn't opened by then assume
> > +		# failure.
> > +                ${BINDIR}/xenstore-read --retries 30 -s / >/dev/null 2>&1
> > +		if [ $? -ne 0 ] ; then
> 
> Tabs vs spaces here.

Thanks, I've fixed this now, and will send as part of a v5.

  Luis

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel