diff --git a/src/onedb/3.8.1_to_3.9.80.rb b/src/onedb/3.8.1_to_3.9.80.rb index 77555022b4..6c4f489615 100644 --- a/src/onedb/3.8.1_to_3.9.80.rb +++ b/src/onedb/3.8.1_to_3.9.80.rb @@ -112,6 +112,72 @@ module Migrator @db.run("DROP TABLE image_pool") @db.run("ALTER TABLE image_pool_new RENAME TO image_pool") + ######################################################################## + # Feature #1617 + # New datastore, 2 "files" + # DATASTORE/SYSTEM is now DATASTORE/TYPE + ######################################################################## + + @db.run "ALTER TABLE datastore_pool RENAME TO old_datastore_pool;" + @db.run "CREATE TABLE datastore_pool (oid INTEGER PRIMARY KEY, name VARCHAR(128), body TEXT, uid INTEGER, gid INTEGER, owner_u INTEGER, group_u INTEGER, other_u INTEGER, UNIQUE(name));" + + @db.fetch("SELECT * FROM old_datastore_pool") do |row| + doc = Document.new(row[:body]) + + type = "0" # IMAGE_DS + + system_elem = doc.root.delete_element("SYSTEM") + + if ( !system_elem.nil? && system_elem.text == "1" ) + type = "1" # SYSTEM_DS + end + + doc.root.add_element("TYPE").text = type + + doc.root.each_element("TEMPLATE") do |e| + e.delete_element("SYSTEM") + e.add_element("TYPE").text = type == "0" ? "IMAGE_DS" : "SYSTEM_DS" + end + + @db[:datastore_pool].insert( + :oid => row[:oid], + :name => row[:name], + :body => doc.root.to_s, + :uid => row[:uid], + :gid => row[:gid], + :owner_u => row[:owner_u], + :group_u => row[:group_u], + :other_u => row[:other_u]) + end + + @db.run "DROP TABLE old_datastore_pool;" + + + user_0_name = "oneadmin" + + @db.fetch("SELECT name FROM user_pool WHERE oid=0") do |row| + user_0_name = row[:name] + end + + group_0_name = "oneadmin" + + @db.fetch("SELECT name FROM group_pool WHERE oid=0") do |row| + group_0_name = row[:name] + end + + base_path = "/var/lib/one/datastores/2" + + @db.fetch("SELECT body FROM datastore_pool WHERE oid=0") do |row| + doc = Document.new(row[:body]) + + doc.root.each_element("BASE_PATH") do |e| + base_path = e.text + base_path[-1] = "2" + end + end + + @db.run "INSERT INTO datastore_pool VALUES(2,'files','200#{user_0_name}#{group_0_name}files110100100fsssh#{base_path}20-1',0,0,1,1,1);" + ######################################################################## # Feature #1611: Default quotas