F #3082: fix fsck version and add system_disk_size field (#3279)

OpenNebula · Apr 27, 2019 · 523612b · 523612b
1 parent 485ffe8
commit 523612b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/share/linters/.rubocop.yml b/share/linters/.rubocop.yml
@@ -562,6 +562,7 @@ AllCops:
     - src/onedb/shared/3.9.90_to_4.0.0.rb
     - src/onedb/shared/4.0.0_to_4.0.1.rb
     - src/onedb/shared/4.1.80_to_4.2.0.rb
+    - src/onedb/shared/5.6.0_to_5.10.0.rb
     - src/onedb/local/5.3.80_to_5.4.0.rb
     - src/onedb/local/4.13.80_to_4.13.85.rb
     - src/onedb/local/5.6.0_to_5.7.80.rb
@@ -576,6 +577,8 @@ AllCops:
     - src/onedb/local/5.5.80_to_5.6.0.rb
     - src/onedb/local/4.7.80_to_4.9.80.rb
     - src/onedb/local/5.8.0_to_5.9.80.rb
+    - src/onedb/local/5.8.0_to_5.10.0.rb
+    - src/onedb/local/5.6.0_to_5.10.0.rb
     - src/onedb/onedb_live.rb
     - src/onedb/onedb_backend.rb
     - src/onedb/sqlite2mysql.rb

diff --git a/src/onedb/fsck.rb b/src/onedb/fsck.rb
@@ -52,8 +52,8 @@
 require 'fsck/quotas'
 
 module OneDBFsck
-    VERSION = "5.6.0"
-    LOCAL_VERSION = "5.8.0"
+    VERSION = "5.10.0"
+    LOCAL_VERSION = "5.10.0"
 
     def db_version
         if defined?(@db_version) && @db_version

diff --git a/src/onedb/fsck/quotas.rb b/src/onedb/fsck/quotas.rb
@@ -376,6 +376,12 @@ def calculate_vm_quotas(doc, query, resource, resources)
 
             vm_elem.add_child(doc.create_element(vms)).content           = '-1'
             vm_elem.add_child(doc.create_element("#{vms}_USED")).content = '0'
+
+            system_disk_e      = doc.create_element('SYSTEM_DISK_SIZE')
+            system_disk_used_e = doc.create_element('SYSTEM_DISK_SIZE_USED')
+
+            vm_elem.add_child(system_disk_e).content      = '-1'
+            vm_elem.add_child(system_disk_used_e).content = '0'
         end
 
         vm_elem.xpath("#{cpu}_USED").each do |e|