From 0c360cd2b2940053aabb25fab33a1fab0ecd280b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 20 Feb 2014 16:36:06 +0100 Subject: [PATCH] Bug #2741: Do not use floats to calculate cpu quotas in fsck (cherry picked from commit 3a0fefc1c1f9d8e5bd42d26fb6d95edd4ce62453) Conflicts: src/onedb/fsck.rb --- src/onedb/fsck.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/onedb/fsck.rb b/src/onedb/fsck.rb index 16ca5b5523..60cc33f40a 100644 --- a/src/onedb/fsck.rb +++ b/src/onedb/fsck.rb @@ -1348,7 +1348,7 @@ module OneDBFsck oid = doc.root.at_xpath("ID").text.to_i # VM quotas - cpu_used = 0.0 + cpu_used = 0 mem_used = 0 vms_used = 0 vol_used = 0 @@ -1365,9 +1365,8 @@ module OneDBFsck # VM quotas vmdoc.root.xpath("TEMPLATE/CPU").each { |e| # truncate to 2 decimals - cpu = (e.text.to_f * 100).to_i / 100.0 + cpu = (e.text.to_f * 100).to_i cpu_used += cpu - cpu_used = (cpu_used * 100).to_i / 100.0 } vmdoc.root.xpath("TEMPLATE/MEMORY").each { |e| @@ -1437,6 +1436,8 @@ module OneDBFsck # Check if the float value or the string representation mismatch, # but ignoring the precision + cpu_used = (cpu_used / 100.0) + different = ( e.text.to_f != cpu_used || ![sprintf('%.2f', cpu_used), sprintf('%.1f', cpu_used), sprintf('%.0f', cpu_used)].include?(e.text) )