From owner-svn-src-head@FreeBSD.ORG Thu Jan 17 01:29:42 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6475631D; Thu, 17 Jan 2013 01:29:42 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:130:3ffc::401:25]) by mx1.freebsd.org (Postfix) with ESMTP id 226F1E11; Thu, 17 Jan 2013 01:29:42 +0000 (UTC) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 9CEC525D38A5; Thu, 17 Jan 2013 01:29:39 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id CE268BE84A1; Thu, 17 Jan 2013 01:29:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id Kro1Wee88leK; Thu, 17 Jan 2013 01:29:37 +0000 (UTC) Received: from nv.sbone.de (nv.sbone.de [IPv6:fde9:577b:c1a9:31::2013:138]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 5BE83BE84A0; Thu, 17 Jan 2013 01:29:37 +0000 (UTC) Date: Thu, 17 Jan 2013 01:29:36 +0000 (UTC) From: "Bjoern A. Zeeb" To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r245525 - head/etc/rc.d In-Reply-To: <201301170127.r0H1Re6Y038117@svn.freebsd.org> Message-ID: References: <201301170127.r0H1Re6Y038117@svn.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2013 01:29:42 -0000 On Thu, 17 Jan 2013, Bjoern A. Zeeb wrote: > Author: bz > Date: Thu Jan 17 01:27:39 2013 > New Revision: 245525 > URL: http://svnweb.freebsd.org/changeset/base/245525 > > Log: > Add a conditional sleep 1 in case we add any IPv6 addresses to interfaces. > Do this per jail started, not per address. This will allow DAD to complete > and services to properly start. Before we have seen problems with services > trying to start before the IPv6 address was available to use and thus > erroring and failing to start. > > MFC after: 3 days Reviewed by: simon Reported by: clusterad Seen before by: myself (but never fixed it properly) Samples of services seen starting up really fast and failing included openldap's slapd and I think even apache. > > Modified: > head/etc/rc.d/jail > > Modified: head/etc/rc.d/jail > ============================================================================== > --- head/etc/rc.d/jail Thu Jan 17 01:19:14 2013 (r245524) > +++ head/etc/rc.d/jail Thu Jan 17 01:27:39 2013 (r245525) > @@ -509,7 +509,7 @@ jail_handle_ips_option() > esac > case "${_type}" in > inet) ;; > - inet6) ;; > + inet6) ipv6_address_count=$((ipv6_address_count + 1)) ;; > *) warn "Could not determine address family. Not going" \ > "to ${_action} address '${_addr}' for ${_jail}." > continue > @@ -546,6 +546,7 @@ jail_ips() > esac > > # Handle addresses. > + ipv6_address_count=0 > jail_handle_ips_option ${_action} "${_ip}" > # Handle jail_xxx_ip_multi > alias=0 > @@ -558,6 +559,12 @@ jail_ips() > ;; > esac > done > + case ${ipv6_address_count} in > + 0) ;; > + *) # Sleep 1 second to let DAD complete before starting services. > + sleep 1 > + ;; > + esac > } > > jail_prestart() > -- Bjoern A. Zeeb You have to have visions! Stop bit received. Insert coin for new address family.