shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

F #3371: refactor and lint datastore fsck (#3403)

Browse Source
This commit is contained in:
Alejandro Huertas Herrero 2019-06-04 14:43:00 +02:00 committed by Ruben S. Montero
parent 9849631493
commit d0f227e399
2 changed files with 90 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
share/linters/.rubocop.yml
View File

@ -496,7 +496,6 @@ AllCops:
- src/cloud/ec2/lib/econe_application.rb
- src/onedb/database_schema.rb
- src/onedb/fsck/image.rb
- src/onedb/fsck/datastore.rb
- src/onedb/fsck/history.rb
- src/onedb/fsck/vrouter.rb
- src/onedb/fsck/pool_control.rb

171
src/onedb/fsck/datastore.rb
View File

@ -1,73 +1,115 @@
# Datastore module
module OneDBFsck
# Gather datastores information
def init_datastore_counters
@data_datastore = {}
@db.fetch("SELECT oid, name FROM datastore_pool") do |row|
@data_datastore[row[:oid]] = {
name: row[:name],
images: []
}
@db.fetch('SELECT oid, name FROM datastore_pool') do |row|
@data_datastore[row[:oid]] = { :name => row[:name], :images => [] }
end
end
# Check datastores images and fix it
def check_fix_datastore
datastore = @data_datastore
create_table(:datastore_pool, :datastore_pool_new)
@db.transaction do
@db.fetch('SELECT * from datastore_pool') do |row|
ds_id = row[:oid]
doc = Document.new(row[:body])
images_elem = doc.root.elements.delete('IMAGES')
images_new_elem = doc.root.add_element('IMAGES')
datastore[ds_id][:images].each do |id|
id_elem = images_elem.elements.delete("ID[.=#{id}]")
if id_elem.nil?
log_error(
"Image #{id} is missing from Datastore #{ds_id} " \
'image id list'
)
end
images_new_elem.add_element('ID').text = id.to_s
end
images_elem.each_element('ID') do |id_elem|
log_error(
"Image #{id_elem.text} is in Datastore #{ds_id} " \
'image id list, but it should not'
)
end
row[:body] = doc.root.to_s
# commit
@db[:datastore_pool_new].insert(row)
end
end
# Rename table
@db.run('DROP TABLE datastore_pool')
@db.run('ALTER TABLE datastore_pool_new RENAME TO datastore_pool')
end
# Check datastores clusters
def check_datastore_cluster
cluster = @data_cluster
cluster = @data_cluster
@fixes_datastore_cluster = {}
@db.fetch("SELECT oid,body FROM datastore_pool") do |row|
@db.fetch('SELECT oid,body FROM datastore_pool') do |row|
doc = nokogiri_doc(row[:body])
oid = row[:oid]
doc.root.xpath("CLUSTERS/ID").each do |e|
cluster_id = e.text.to_i
cluster_entry = cluster[cluster_id]
doc.root.xpath('CLUSTERS/ID').each do |e|
cid = e.text.to_i
cluster_entry = cluster[cid]
if cluster_entry.nil?
log_error("Datastore #{row[:oid]} is in cluster " <<
"#{cluster_id}, but it does not exist")
log_error("Datastore #{oid} is in cluster #{cid}, " \
'but it does not exist')
e.remove
@fixes_datastore_cluster[row[:oid]] = { body: doc.root.to_s }
@fixes_datastore_cluster[oid] = { :body => doc.root.to_s }
else
cluster_entry[:datastores] << row[:oid]
cluster_entry[:datastores] << oid
end
end
end
end
def fix_datastore_cluster
@db.transaction do
@fixes_datastore_cluster.each do |id, entry|
@db[:datastore_pool].where(oid: id).update(body: entry[:body])
end
end
end
# Check datastores images
def check_datastore_image
datastore = @data_datastore
datastore = @data_datastore
@fixes_datastore_image = {}
@db.fetch("SELECT oid,body FROM image_pool") do |row|
doc = Document.new(row[:body])
ds_id = doc.root.get_text('DATASTORE_ID').to_s.to_i
@db.fetch('SELECT oid,body FROM image_pool') do |row|
doc = Document.new(row[:body])
ds_id = doc.root.get_text('DATASTORE_ID').to_s.to_i
ds_name = doc.root.get_text('DATASTORE')
if ds_id != -1
ds_entry = datastore[ds_id]
if ds_entry.nil?
log_error("Image #{row[:oid]} has datastore #{ds_id}, but it does not exist. The image is probably unusable, and needs to be deleted manually:\n"<<
" * The image contents should be deleted manually:\n"<<
" #{doc.root.get_text('SOURCE')}\n"<<
" * The DB entry can be then deleted with the command:\n"<<
" DELETE FROM image_pool WHERE oid=#{row[:oid]};\n"<<
" * Run fsck again.\n", false)
log_error("Image #{row[:oid]} has datastore #{ds_id}, " \
'but it does not exist. The image is probably ' \
"unusable, and needs to be deleted manually:\n" \
' * The image contents should be deleted ' \
"manually:\n #{doc.root.get_text('SOURCE')}\n" \
' * The DB entry can be then deleted with ' \
"the command:\n" \
' DELETE FROM image_pool WHERE ' \
"oid=#{row[:oid]};\n * Run fsck again.\n", false)
else
if ds_name != ds_entry[:name]
log_error("Image #{row[:oid]} has a wrong name for datastore #{ds_id}, #{ds_name}. It will be changed to #{ds_entry[:name]}")
log_error("Image #{row[:oid]} has a wrong name " \
"for datastore #{ds_id}, #{ds_name}. " \
"It will be changed to #{ds_entry[:name]}")
doc.root.each_element('DATASTORE') do |e|
e.text = ds_entry[:name]
@ -82,6 +124,18 @@ module OneDBFsck
end
end
# Fix datastores clusters
def fix_datastore_cluster
@db.transaction do
@fixes_datastore_cluster.each do |id, entry|
body = entry[:body]
@db[:datastore_pool].where(:oid => id).update(:body => body)
end
end
end
# Fix datastores images
def fix_datastore_image
@db.transaction do
@fixes_datastore_image.each do |id, body|
@ -90,49 +144,4 @@ module OneDBFsck
end
end
def check_fix_datastore
datastore = @data_datastore
create_table(:datastore_pool, :datastore_pool_new)
@db.transaction do
@db.fetch("SELECT * from datastore_pool") do |row|
ds_id = row[:oid]
doc = Document.new(row[:body])
images_elem = doc.root.elements.delete("IMAGES")
images_new_elem = doc.root.add_element("IMAGES")
datastore[ds_id][:images].each do |id|
id_elem = images_elem.elements.delete("ID[.=#{id}]")
if id_elem.nil?
log_error(
"Image #{id} is missing from Datastore #{ds_id} "<<
"image id list")
end
images_new_elem.add_element("ID").text = id.to_s
end
images_elem.each_element("ID") do |id_elem|
log_error(
"Image #{id_elem.text} is in Datastore #{ds_id} "<<
"image id list, but it should not")
end
row[:body] = doc.root.to_s
# commit
@db[:datastore_pool_new].insert(row)
end
end
# Rename table
@db.run("DROP TABLE datastore_pool")
@db.run("ALTER TABLE datastore_pool_new RENAME TO datastore_pool")
end
end