mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-26 01:58:41 -05:00
(RE-15162) Update Redis gem to version 5
This commit is contained in:
isaac-hammes
parent
cb6df6c9aa
commit
30820ec115
5 changed files with 85 additions and 85 deletions
|
|
@ -18,7 +18,7 @@ module Vmpooler
|
|||
# Dependencies for tracing
|
||||
require 'opentelemetry-instrumentation-concurrent_ruby'
|
||||
require 'opentelemetry-instrumentation-http_client'
|
||||
require 'opentelemetry-instrumentation-redis'
|
||||
# require 'opentelemetry-instrumentation-redis'
|
||||
require 'opentelemetry-instrumentation-sinatra'
|
||||
require 'opentelemetry-sdk'
|
||||
require 'opentelemetry/exporter/jaeger'
|
||||
|
|
@ -103,7 +103,7 @@ module Vmpooler
|
|||
parsed_config[:redis]['data_ttl'] = string_to_int(ENV['REDIS_DATA_TTL']) || parsed_config[:redis]['data_ttl'] || 168
|
||||
parsed_config[:redis]['connection_pool_size'] = string_to_int(ENV['REDIS_CONNECTION_POOL_SIZE']) || parsed_config[:redis]['connection_pool_size'] || 10
|
||||
parsed_config[:redis]['connection_pool_timeout'] = string_to_int(ENV['REDIS_CONNECTION_POOL_TIMEOUT']) || parsed_config[:redis]['connection_pool_timeout'] || 5
|
||||
parsed_config[:redis]['reconnect_attempts'] = string_to_int(ENV['REDIS_RECONNECT_ATTEMPTS']) || parsed_config[:redis]['reconnect_attempts'] || 10
|
||||
parsed_config[:redis]['reconnect_attempts'] = string_array_to_array(ENV['REDIS_RECONNECT_ATTEMPTS']) || parsed_config[:redis]['reconnect_attempts'] || 10
|
||||
|
||||
parsed_config[:statsd] = parsed_config[:statsd] || {} if ENV['STATSD_SERVER']
|
||||
parsed_config[:statsd]['server'] = ENV['STATSD_SERVER'] if ENV['STATSD_SERVER']
|
||||
|
|
@ -209,8 +209,7 @@ module Vmpooler
|
|||
end
|
||||
|
||||
def self.new_redis(host = 'localhost', port = nil, password = nil, redis_reconnect_attempts = 10)
|
||||
Redis.new(host: host, port: port, password: password, reconnect_attempts: redis_reconnect_attempts, reconnect_delay: 1.5,
|
||||
reconnect_delay_max: 10.0)
|
||||
Redis.new(host: host, port: port, password: password, reconnect_attempts: redis_reconnect_attempts, timeout: 5)
|
||||
end
|
||||
|
||||
def self.pools(conf)
|
||||
|
|
@ -235,6 +234,13 @@ module Vmpooler
|
|||
Integer(s)
|
||||
end
|
||||
|
||||
def self.string_array_to_array(s)
|
||||
# Returns an array from an array like string
|
||||
return if s.nil?
|
||||
|
||||
JSON.parse(s)
|
||||
end
|
||||
|
||||
def self.true?(obj)
|
||||
obj.to_s.downcase == 'true'
|
||||
end
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ module Vmpooler
|
|||
currently_configured_pools = []
|
||||
config[:pools].each do |pool|
|
||||
currently_configured_pools << pool['name']
|
||||
redis.sadd('vmpooler__pools', pool['name'])
|
||||
redis.sadd('vmpooler__pools', pool['name'].to_s)
|
||||
pool_keys = pool.keys
|
||||
pool_keys.delete('alias')
|
||||
to_set = {}
|
||||
|
|
@ -68,11 +68,12 @@ module Vmpooler
|
|||
end
|
||||
to_set['alias'] = pool['alias'].join(',') if to_set.key?('alias')
|
||||
to_set['domain'] = Vmpooler::Dns.get_domain_for_pool(config, pool['name'])
|
||||
redis.hmset("vmpooler__pool__#{pool['name']}", to_set.to_a.flatten) unless to_set.empty?
|
||||
|
||||
redis.hmset("vmpooler__pool__#{pool['name']}", *to_set.to_a.flatten) unless to_set.empty?
|
||||
end
|
||||
previously_configured_pools.each do |pool|
|
||||
unless currently_configured_pools.include? pool
|
||||
redis.srem('vmpooler__pools', pool)
|
||||
redis.srem('vmpooler__pools', pool.to_s)
|
||||
redis.del("vmpooler__pool__#{pool}")
|
||||
end
|
||||
end
|
||||
|
|
@ -129,7 +130,6 @@ module Vmpooler
|
|||
if exists
|
||||
request_id = redis.hget("vmpooler__vm__#{vm}", 'request_id')
|
||||
pool_alias = redis.hget("vmpooler__vm__#{vm}", 'pool_alias') if request_id
|
||||
redis.multi
|
||||
redis.smove("vmpooler__pending__#{pool}", "vmpooler__completed__#{pool}", vm)
|
||||
if request_id
|
||||
ondemandrequest_hash = redis.hgetall("vmpooler__odrequest__#{request_id}")
|
||||
|
|
@ -138,7 +138,6 @@ module Vmpooler
|
|||
redis.zadd('vmpooler__odcreate__task', 1, "#{pool_alias}:#{pool}:1:#{request_id}")
|
||||
end
|
||||
end
|
||||
redis.exec
|
||||
$metrics.increment("errors.markedasfailed.#{pool}")
|
||||
$logger.log('d', "[!] [#{pool}] '#{vm}' marked as 'failed' after #{timeout} minutes")
|
||||
else
|
||||
|
|
@ -428,16 +427,15 @@ module Vmpooler
|
|||
mutex = vm_mutex(new_vmname)
|
||||
mutex.synchronize do
|
||||
@redis.with_metrics do |redis|
|
||||
# Add VM to Redis inventory ('pending' pool)
|
||||
redis.multi
|
||||
redis.sadd("vmpooler__pending__#{pool_name}", new_vmname)
|
||||
redis.hset("vmpooler__vm__#{new_vmname}", 'clone', Time.now)
|
||||
redis.hset("vmpooler__vm__#{new_vmname}", 'template', pool_name) # This value is used to represent the pool.
|
||||
redis.hset("vmpooler__vm__#{new_vmname}", 'pool', pool_name)
|
||||
redis.hset("vmpooler__vm__#{new_vmname}", 'domain', pool_domain)
|
||||
redis.hset("vmpooler__vm__#{new_vmname}", 'request_id', request_id) if request_id
|
||||
redis.hset("vmpooler__vm__#{new_vmname}", 'pool_alias', pool_alias) if pool_alias
|
||||
redis.exec
|
||||
redis.multi do |transaction|
|
||||
transaction.sadd("vmpooler__pending__#{pool_name}", new_vmname)
|
||||
transaction.hset("vmpooler__vm__#{new_vmname}", 'clone', Time.now.to_s)
|
||||
transaction.hset("vmpooler__vm__#{new_vmname}", 'template', pool_name) # This value is used to represent the pool.
|
||||
transaction.hset("vmpooler__vm__#{new_vmname}", 'pool', pool_name)
|
||||
transaction.hset("vmpooler__vm__#{new_vmname}", 'domain', pool_domain)
|
||||
transaction.hset("vmpooler__vm__#{new_vmname}", 'request_id', request_id) if request_id
|
||||
transaction.hset("vmpooler__vm__#{new_vmname}", 'pool_alias', pool_alias) if pool_alias
|
||||
end
|
||||
end
|
||||
|
||||
begin
|
||||
|
|
@ -502,7 +500,7 @@ module Vmpooler
|
|||
@redis.with_metrics do |redis|
|
||||
redis.pipelined do |pipeline|
|
||||
pipeline.hdel("vmpooler__active__#{pool}", vm)
|
||||
pipeline.hset("vmpooler__vm__#{vm}", 'destroy', Time.now)
|
||||
pipeline.hset("vmpooler__vm__#{vm}", 'destroy', Time.now.to_s)
|
||||
|
||||
# Auto-expire metadata key
|
||||
pipeline.expire("vmpooler__vm__#{vm}", ($config[:redis]['data_ttl'].to_i * 60 * 60))
|
||||
|
|
@ -868,12 +866,13 @@ module Vmpooler
|
|||
def sleep_with_wakeup_events(loop_delay, wakeup_period = 5, options = {})
|
||||
exit_by = Time.now + loop_delay
|
||||
wakeup_by = Time.now + wakeup_period
|
||||
|
||||
return if time_passed?(:exit_by, exit_by)
|
||||
|
||||
@redis.with_metrics do |redis|
|
||||
initial_ready_size = redis.scard("vmpooler__ready__#{options[:poolname]}") if options[:pool_size_change]
|
||||
|
||||
initial_clone_target = redis.hget("vmpooler__pool__#{options[:poolname]}", options[:clone_target]) if options[:clone_target_change]
|
||||
initial_clone_target = redis.hget("vmpooler__pool__#{options[:poolname]}", options[:clone_target].to_s) if options[:clone_target_change]
|
||||
|
||||
initial_template = redis.hget('vmpooler__template__prepared', options[:poolname]) if options[:pool_template_change]
|
||||
|
||||
|
|
@ -912,16 +911,15 @@ module Vmpooler
|
|||
end
|
||||
|
||||
if options[:pending_vm]
|
||||
pending_vm_count = redis.scard("vmpooler__pending__#{options[:poolname]}")
|
||||
pending_vm_count = redis.scard("vmpooler__pending__#{options[:poolname]}")
|
||||
break unless pending_vm_count == 0
|
||||
end
|
||||
|
||||
if options[:ondemand_request]
|
||||
redis.multi
|
||||
redis.zcard('vmpooler__provisioning__request')
|
||||
redis.zcard('vmpooler__provisioning__processing')
|
||||
redis.zcard('vmpooler__odcreate__task')
|
||||
od_request, od_processing, od_createtask = redis.exec
|
||||
od_request = redis.zcard('vmpooler__provisioning__request')
|
||||
od_processing = redis.zcard('vmpooler__provisioning__processing')
|
||||
od_createtask = redis.zcard('vmpooler__odcreate__task')
|
||||
|
||||
break unless od_request == 0
|
||||
break unless od_processing == 0
|
||||
break unless od_createtask == 0
|
||||
|
|
@ -1093,10 +1091,8 @@ module Vmpooler
|
|||
|
||||
def remove_excess_vms(pool)
|
||||
@redis.with_metrics do |redis|
|
||||
redis.multi
|
||||
redis.scard("vmpooler__ready__#{pool['name']}")
|
||||
redis.scard("vmpooler__pending__#{pool['name']}")
|
||||
ready, pending = redis.exec
|
||||
ready = redis.scard("vmpooler__ready__#{pool['name']}")
|
||||
pending = redis.scard("vmpooler__pending__#{pool['name']}")
|
||||
total = pending.to_i + ready.to_i
|
||||
break if total.nil?
|
||||
break if total == 0
|
||||
|
|
@ -1334,12 +1330,11 @@ module Vmpooler
|
|||
return if pool_mutex(pool_name).locked?
|
||||
|
||||
@redis.with_metrics do |redis|
|
||||
redis.multi
|
||||
redis.scard("vmpooler__ready__#{pool_name}")
|
||||
redis.scard("vmpooler__pending__#{pool_name}")
|
||||
redis.scard("vmpooler__running__#{pool_name}")
|
||||
ready, pending, running = redis.exec
|
||||
total = pending.to_i + ready.to_i
|
||||
ready = redis.scard("vmpooler__ready__#{pool_name}")
|
||||
pending = redis.scard("vmpooler__pending__#{pool_name}")
|
||||
running = redis.scard("vmpooler__running__#{pool_name}")
|
||||
|
||||
total = pending.to_i + ready.to_i
|
||||
|
||||
$metrics.gauge("ready.#{pool_name}", ready)
|
||||
$metrics.gauge("running.#{pool_name}", running)
|
||||
|
|
@ -1594,11 +1589,9 @@ module Vmpooler
|
|||
|
||||
return unless vms_ready?(request_id, redis)
|
||||
|
||||
redis.multi
|
||||
redis.hset(ondemand_hash_key, 'status', 'ready')
|
||||
redis.expire(ondemand_hash_key, default_expiration)
|
||||
redis.zrem(processing_key, request_id)
|
||||
redis.exec
|
||||
end
|
||||
|
||||
def request_expired?(request_id, score, redis)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue