Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Received-SPF: pass (nike.apache.org: domain of shadowsor@gmail.com designates
 209.85.128.175 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <20130501183347.GH72716@USLT-205755.sungardas.corp>
References: <040f01ce45f1$b4550a30$1cff1e90$@gmail.com>
	<CDA5A655.13C1F%chiradeep.vittal@citrix.com>
	<CALFpzo4YxzGu4hSicqdhA8TFB49xGAVVw+eF-Thjgy-Gam2B9g@mail.gmail.com>
	<CAOP+rsA_edS=eBTwDtpmX-euW5WtGBYWEM9uH+dQbe5AHC15ow@mail.gmail.com>
	<CALFpzo62oUrwHC8asMJbM3Mn4sdvPV4pv45UgF0fTaRnSq0Esw@mail.gmail.com>
	<CALFpzo4ZJoT-dDmqEYZAtqZ_RN7Mfdqc_YwwLTYf93oMEe-+Nw@mail.gmail.com>
	<20130501183347.GH72716@USLT-205755.sungardas.corp>
Date: Wed, 1 May 2013 13:41:58 -0600
Message-ID: 
 <CALFpzo5VPpb0TvOsCCEqJzZGAghbJ9-8VJ827q1ZXoHg7af_+g@mail.gmail.com>
Subject: Re: Virtual Router: DHCP and 2-second DNS outages
From: Marcus Sorensen <shadowsor@gmail.com>
To: "dev@cloudstack.apache.org" <dev@cloudstack.apache.org>
Content-Type: multipart/alternative; boundary=047d7b5d9589a38d4804dbad4fdc

--047d7b5d9589a38d4804dbad4fdc
Content-Type: text/plain; charset=ISO-8859-1

I'm not sure how we'd handle older versions if they don't have the
dhcp_release util, but how about this going forward?

diff --git a/patches/systemvm/debian/config/root/edithosts.sh
b/patches/systemvm/debian/config/root/edithosts.sh
index 9f21f20..f6e09d6 100755
--- a/patches/systemvm/debian/config/root/edithosts.sh
+++ b/patches/systemvm/debian/config/root/edithosts.sh
@@ -71,6 +71,7 @@ DHCP_HOSTS=/etc/dhcphosts.txt
 DHCP_OPTS=/etc/dhcpopts.txt
 DHCP_LEASES=/var/lib/misc/dnsmasq.leases
 HOSTS=/etc/hosts
+ROUTER_VERSION=$(cat /etc/debian_version | cut -d. -f1)

 source /root/func.sh

@@ -99,6 +100,14 @@ wait_for_dnsmasq () {

 logger -t cloud "edithosts: update $1 $2 $3 to hosts"

+if [ $ROUTER_VERSION -gt 6 ]
+then
+  #release previous dhcp lease if present
+  echo releasing $ipv4
+  dhcp_release lo $ipv4 $(grep $ipv4 $DHCP_LEASES | awk '{print $2}')
>/dev/null 2>&1
+  echo released $ipv4
+fi
+
 [ ! -f $DHCP_HOSTS ] && touch $DHCP_HOSTS
 [ ! -f $DHCP_OPTS ] && touch $DHCP_OPTS
 [ ! -f $DHCP_LEASES ] && touch $DHCP_LEASES
@@ -200,7 +209,12 @@ fi
 pid=$(pidof dnsmasq)
 if [ "$pid" != "" ]
 then
-  service dnsmasq restart
+  if [ $ROUTER_VERSION -gt 6 ]
+  then
+    kill -s 1 $pid
+  else
+    service dnsmasq restart
+  fi
 else
   if [ $no_redundant -eq 1 ]
   then


On Wed, May 1, 2013 at 12:33 PM, Chip Childers <chip.childers@sungard.com>wrote:

> On Wed, May 01, 2013 at 12:29:32PM -0600, Marcus Sorensen wrote:
> > How do we go about requesting that dnsmasq-utils be installed on the new
> > system VM?
>
> The code to create system VMs is in the repo now.  You should be able to
> just make the change and / or submit a patch suggesting the change.
>
> See:
>
> tools/appliance/definitions
>

--047d7b5d9589a38d4804dbad4fdc--