puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-26 01:58:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Custom-set VM lifetimes override system-wide

Browse source
This commit is contained in:
Scott Schneider 2014-08-22 11:04:38 -07:00
parent 3dbbb39a3b
commit b836ceea90
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/vmpooler/pool_manager.rb
View file

@ -380,9 +380,11 @@ module Vmpooler
$redis.smembers('vmpooler__running__'+pool['name']).each do |vm|
if ($redis.hget('vmpooler__active__'+pool['name'], vm))
running = (Time.now - Time.parse($redis.hget('vmpooler__active__'+pool['name'], vm)))/60/60
lifetime = $redis.hget('vmpooler__vm__'+vm, 'lifetime') || $config[:config]['vm_lifetime']
if (
($config[:config]['vm_lifetime'] > 0) and
(running > $config[:config]['vm_lifetime'])
(lifetime.to_i > 0) and
(running.to_i > lifetime.to_i)
)
$redis.smove('vmpooler__running__'+pool['name'], 'vmpooler__completed__'+pool['name'], vm)