Fix time deviation of mysql backup

Change-Id: I44b35a35a1adb1c7e0778766894046f3957d206b
cloudfoundry-attic · Mar 25, 2012 · ae48e35 · ae48e35
1 parent a3de99a
commit ae48e35
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 5 deletions.
diff --git a/atmos/vendor/cache/vcap_services_base-0.1.8.gem b/atmos/vendor/cache/vcap_services_base-0.1.8.gem
diff --git a/base/lib/base/backup.rb b/base/lib/base/backup.rb
@@ -110,13 +110,15 @@ def start
     echo "Backup is interrupted!"
   end
 
-  def get_dump_path(name,mode=0)
+  def get_dump_path(name, options={})
     name = name.sub(/^(mongodb|redis)-/,'')
+    mode = options[:mode] || 0
+    time = options[:time] || Time.now
     case mode
     when 1
-      File.join(@config['backup_base_dir'], 'backups', @config['service_name'],name, Time.new.to_i.to_s,@config['node_id'])
+      File.join(@config['backup_base_dir'], 'backups', @config['service_name'],name, time.to_i.to_s,@config['node_id'])
     else
-      File.join(@config['backup_base_dir'], 'backups', @config['service_name'], name[0,2], name[2,2], name[4,2], name, Time.new.to_i.to_s)
+      File.join(@config['backup_base_dir'], 'backups', @config['service_name'], name[0,2], name[2,2], name[4,2], name, time.to_i.to_s)
     end
   end
 

diff --git a/filesystem/vendor/cache/vcap_services_base-0.1.8.gem b/filesystem/vendor/cache/vcap_services_base-0.1.8.gem
diff --git a/mongodb/vendor/cache/vcap_services_base-0.1.8.gem b/mongodb/vendor/cache/vcap_services_base-0.1.8.gem
diff --git a/mysql/bin/mysql_backup b/mysql/bin/mysql_backup
@@ -81,11 +81,11 @@ class VCAP::Services::Mysql::Backup < VCAP::Services::Base::Backup
     elsif SYSTEM_DB.include?(name)
       # for system database, dir structure looks like \backups\<service-name>\
       # <db-name>\<seconds_since_epoc>\<node_id>\<service specific data>
-      full_path = get_dump_path(name,1)
+      full_path = get_dump_path(name, :mode => 1, :time => ts)
     else
       # dir structure looks like \backups\<service-name>\<aa>\<bb>\<cc>\
       # <aabbcc-rest-of-instance-guid>\<seconds_since_epoc>\<service specific data>
-      full_path = get_dump_path(name)
+      full_path = get_dump_path(name, :time => ts)
     end
     opts.merge!({:full_path => full_path})
     # options substitution

diff --git a/mysql/vendor/cache/vcap_services_base-0.1.8.gem b/mysql/vendor/cache/vcap_services_base-0.1.8.gem
diff --git a/neo4j/vendor/cache/vcap_services_base-0.1.8.gem b/neo4j/vendor/cache/vcap_services_base-0.1.8.gem
diff --git a/postgresql/vendor/cache/vcap_services_base-0.1.8.gem b/postgresql/vendor/cache/vcap_services_base-0.1.8.gem
diff --git a/rabbit/vendor/cache/vcap_services_base-0.1.8.gem b/rabbit/vendor/cache/vcap_services_base-0.1.8.gem
diff --git a/redis/vendor/cache/vcap_services_base-0.1.8.gem b/redis/vendor/cache/vcap_services_base-0.1.8.gem
diff --git a/service_broker/vendor/cache/vcap_services_base-0.1.8.gem b/service_broker/vendor/cache/vcap_services_base-0.1.8.gem
diff --git a/vblob/vendor/cache/vcap_services_base-0.1.8.gem b/vblob/vendor/cache/vcap_services_base-0.1.8.gem