Revision f1e64aba Ganeti/HTools/Node.hs
b/Ganeti/HTools/Node.hs | ||
---|---|---|
223 | 223 |
new_mp = (fromIntegral new_mem) / (t_mem t) |
224 | 224 |
new_dp = (fromIntegral new_dsk) / (t_dsk t) |
225 | 225 |
new_failn1 = computeFailN1 (r_mem t) new_mem new_dsk |
226 |
new_ucpu = (u_cpu t) - (Instance.vcpus inst) |
|
227 |
new_rcpu = (fromIntegral new_ucpu) / (t_cpu t) |
|
226 | 228 |
in t {plist = new_plist, f_mem = new_mem, f_dsk = new_dsk, |
227 |
failN1 = new_failn1, p_mem = new_mp, p_dsk = new_dp} |
|
229 |
failN1 = new_failn1, p_mem = new_mp, p_dsk = new_dp, |
|
230 |
u_cpu = new_ucpu, p_cpu = new_rcpu} |
|
228 | 231 |
|
229 | 232 |
-- | Removes a secondary instance. |
230 | 233 |
removeSec :: Node -> Instance.Instance -> Node |
... | ... | |
255 | 258 |
let iname = Instance.idx inst |
256 | 259 |
new_mem = f_mem t - Instance.mem inst |
257 | 260 |
new_dsk = f_dsk t - Instance.dsk inst |
258 |
new_failn1 = computeFailN1 (r_mem t) new_mem new_dsk in |
|
261 |
new_failn1 = computeFailN1 (r_mem t) new_mem new_dsk |
|
262 |
new_ucpu = (u_cpu t) + (Instance.vcpus inst) |
|
263 |
new_pcpu = (fromIntegral new_ucpu) / (t_cpu t) |
|
264 |
in |
|
259 | 265 |
if (failHealth new_mem new_dsk) || (new_failn1 && not (failN1 t)) then |
260 | 266 |
Nothing |
261 | 267 |
else |
... | ... | |
264 | 270 |
new_dp = (fromIntegral new_dsk) / (t_dsk t) |
265 | 271 |
in |
266 | 272 |
Just t {plist = new_plist, f_mem = new_mem, f_dsk = new_dsk, |
267 |
failN1 = new_failn1, p_mem = new_mp, p_dsk = new_dp} |
|
273 |
failN1 = new_failn1, p_mem = new_mp, p_dsk = new_dp, |
|
274 |
u_cpu = new_ucpu, p_cpu = new_pcpu} |
|
268 | 275 |
|
269 | 276 |
-- | Adds a secondary instance. |
270 | 277 |
addSec :: Node -> Instance.Instance -> T.Ndx -> Maybe Node |
Also available in: Unified diff