vitalif
/
onedns
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

server: build new zone and replace live copy in sync 

Instead of clearing the live zone and iterating through and adding
records from OpenNebula we build an entirely new zone, sync it with
OpenNebula, and instantaneously swap it with the currently live zone.
This minimizes the amount of time that the DNS server is missing entries
while its syncing with OpenNebula.
master
Justin Riley 2016-09-28 11:12:18 -04:00
parent 3a07adba10
commit a7051e0689
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
onedns/resolver.py
View File

@ -25,6 +25,7 @@ class DynamicResolver(server.BaseResolver):
Initialise resolver from zone list Initialise resolver from zone list
Stores RRs as a list of (label, type, rr) tuples Stores RRs as a list of (label, type, rr) tuples
""" """
self.domain = domain
self.zone = zone.Zone(domain) self.zone = zone.Zone(domain)
self._tcp_server = None self._tcp_server = None
self._udp_server = None self._udp_server = None

17
onedns/server.py
View File

@ -1,3 +1,4 @@
from onedns import zone
from onedns import resolver from onedns import resolver
from onedns import exception from onedns import exception
from onedns.clients import one from onedns.clients import one
@ -19,6 +20,7 @@ class OneDNS(resolver.DynamicResolver):
raise exception.NoNetworksError(vm) raise exception.NoNetworksError(vm)
def _get_vm_dns_entries(self, vm): def _get_vm_dns_entries(self, vm):
self._check_for_networks(vm)
entries = {} entries = {}
hostname = vm.name hostname = vm.name
primary_ip = vm.template.nics[0].ip primary_ip = vm.template.nics[0].ip
@ -29,19 +31,17 @@ class OneDNS(resolver.DynamicResolver):
entries[nicname] = nic.ip entries[nicname] = nic.ip
return entries return entries
def add_vm(self, vm): def add_vm(self, vm, zone=None):
self._check_for_networks(vm)
dns_entries = self._get_vm_dns_entries(vm) dns_entries = self._get_vm_dns_entries(vm)
log.info("Adding VM {id}: {vm}".format(id=vm.id, vm=vm.name)) log.info("Adding VM {id}: {vm}".format(id=vm.id, vm=vm.name))
for name, ip in dns_entries.items(): for name, ip in dns_entries.items():
self.add_host(name, ip) self.add_host(name, ip, zone=zone)
def remove_vm(self, vm): def remove_vm(self, vm, zone=None):
self._check_for_networks(vm)
dns_entries = self._get_vm_dns_entries(vm) dns_entries = self._get_vm_dns_entries(vm)
log.info("Removing VM {id}: {vm}".format(id=vm.id, vm=vm.name)) log.info("Removing VM {id}: {vm}".format(id=vm.id, vm=vm.name))
for name, ip in dns_entries.items(): for name, ip in dns_entries.items():
self.remove_host(name, ip) self.remove_host(name, ip, zone=zone)
def add_vm_by_id(self, vm_id): def add_vm_by_id(self, vm_id):
vm = self._one.get_vm_by_id(vm_id) vm = self._one.get_vm_by_id(vm_id)
@ -52,10 +52,11 @@ class OneDNS(resolver.DynamicResolver):
return self.remove_vm(vm) return self.remove_vm(vm)
def sync(self, vms=None): def sync(self, vms=None):
z = zone.Zone(self.domain)
vms = vms or self._one.vms() vms = vms or self._one.vms()
self.clear()
for vm in vms: for vm in vms:
try: try:
self.add_vm(vm) self.add_vm(vm, zone=z)
except exception.NoNetworksError as e: except exception.NoNetworksError as e:
e.log(warn=True) e.log(warn=True)
self.load(z)