Skip to content

vr: reload dnsmasq when start vms#5319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nvazquez merged 3 commits into from
Aug 25, 2021
Merged

vr: reload dnsmasq when start vms #5319

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ef633d
vr: reload dnsmasq when start vms
weizhouapache Aug 16, 2021
737f50d
vr: fix pycodestyle check error
weizhouapache Aug 17, 2021
6787235
vr: delete leases only when needed
weizhouapache Aug 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,12 +37,12 @@ def process(self):
self.changed = []
self.devinfo = CsHelper.get_device_info()
self.preseed()
self.cloud = CsFile(DHCP_HOSTS)
self.dhcp_hosts = CsFile(DHCP_HOSTS)
self.dhcp_opts = CsFile(DHCP_OPTS)
self.conf = CsFile(CLOUD_CONF)
self.dhcp_leases = CsFile(LEASES)

self.cloud.repopulate()
self.dhcp_hosts.repopulate()
self.dhcp_opts.repopulate()

for item in self.dbag:
Expand All@@ -54,21 +54,22 @@ def process(self):
self.configure_server()

restart_dnsmasq = False
need_delete_leases = False

if self.conf.commit():
restart_dnsmasq = True
need_delete_leases = True

if self.cloud.commit():
restart_dnsmasq = True
if self.dhcp_hosts.commit():
need_delete_leases = True

if self.dhcp_leases.commit():
restart_dnsmasq = True
need_delete_leases = True

self.dhcp_opts.commit()

if restart_dnsmasq:
if need_delete_leases:
self.delete_leases()

self.write_hosts()

@yadvryadvrAug 19, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@weizhouapache can you explain what this line does? Isn't deleting leases going to cause any regression?

@weizhouapacheweizhouapacheAug 19, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rhtyd
the method delete_leases was mainly introduced by #3351, which is used to remove entries from dnsmasq.leases file for VMs which have been removed (no impact on all existing vms).

in my opinion, it will not cause any regression. the only issue I see is that execution time will be increased few milliseconds if stop/start a vm(currently delete_leases is not triggered).

cloudstack/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py

Lines 134 to 154 in 737f50d

defdelete_leases(self):
macs_dhcphosts= []
try:
logging.info("Attempting to delete entries from dnsmasq.leases file for VMs which are not on dhcphosts file")
forhostinopen(DHCP_HOSTS):
macs_dhcphosts.append(host.split(',')[0])
removed=0
forleaselineinopen(LEASES):
lease=leaseline.split(' ')
mac=lease[1]
ip=lease[2]
ifmacnotinmacs_dhcphosts:
cmd="dhcp_release $(ip route get %s | grep eth | head -1 | awk '{print $3}') %s %s"% (ip, ip, mac)
logging.info(cmd)
CsHelper.execute(cmd)
removed=removed+1
self.del_host(ip)
logging.info("Deleted %s entries from dnsmasq.leases file"%str(removed))
exceptExceptionase:
logging.error("Caught error while trying to delete entries from dnsmasq.leases file: %s"%e)

@weizhouapacheweizhouapacheAug 19, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rhtyd anyway, I added a new commit to address your comment.

leases will be deleted only when one of config files is changed.

@yadvryadvrAug 20, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great thanks.


if not self.cl.is_redundant() or self.cl.is_master():
Expand DownExpand Up@@ -189,20 +190,20 @@ def add(self, entry):
lease = 'infinite'

if entry['default_entry']:
self.cloud.add("%s,%s,%s,%s" % (entry['mac_address'],
entry['ipv4_address'],
entry['host_name'],
lease))
self.dhcp_hosts.add("%s,%s,%s,%s" % (entry['mac_address'],
entry['ipv4_address'],
entry['host_name'],
lease))
self.dhcp_leases.search(entry['mac_address'], "0 %s %s %s *" % (entry['mac_address'],
entry['ipv4_address'],
entry['host_name']))
else:
tag = entry['ipv4_address'].replace(".", "_")
self.cloud.add("%s,set:%s,%s,%s,%s" % (entry['mac_address'],
tag,
entry['ipv4_address'],
entry['host_name'],
lease))
self.dhcp_hosts.add("%s,set:%s,%s,%s,%s" % (entry['mac_address'],
tag,
entry['ipv4_address'],
entry['host_name'],
lease))
self.dhcp_opts.add("%s,%s" % (tag, 3))
self.dhcp_opts.add("%s,%s" % (tag, 6))
self.dhcp_opts.add("%s,%s" % (tag, 15))
Expand Down