From d8c47134ef72dd52651202ae22cecdc2adeab090 Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Fri, 3 Feb 2023 17:03:12 -0500 Subject: [PATCH] Start extracting dns setup and teardown --- lib/vmpooler/cloud_dns.rb | 63 ----------------------------------- lib/vmpooler/providers/gce.rb | 24 +++++-------- 2 files changed, 8 insertions(+), 79 deletions(-) delete mode 100644 lib/vmpooler/cloud_dns.rb diff --git a/lib/vmpooler/cloud_dns.rb b/lib/vmpooler/cloud_dns.rb deleted file mode 100644 index a98d9ef..0000000 --- a/lib/vmpooler/cloud_dns.rb +++ /dev/null @@ -1,63 +0,0 @@ -# frozen_string_literal: true - -require 'googleauth' -require 'google/cloud/dns' - -module Vmpooler - class PoolManager - # This class interacts with GCP Cloud DNS to create or delete records. - class CloudDns - def initialize(project, dns_zone_resource_name) - @dns = Google::Cloud::Dns.new(project_id: project) - @dns_zone_resource_name = dns_zone_resource_name - end - - def dns_create_or_replace(created_instance) - dns_zone = @dns.zone(@dns_zone_resource_name) if @dns_zone_resource_name - return unless dns_zone && created_instance && created_instance['name'] && created_instance['ip'] - - retries = 0 - name = created_instance['name'] - begin - change = dns_zone.add(name, 'A', 60, [created_instance['ip']]) - debug_logger("#{change.id} - #{change.started_at} - #{change.status} DNS address added") if change - rescue Google::Cloud::AlreadyExistsError => _e - # DNS setup is done only for new instances, so in the rare case where a DNS record already exists (it is stale) and we replace it. - # the error is Google::Cloud::AlreadyExistsError: alreadyExists: The resource 'entity.change.additions[0]' named 'instance-8.test.vmpooler.net. (A)' already exists - change = dns_zone.replace(name, 'A', 60, [created_instance['ip']]) - debug_logger("#{change.id} - #{change.started_at} - #{change.status} DNS address previously existed and was replaced") if change - rescue Google::Cloud::FailedPreconditionError => e - # this error was experienced intermittently, will retry to see if it can complete successfully - # the error is Google::Cloud::FailedPreconditionError: conditionNotMet: Precondition not met for 'entity.change.deletions[0]' - debug_logger("DNS create failed, retrying error: #{e}") - sleep 5 - retry if (retries += 1) < 30 - end - end - - def dns_teardown(created_instance) - dns_zone = @dns.zone(@dns_zone_resource_name) if @dns_zone_resource_name - return unless dns_zone && created_instance - - retries = 0 - name = created_instance['name'] - change = dns_zone.remove(name, 'A') - debug_logger("#{change.id} - #{change.started_at} - #{change.status} DNS address removed") if change - rescue Google::Cloud::FailedPreconditionError => e - # this error was experienced intermittently, will retry to see if it can complete successfully - # the error is Google::Cloud::FailedPreconditionError: conditionNotMet: Precondition not met for 'entity.change.deletions[1]' - debug_logger("DNS teardown failed, retrying error: #{e}") - sleep 5 - retry if (retries += 1) < 30 - end - - # used in local dev environment, set DEBUG_FLAG=true - # this way the upstream vmpooler manager does not get polluted with logs - def debug_logger(message, send_to_upstream: false) - # the default logger is simple and does not enforce debug levels (the first argument) - puts message if ENV['DEBUG_FLAG'] - logger.log('[g]', message) if send_to_upstream - end - end - end -end diff --git a/lib/vmpooler/providers/gce.rb b/lib/vmpooler/providers/gce.rb index 7c95859..ecbddaf 100644 --- a/lib/vmpooler/providers/gce.rb +++ b/lib/vmpooler/providers/gce.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true -require 'googleauth' -require 'google/apis/compute_v1' -require 'vmpooler/cloud_dns' require 'bigdecimal' require 'bigdecimal/util' +require 'google/apis/compute_v1' +require 'googleauth' +require 'vmpooler/dns/base' require 'vmpooler/providers/base' module Vmpooler @@ -209,7 +209,11 @@ module Vmpooler result = connection.insert_instance(project, zone(pool_name), client) wait_for_operation(project, pool_name, result) created_instance = get_vm(pool_name, new_vmname) - dns_setup(created_instance) + # Exceptions thrown if ip does not exist in preexisting vm? Redis::CommandError: ERR wrong number of arguments for 'hset' command + @redis.with_metrics do |redis| + ip = created_instance['ip'] + redis.hset("vmpooler__vm__#{new_vmname}", 'ip', ip) + end created_instance end @@ -427,7 +431,6 @@ module Vmpooler vm_hash = get_vm(pool_name, vm_name) result = connection.delete_instance(project, zone(pool_name), vm_name) wait_for_operation(project, pool_name, result, 10) - dns_teardown(vm_hash) end # list and delete any leftover disk, for instance if they were detached from the instance @@ -499,7 +502,6 @@ module Vmpooler result = connection.delete_instance(project, zone, vm.name) vm_pool = vm.labels&.key?('pool') ? vm.labels['pool'] : nil existing_vm = generate_vm_hash(vm, vm_pool) - dns_teardown(existing_vm) result_list << result end # now check they are done @@ -560,16 +562,6 @@ module Vmpooler # END BASE METHODS - def dns_setup(created_instance) - dns = Vmpooler::PoolManager::CloudDns.new(project, dns_zone_resource_name) - dns.dns_create_or_replace(created_instance) - end - - def dns_teardown(created_instance) - dns = Vmpooler::PoolManager::CloudDns.new(project, dns_zone_resource_name) - dns.dns_teardown(created_instance) - end - def should_be_ignored(item, allowlist) return false if allowlist.nil?