-
Notifications
You must be signed in to change notification settings - Fork 498
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
F #4901: Updates MEM & CPU when RESERVED_ attributes are updated. Add…
…s TOTAL_CPU and TOTAL_MEM shares to store raw monitoring cpu/mem metrics. Adds migrator and increases local DB version number.
- Loading branch information
Showing
8 changed files
with
211 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -353,7 +353,7 @@ class Nebula | |
| */ | ||
| static string local_db_version() | ||
| { | ||
| return "4.90.0"; | ||
| return "5.2.0"; | ||
| } | ||
|
|
||
| /** | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| # -------------------------------------------------------------------------- # | ||
| # Copyright 2002-2016, OpenNebula Project, OpenNebula Systems # | ||
| # # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); you may # | ||
| # not use this file except in compliance with the License. You may obtain # | ||
| # a copy of the License at # | ||
| # # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 # | ||
| # # | ||
| # Unless required by applicable law or agreed to in writing, software # | ||
| # distributed under the License is distributed on an "AS IS" BASIS, # | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # | ||
| # See the License for the specific language governing permissions and # | ||
| # limitations under the License. # | ||
| #--------------------------------------------------------------------------- # | ||
|
|
||
|
|
||
| require 'set' | ||
| require 'base64' | ||
| require 'zlib' | ||
| require 'pathname' | ||
|
|
||
| require 'opennebula' | ||
|
|
||
| $: << File.dirname(__FILE__) | ||
| require 'db_schema' | ||
|
|
||
| include OpenNebula | ||
|
|
||
| module Migrator | ||
| def db_version | ||
| "5.2.0" | ||
| end | ||
|
|
||
| def one_version | ||
| "OpenNebula 5.2.0" | ||
| end | ||
|
|
||
| def up | ||
| init_log_time() | ||
|
|
||
| feature_4901() | ||
|
|
||
| log_time() | ||
|
|
||
| return true | ||
| end | ||
|
|
||
| private | ||
|
|
||
| def xpath(doc, sxpath) | ||
| element = doc.root.at_xpath(sxpath) | ||
| if !element.nil? | ||
| element.text | ||
| else | ||
| "" | ||
| end | ||
| end | ||
|
|
||
| ############################################################################ | ||
| # Feature 4921. Adds TOTAL_CPU and TOTAL_MEM to HOST/HOST_SHARE to compute | ||
| # MAX_CPU and MAX_MEM when RESERVED_CPU/MEM is updated | ||
| ############################################################################ | ||
| def feature_4901 | ||
| @db.run "ALTER TABLE host_pool RENAME TO old_host_pool;" | ||
| @db.run host_pool_schema() | ||
|
|
||
| @db.transaction do | ||
| @db.fetch("SELECT * FROM old_host_pool") do |row| | ||
| doc = Nokogiri::XML(row[:body], nil, NOKOGIRI_ENCODING) { |c| | ||
| c.default_xml.noblanks | ||
| } | ||
|
|
||
| rcpu = xpath(doc, "TEMPLATE/RESERVED_CPU").to_i | ||
| rmem = xpath(doc, "TEMPLATE/RESERVED_MEM").to_i | ||
|
|
||
| total_cpu = xpath(doc, "HOST_SHARE/MAX_CPU").to_i + rcpu | ||
| total_mem = xpath(doc, "HOST_SHARE/MAX_MEM").to_i + rmem | ||
|
|
||
| total_cpu_e = doc.create_element "TOTAL_CPU", total_cpu | ||
| total_mem_e = doc.create_element "TOTAL_MEM", total_mem | ||
|
|
||
| host_share = doc.root.at_xpath("HOST_SHARE") | ||
| host_share.add_child(total_cpu_e) | ||
| host_share.add_child(total_mem_e) | ||
|
|
||
| @db[:host_pool].insert( | ||
| :oid => row[:oid], | ||
| :name => row[:name], | ||
| :body => doc.root.to_s, | ||
| :state => row[:state], | ||
| :last_mon_time => row[:last_mon_time], | ||
| :uid => row[:uid], | ||
| :gid => row[:gid], | ||
| :owner_u => row[:owner_u], | ||
| :group_u => row[:group_u], | ||
| :other_u => row[:other_u], | ||
| :cid => row[:cid]) | ||
| end | ||
| end | ||
|
|
||
| @db.run "DROP TABLE old_host_pool;" | ||
| end | ||
|
|
||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| # -------------------------------------------------------------------------- # | ||
| # Copyright 2002-2016, OpenNebula Project, OpenNebula Systems # | ||
| # # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); you may # | ||
| # not use this file except in compliance with the License. You may obtain # | ||
| # a copy of the License at # | ||
| # # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 # | ||
| # # | ||
| # Unless required by applicable law or agreed to in writing, software # | ||
| # distributed under the License is distributed on an "AS IS" BASIS, # | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # | ||
| # See the License for the specific language governing permissions and # | ||
| # limitations under the License. # | ||
| #--------------------------------------------------------------------------- # | ||
|
|
||
| require 'set' | ||
| require 'base64' | ||
| require 'zlib' | ||
| require 'pathname' | ||
|
|
||
| require 'opennebula' | ||
|
|
||
| include OpenNebula | ||
|
|
||
| module Migrator | ||
| ############################################################################## | ||
| # DB schema for OpenNebula tables, each function may return the schema for | ||
| # each opennebula version | ||
| ############################################################################## | ||
| def host_pool_schema | ||
| case db_version() | ||
| when "4.5.80" | ||
| when "4.7.80" | ||
| when "4.9.80" | ||
| when "4.10.3" | ||
| when "4.11.80" | ||
| when "4.13.80" | ||
| when "4.13.85" | ||
| when "4.90.0" | ||
| when "5.2.0" | ||
| 'CREATE TABLE host_pool (oid INTEGER PRIMARY KEY, name VARCHAR(128), '\ | ||
| 'body MEDIUMTEXT, state INTEGER, last_mon_time INTEGER, uid INTEGER, '\ | ||
| 'gid INTEGER, owner_u INTEGER, group_u INTEGER, other_u INTEGER, '\ | ||
| 'cid INTEGER);' | ||
| end | ||
| end | ||
| end |