manageiq-smartstate 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7517619212a1f03fe002e07ba30b6b9200d0ee0
-  data.tar.gz: 2b3f9a8d7e73784afff2d978b0529d10a58f71ac
+  metadata.gz: e0bcd345041b6da4e617fb7868b70329ddfb7356
+  data.tar.gz: ce9e91d3de3fd48f62958cb2dbbd5a09b3c69e34
 SHA512:
-  metadata.gz: 1eaf8995f28876c937a0ec6c589724ce274fbf3db0201b13400f60c811b1f315f6fc0be362930527feb679802fc4b5ba34d55035fab13e28da693d987e003d1b
-  data.tar.gz: 427440dc548f556aa9e113773c235dbe73ea68e6a2428868f170b2b5d1b67a0310e5cd23906ea101da8e5ab351bc63a7b9c5c4c8f4f0a39a427359b159847471
+  metadata.gz: c959e61448233d5726894b88a95913990b752f4dd5eea54c03bed11f1d515871177478715df62b0ccfe19b437bb722595f8911fa4aeff3ccf1a8a4c4e881b36b
+  data.tar.gz: e6414d9c2d70ec3a3cb4f71db61fc2b6222c3ed02712ac3f9ce40a9f3db495470fd92589bc5b4c4f05eaa7747c6fbcc07f3c225ba527b1307e32354fc6876278

data/lib/MiqVm/miq_azure_vm.rb

@@ -67,7 +67,7 @@ class MiqAzureVm < MiqVm
         if @uri
           d = MiqDiskCache.new(AzureBlobDisk.new(sa_svc, @uri, d_info), 100, 128)
         else
-          d = MiqDiskCache.new(AzureManagedDisk.new(snap_svc, @snap_name, d_info), 100, 128)
+          d = MiqDiskCache.new(AzureManagedDisk.new(snap_svc, @snap_name, d_info), 200, 512)
         end
       rescue => err
         $log.error("#{err}: Couldn't open disk file: #{df}")

data/lib/VolumeManager/LVM/lvm2disk.rb

@@ -43,9 +43,16 @@ module Lvm2DiskIO
       device_id = logicalVolume.thin_segment.device_id
       thin_pool = logicalVolume.thin_pool_volume
       data_blks = thin_pool.metadata_volume.superblock.device_to_data(device_id, pos, len)
-      data_blks.each do |offset, len|
-        thin_pool.data_volume.disk.seek offset
-        retStr << thin_pool.data_volume.disk.read(len)
+
+      data_blks.each do |_device_blk, data_blk, blk_offset, blk_len|
+        if data_blk.nil?
+          # fill in unallactored data
+          retStr << Array.new(blk_len, 0).pack("C*")
+
+        else
+          thin_pool.data_volume.disk.seek(blk_offset)
+          retStr << thin_pool.data_volume.disk.read(blk_len)
+        end
       end
 
       return retStr

data/lib/VolumeManager/LVM/thin/data_map.rb

@@ -18,6 +18,20 @@ module Lvm2Thin
       end
     end
 
+    def total_blocks
+      @total_blocks ||= begin
+        t = 0
+        entries.each do |entry|
+          t += entry.kind_of?(DataMap) ? entry.total_blocks : 1
+        end
+        t
+      end
+    end
+
+    def block?(blk)
+      blk < total_blocks
+    end
+
     def data_block(device_block)
       device_blocks.reverse.each do |map_device_block|
         if map_device_block <= device_block

data/lib/VolumeManager/LVM/thin/superblock.rb

@@ -79,35 +79,52 @@ module Lvm2Thin
       device_address % data_block_size
     end
 
-    # return array of tuples containing data volume addresses and lengths to
-    # read from them to read the specified device offset & length
+    # Return array of tuples device block ids, data block ids, addresses, and lengths to
+    # read from them to read the specified device offset & length.
+    #
+    # Note: data blocks may not amount to total requested length (if requesting
+    # data from unallocated space).
+    #
+    # @see DataMap#block?
     def device_to_data(device_id, pos, len)
-      dev_blk = device_block(pos)
-      dev_off = device_block_offset(pos)
+      dev_blk  = device_block(pos)
+      dev_off  = device_block_offset(pos)
+      data_map = data_mapping.map_for(device_id)
 
       total_len = 0
       data_blks = []
 
       num_data_blks = (len / data_block_size).to_i + 1
       0.upto(num_data_blks - 1) do |i|
-        data_blk = data_mapping.map_for(device_id).data_block(dev_blk + i)
+        current_blk = dev_blk + i
+        blk_len = 0
 
-        blk_start = data_blk * data_block_size
-        blk_len   = 0
+        if data_map.block?(current_blk)
+          data_blk = data_map.data_block(current_blk)
+          blk_start = data_blk * data_block_size
 
-        if i == 0
-          blk_start += dev_off
-          blk_len    = data_block_size - dev_off - 1
+          if i.zero?
+            blk_start += dev_off
+            blk_len    = data_block_size - dev_off - 1
 
-        elsif i == num_data_blks - 1
-          blk_len = len - total_len
+          elsif i == num_data_blks - 1
+            blk_len = len - total_len
 
+          else
+            blk_len = data_block_size
+          end
+
+          data_blks << [current_blk, data_blk, blk_start, blk_len]
+
+        # Missing block may be caused by trying to read beyond end of
+        # LVM device (too large pos or len):
         else
-          blk_len    = data_block_size
+          remaining  = (len - total_len)
+          blk_len    = remaining > data_block_size ? data_block_size : remaining
+          data_blks << [current_blk, nil, nil, blk_len]
         end
 
         total_len += blk_len
-        data_blks << [blk_start, blk_len]
       end
 
       data_blks

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.1.4".freeze
+    VERSION = "0.1.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2017-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-armrest