From 4f8dd980d45f25c0e5dd2be0070d97e6deca9a36 Mon Sep 17 00:00:00 2001 From: Alejandro Huertas Date: Fri, 26 Apr 2019 11:54:17 +0200 Subject: [PATCH] F #3082: fix fsck version and add system_disk_size field --- share/linters/.rubocop.yml | 3 +++ src/onedb/fsck.rb | 4 ++-- src/onedb/fsck/quotas.rb | 6 ++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/share/linters/.rubocop.yml b/share/linters/.rubocop.yml index 3d23a268d37..0e6a3f16357 100644 --- 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 index eb7e1800d51..5f41b7cf49f 100644 --- 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 index 7903f926514..e4777264ced 100644 --- 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|