Skip to content
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

(maint) Fix bugs from redis and timeout notification updates. #621

Merged
merged 3 commits into from
Aug 24, 2023
Merged

(maint) Fix bugs from redis and timeout notification updates. #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8beab7f
(maint) Fix bug where fail_pending_vm was logging an error before any…
isaac-hammes Aug 23, 2023
1c5b066
(maint) Fix bug by removing redis transaction
isaac-hammes Aug 23, 2023
ef7000d
(maint) Fix spec test to catch unexpected logging in fail_pending_vm.
isaac-hammes Aug 24, 2023
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
8 changes: 3 additions & 5 deletions lib/vmpooler/api/v3.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,9 @@ def component_to_test(match, labels_string)
def update_user_metrics(operation, vmname)
tracer.in_span("Vmpooler::API::V3.#{__method__}") do |span|
begin
backend.multi
backend.hget("vmpooler__vm__#{vmname}", 'tag:jenkins_build_url')
backend.hget("vmpooler__vm__#{vmname}", 'token:user')
backend.hget("vmpooler__vm__#{vmname}", 'template')
jenkins_build_url, user, poolname = backend.exec
jenkins_build_url = backend.hget("vmpooler__vm__#{vmname}", 'tag:jenkins_build_url')
user = backend.hget("vmpooler__vm__#{vmname}", 'token:user')
poolname = backend.hget("vmpooler__vm__#{vmname}", 'template')
poolname = poolname.gsub('.', '_')

if user
Expand Down
2 changes: 2 additions & 0 deletions lib/vmpooler/pool_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ def fail_pending_vm(vm, pool, timeout, timeout_notification, redis, exists: true
already_timed_out = time_since_clone > timeout
timing_out_soon = time_since_clone > timeout_notification && !redis.hget("vmpooler__vm__#{vm}", 'timeout_notification')

return true if !already_timed_out && !timing_out_soon
yachub marked this conversation as resolved.
Show resolved Hide resolved

if already_timed_out
unless exists
remove_nonexistent_vm(vm, pool, redis)
Expand Down
3 changes: 3 additions & 0 deletions spec/unit/pool_manager_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,13 +275,15 @@

it 'takes no action if VM is not cloning' do
redis_connection_pool.with do |redis|
expect(logger).to_not receive(:log)
expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis)).to eq(true)
end
end

it 'takes no action if VM is within timeout' do
redis_connection_pool.with do |redis|
redis.hset("vmpooler__vm__#{vm}", 'clone',Time.now.to_s)
expect(logger).to_not receive(:log)
expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis)).to eq(true)
expect(redis.sismember("vmpooler__pending__#{pool}", vm)).to be(true)
end
Expand All @@ -307,6 +309,7 @@
it 'calls remove_nonexistent_vm if VM has exceeded timeout and does not exist' do
redis_connection_pool.with do |redis|
redis.hset("vmpooler__vm__#{vm}", 'clone',Date.new(2001,1,1).to_s)
expect(logger).to_not receive(:log)
expect(subject).to receive(:remove_nonexistent_vm).with(vm, pool, redis)
expect(subject.fail_pending_vm(vm, pool, timeout, timeout_notification, redis, exists: false)).to eq(true)
end
Expand Down