From f825a410f8ed4f9a45b9e7e69ef693db89c9ca83 Mon Sep 17 00:00:00 2001 From: Samuel Beaulieu Date: Fri, 29 May 2020 10:01:02 -0500 Subject: [PATCH] (POOLER-166) Check for stale dns records --- lib/vmpooler/pool_manager.rb | 33 +++++++++++++++++++++++++++++---- spec/unit/pool_manager_spec.rb | 21 +++++++++++++++++++++ 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb index fca49c3..2fd415d 100644 --- a/lib/vmpooler/pool_manager.rb +++ b/lib/vmpooler/pool_manager.rb @@ -2,6 +2,7 @@ require 'vmpooler/providers' require 'spicy-proton' +require 'resolv' #ruby standard lib module Vmpooler class PoolManager @@ -347,22 +348,46 @@ module Vmpooler end def find_unique_hostname(pool_name) + # generate hostname that is not already in use in vmpooler + # also check that no dns record already exists hostname_retries = 0 max_hostname_retries = 3 while hostname_retries < max_hostname_retries hostname, available = generate_and_check_hostname - break if available + domain = $config[:config]['domain'] + dns_ip, dns_available = check_dns_available(hostname, domain) + break if available && dns_available hostname_retries += 1 - $metrics.increment("errors.duplicatehostname.#{pool_name}") - $logger.log('s', "[!] [#{pool_name}] Generated hostname #{hostname} was not unique (attempt \##{hostname_retries} of #{max_hostname_retries})") + + if !available + $metrics.increment("errors.duplicatehostname.#{pool_name}") + $logger.log('s', "[!] [#{pool_name}] Generated hostname #{hostname} was not unique (attempt \##{hostname_retries} of #{max_hostname_retries})") + elsif !dns_available + $metrics.increment("errors.staledns.#{hostname}") + $logger.log('s', "[!] '#{hostname}' already exists in DNS records (#{dns_ip}), stale DNS") + end end - raise "Unable to generate a unique hostname after #{hostname_retries} attempts. The last hostname checked was #{hostname}" unless available + raise "Unable to generate a unique hostname after #{hostname_retries} attempts. The last hostname checked was #{hostname}" unless available && dns_available hostname end + def check_dns_available(vm_name, domain = nil) + # Query the DNS for the name we want to create and if it already exists, mark it unavailable + # This protects against stale DNS records + vm_name = "#{vm_name}.#{domain}" if domain + begin + dns_ip = Resolv.getaddress(vm_name) + rescue Resolv::ResolvError => err + #this is the expected case, swallow the error + # eg "no address for blah-daisy" + return ["", true] + end + return [dns_ip, false] + end + def _clone_vm(pool_name, provider, request_id = nil, pool_alias = nil) new_vmname = find_unique_hostname(pool_name) mutex = vm_mutex(new_vmname) diff --git a/spec/unit/pool_manager_spec.rb b/spec/unit/pool_manager_spec.rb index ef667cb..f4dfa7f 100644 --- a/spec/unit/pool_manager_spec.rb +++ b/spec/unit/pool_manager_spec.rb @@ -874,7 +874,28 @@ EOT it 'should raise the error' do expect{subject._clone_vm(pool,provider)}.to raise_error(/MockError/) end + end + context 'with #check_dns_available' do + before(:each) do + allow(logger).to receive(:log) + end + it 'should error out if DNS already exists' do + vm_name = "foo" + resolv = class_double("Resolv").as_stubbed_const(:transfer_nested_constants => true) + expect(subject).to receive(:generate_and_check_hostname).exactly(3).times.and_return([vm_name, true]) #skip this, make it available all times + expect(resolv).to receive(:getaddress).exactly(3).times.and_return("1.2.3.4") + expect(metrics).to receive(:increment).with("errors.staledns.#{vm_name}").exactly(3).times + expect{subject._clone_vm(pool,provider)}.to raise_error(/Unable to generate a unique hostname after/) + end + it 'should be successful if DNS does not exist' do + vm_name = "foo" + resolv = class_double("Resolv").as_stubbed_const(:transfer_nested_constants => true) + expect(subject).to receive(:generate_and_check_hostname).and_return([vm_name, true]) + expect(resolv).to receive(:getaddress).exactly(1).times.and_raise(Resolv::ResolvError) + expect(provider).to receive(:create_vm).with(pool, String) + subject._clone_vm(pool,provider) + end end context 'with request_id' do