vmpooler 0.18.1 → 0.18.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/vmpooler/api/v1.rb +1 -5
- data/lib/vmpooler/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9c5b00eb18e417b534119f23d2e5e8127469b345906327a1ea6d0223851c113f
|
4
|
+
data.tar.gz: edd62d5343f0a569a9ef905f31fc4d5f14c0dc0d55644d285e9ab40a5403ff2d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6514b53e6ff62b228c696dd195d941f217eba85cdc8b97f8eedad81800d359d598d591f2840538f4d52d48cc54f50e75a8bbbf1cf080d25e23cbf216cd1dc16f
|
7
|
+
data.tar.gz: 4c1acb611e7213419302563e7327226e688fa024168c052bb8a374375fe3cb92dca90e15748ab42de9cd87877d209d1738b2a77607ced3a924a46eb336777be7
|
data/lib/vmpooler/api/v1.rb
CHANGED
@@ -163,18 +163,15 @@ module Vmpooler
|
|
163
163
|
end
|
164
164
|
|
165
165
|
def return_vm_to_ready_state(template, vm)
|
166
|
-
backend.multi
|
167
166
|
backend.srem("vmpooler__migrating__#{template}", vm)
|
168
167
|
backend.hdel("vmpooler__active__#{template}", vm)
|
169
168
|
backend.hdel("vmpooler__vm__#{vm}", 'checkout', 'token:token', 'token:user')
|
170
169
|
backend.smove("vmpooler__running__#{template}", "vmpooler__ready__#{template}", vm)
|
171
|
-
backend.exec
|
172
170
|
end
|
173
171
|
|
174
172
|
def account_for_starting_vm(template, vm)
|
175
173
|
user = backend.hget("vmpooler__token__#{request.env['HTTP_X_AUTH_TOKEN']}", 'user')
|
176
174
|
has_token_result = has_token?
|
177
|
-
backend.multi
|
178
175
|
backend.sadd("vmpooler__migrating__#{template}", vm)
|
179
176
|
backend.hset("vmpooler__active__#{template}", vm, Time.now)
|
180
177
|
backend.hset("vmpooler__vm__#{vm}", 'checkout', Time.now)
|
@@ -187,7 +184,6 @@ module Vmpooler
|
|
187
184
|
backend.hset("vmpooler__vm__#{vm}", 'lifetime', config['vm_lifetime_auth'].to_i)
|
188
185
|
end
|
189
186
|
end
|
190
|
-
backend.exec
|
191
187
|
end
|
192
188
|
|
193
189
|
def update_result_hosts(result, template, vm)
|
@@ -213,7 +209,7 @@ module Vmpooler
|
|
213
209
|
if vmname
|
214
210
|
account_for_starting_vm(vmpool, vmname)
|
215
211
|
vms << [vmpool, vmname, vmtemplate]
|
216
|
-
metrics.increment("checkout.success.#{
|
212
|
+
metrics.increment("checkout.success.#{vmpool}")
|
217
213
|
else
|
218
214
|
failed = true
|
219
215
|
metrics.increment("checkout.empty.#{requested}")
|
data/lib/vmpooler/version.rb
CHANGED