Revert "Back-fill tests for MigrateDisk"

This reverts commit 0cfecc3 all the way to b1b9d90

Signed-off-by: Rob Day-Reynolds <[email protected]>

Author: thansmann

bosh_agent/lib/bosh_agent.rb

@@ -42,7 +42,7 @@ module Bosh::Agent
 
 require 'bosh_agent/platform/linux'
 require 'bosh_agent/platform/linux/adapter'
-require 'bosh_agent/platform/linux/disk_manager'
+require 'bosh_agent/platform/linux/disk'
 require 'bosh_agent/platform/linux/logrotate'
 require 'bosh_agent/platform/linux/password'
 require 'bosh_agent/platform/linux/network'

bosh_agent/lib/bosh_agent/dir_copier.rb

@@ -1,17 +1,8 @@
 # Copyright (c) 2009-2012 VMware, Inc.
-require 'bosh_agent/dir_copier'
 
 module Bosh::Agent
   module Message
 
-    # Migrates persistent data from the old persistent disk to the new
-    # persistent disk.
-    #
-    # This message assumes that two mount messages have been received
-    # and processed: one to mount the old disk at /var/vcap/store and
-    # a second to mount the new disk at /var/vcap/store_migraton_target
-    # (sic).
-
     class MigrateDisk < Base
       def self.long_running?; true; end
 
@@ -33,8 +24,7 @@ def migrate(args)
 
         if check_mountpoints
           logger.info("Copy data from old to new store disk")
-          migrator = DirCopier.new(store_path, store_migration_target)
-          migrator.copy
+          `(cd #{store_path} && tar cf - .) | (cd #{store_migration_target} && tar xpf -)`
         end
 
         DiskUtil.umount_guard(store_path)
@@ -43,16 +33,17 @@ def migrate(args)
         mount_store(@new_cid)
       end
 
-      private
       def check_mountpoints
         Pathname.new(store_path).mountpoint? && Pathname.new(store_migration_target).mountpoint?
       end
 
       def mount_store(cid, options="")
-        disk = Bosh::Agent::Config.platform.find_disk_by_cid(cid)
-        logger.info("Mounting: #{disk.partition_path} #{store_path}")
-        unless disk.mount(store_path, options)
-          raise Bosh::Agent::MessageHandlerError, "Failed to mount: #{disk.partition_path} #{store_path} (exit code #{$?.exitstatus})"
+        disk = Bosh::Agent::Config.platform.lookup_disk_by_cid(cid)
+        partition = "#{disk}1"
+        logger.info("Mounting: #{partition} #{store_path}")
+        `mount #{options} #{partition} #{store_path}`
+        unless $?.exitstatus == 0
+          raise Bosh::Agent::MessageHandlerError, "Failed to mount: #{partition} #{store_path} (exit code #{$?.exitstatus})"
         end
       end
 

bosh_agent/lib/bosh_agent/disk.rb

@@ -7,7 +7,7 @@ def self.platform(platform_name)
       case platform_name
         when 'ubuntu'
           template_dir = File.expand_path(File.join(File.dirname(__FILE__), 'platform/ubuntu/templates'))
-          Platform::Linux::Adapter.new(Platform::Linux::DiskManager.new,
+          Platform::Linux::Adapter.new(Platform::Linux::Disk.new,
                                        Platform::Linux::Logrotate.new(template_dir),
                                        Platform::Linux::Password.new,
                                        Platform::Ubuntu::Network.new(template_dir))

bosh_agent/lib/bosh_agent/message/disk.rb

@@ -1,5 +1,5 @@
 module Bosh::Agent
-  class Platform::Centos::Disk < Platform::Linux::DiskManager
+  class Platform::Centos::Disk < Platform::Linux::Disk
     def detect_block_device(disk_id)
       device_path = "/sys/bus/scsi/devices/#{root_disk_scsi_host_id}:0:#{disk_id}:0/block/*"
       dirs = Dir.glob(device_path)

bosh_agent/lib/bosh_agent/platform.rb

@@ -24,10 +24,6 @@ def lookup_disk_by_cid(cid)
         @disk.lookup_disk_by_cid(cid)
       end
 
-      def find_disk_by_cid(cid)
-        @disk.find_disk_by_cid(cid)
-      end
-
       def get_data_disk_device_name
         @disk.get_data_disk_device_name
       end

bosh_agent/lib/bosh_agent/platform/centos/disk.rb

@@ -1,8 +1,7 @@
 # Copyright (c) 2009-2012 VMware, Inc.
-require 'bosh_agent/disk'
 
 module Bosh::Agent
-  class Platform::Linux::DiskManager
+  class Platform::Linux::Disk
     include Bosh::Exec
 
     VSPHERE_DATA_DISK = "/dev/sdb"
@@ -64,11 +63,6 @@ def lookup_disk_by_cid(cid)
       end
     end
 
-    def find_disk_by_cid(cid)
-      disk_path = lookup_disk_by_cid(cid)
-      return Disk.new(disk_path)
-    end
-
     def detect_block_device(disk_id)
       device_path = "/sys/bus/scsi/devices/2:0:#{disk_id}:0/block/*"
       dirs = Dir.glob(device_path, 0)