shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-11 05:17:41 +03:00
Code Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alejandro Huertas Herrero 2019-04-27 21:01:07 +02:00 committed by Ruben S. Montero
parent 485ffe84cc
commit 523612b923
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
share/linters/.rubocop.yml
View File

@ -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

4
src/onedb/fsck.rb
View File

@ -52,8 +52,8 @@ require 'fsck/template'
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

6
src/onedb/fsck/quotas.rb
View File

@ -376,6 +376,12 @@ module OneDBFsck
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|