From ab63767ee7b73833876bc92dcdac7e5008cafba3 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Thu, 1 Jun 2017 12:25:10 +0200 Subject: [PATCH] F #4809: Tool to backup/restore the database (with federated option) --- src/onedb/onedb | 15 ++++-- src/onedb/onedb.rb | 6 +-- src/onedb/onedb_backend.rb | 94 +++++++++++++++++++++++++++++--------- 3 files changed, 88 insertions(+), 27 deletions(-) diff --git a/src/onedb/onedb b/src/onedb/onedb index ef11a2cac1..17aff6afd0 100755 --- a/src/onedb/onedb +++ b/src/onedb/onedb @@ -64,6 +64,12 @@ BACKUP={ :format => String } +FEDERATED = { + :name => "federated", + :large => "--federated", + :description => "Limit backup/restore to federated tables" +} + ############################################################################### # SQLite options ############################################################################### @@ -239,7 +245,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do Dumps the DB to a file specified in the argument EOT - command :backup, backup_desc, [:output_file, nil], :options=>FORCE do + command :backup, backup_desc, [:output_file, nil], + :options=>[FORCE, FEDERATED] do + begin helper = OneDB.new(options) helper.backup(args[0], options) @@ -289,7 +297,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do from the same backend (SQLite or MySQL) EOT - command :restore , restore_desc, [:backup_file, nil], :options=>FORCE do + command :restore , restore_desc, [:backup_file, nil], + :options=>[FORCE, FEDERATED] do + begin helper = OneDB.new(options) helper.restore(args[0], options) @@ -332,7 +342,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do end end - ########################################################################### # Import slave ########################################################################### diff --git a/src/onedb/onedb.rb b/src/onedb/onedb.rb index 130f6c08db..bd660e0147 100644 --- a/src/onedb/onedb.rb +++ b/src/onedb/onedb.rb @@ -71,14 +71,14 @@ class OneDB end def backup(bck_file, ops, backend=@backend) - bck_file = backend.bck_file if bck_file.nil? + bck_file = backend.bck_file(ops[:federated]) if bck_file.nil? if !ops[:force] && File.exists?(bck_file) raise "File #{bck_file} exists, backup aborted. Use -f " << "to overwrite." end - backend.backup(bck_file) + backend.backup(bck_file, ops[:federated]) return 0 end @@ -89,7 +89,7 @@ class OneDB one_not_running - backend.restore(bck_file, ops[:force]) + backend.restore(bck_file, ops[:force], ops[:federated]) return 0 end diff --git a/src/onedb/onedb_backend.rb b/src/onedb/onedb_backend.rb index d10dc39aae..1713d42255 100644 --- a/src/onedb/onedb_backend.rb +++ b/src/onedb/onedb_backend.rb @@ -18,6 +18,7 @@ require 'time' require 'rubygems' require 'cgi' require 'database_schema' +require 'open3' begin require 'sequel' @@ -28,6 +29,9 @@ rescue LoadError end class OneDBBacKEnd + FEDERATED_TABLES = %w(group_pool user_pool acl zone_pool vdc_pool + marketplace_pool marketplaceapp_pool fed_logdb) + def read_db_version connect_db @@ -231,17 +235,29 @@ class BackEndMySQL < OneDBBacKEnd @db_name = @db_name[1..-2] if @db_name[0] == ?" end - def bck_file + def bck_file(federated = false) t = Time.now - "#{VAR_LOCATION}/mysql_#{@server}_#{@db_name}_"<< - "#{t.year}-#{t.month}-#{t.day}_#{t.hour}:#{t.min}:#{t.sec}.sql" + + bck_name = "#{VAR_LOCATION}/mysql_#{@server}_#{@db_name}_" + + bck_name << "federated_" if federated + + bck_name << "#{t.year}-#{t.month}-#{t.day}_" + bck_name << "#{t.hour}:#{t.min}:#{t.sec}.sql" + + bck_name end - def backup(bck_file) - cmd = "mysqldump -u #{@user} -p'#{@passwd}' -h #{@server} " + - "-P #{@port} --add-drop-table #{@db_name} > #{bck_file}" + def backup(bck_file, federated = false) + cmd = "mysqldump -u #{@user} -p'#{@passwd}' -h #{@server} " << + "-P #{@port} --add-drop-table #{@db_name} " + + cmd << FEDERATED_TABLES.join(" ") if federated + + cmd << " > #{bck_file}" rc = system(cmd) + if !rc raise "Unknown error running '#{cmd}'" end @@ -252,10 +268,10 @@ class BackEndMySQL < OneDBBacKEnd puts end - def restore(bck_file, force=nil) + def restore(bck_file, force=nil, federated=false) connect_db - if !force && db_exists? + if !federated && !force && db_exists? raise "MySQL database #{@db_name} at #{@server} exists," << " use -f to overwrite." end @@ -294,25 +310,61 @@ class BackEndSQLite < OneDBBacKEnd end end - def bck_file + def bck_file(federated = false) t = Time.now - "#{VAR_LOCATION}/one.db_"<< - "#{t.year}-#{t.month}-#{t.day}_#{t.hour}:#{t.min}:#{t.sec}.bck" + bck_name = "#{VAR_LOCATION}/one.db_" + + bck_name << "federated_" if federated + + bck_name << "#{t.year}-#{t.month}-#{t.day}" + bck_name << "_#{t.hour}:#{t.min}:#{t.sec}.bck" + + bck_name end - def backup(bck_file) - FileUtils.cp(@sqlite_file, "#{bck_file}") - puts "Sqlite database backup stored in #{bck_file}" - puts "Use 'onedb restore' or copy the file back to restore the DB." - puts - end + def backup(bck_file, federated = false) + if federated + puts "Sqlite database backup of federated tables stored in #{bck_file}" - def restore(bck_file, force=nil) - if File.exists?(@sqlite_file) && !force - raise "File #{@sqlite_file} exists, use -f to overwrite." + File.open(bck_file, "w") do |f| + f.puts "-- FEDERATED" + FEDERATED_TABLES.each do |table| + f.puts "DROP TABLE IF EXISTS \"#{table}\";" + end + end + + FEDERATED_TABLES.each do |table| + Open3.popen3("sqlite3 #{@sqlite_file} '.dump #{table}' >> #{bck_file}") do |i,o,e,t| + stdout = o.read + if !stdout.empty? + puts stdout + end + + stderr = e.read + if !stderr.empty? + stderr.lines.each do |line| + STDERR.puts line unless line.match(/^-- Loading/) + end + end + end + + end + else + puts "Sqlite database backup stored in #{bck_file}" + system("sqlite3 #{@sqlite_file} .dump > #{bck_file}") end - FileUtils.cp(bck_file, @sqlite_file) + puts "Use 'onedb restore' to restore the DB." + end + + def restore(bck_file, force=nil, federated=false) + if !federated + if File.exists?(@sqlite_file) && !force + raise "File #{@sqlite_file} exists, use -f to overwrite." + end + end + + system("sqlite3 #{@sqlite_file} < #{bck_file}") puts "Sqlite database backup restored in #{@sqlite_file}" end