Skip to content

Commit 3107b14

Browse files
authored
Merge pull request #185 from LMAX-Exchange/master
Removing the 'extent size' check in logical_volume provider
2 parents ae52fdb + 68aaad4 commit 3107b14

File tree

2 files changed

+3
-8
lines changed
  • lib/puppet/provider/logical_volume
  • spec/unit/puppet/provider/logical_volume

2 files changed

+3
-8
lines changed

lib/puppet/provider/logical_volume/lvm.rb

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def create
7777
args.push('--stripesize', @resource[:stripesize])
7878
end
7979

80-
80+
8181

8282
if @resource[:poolmetadatasize]
8383
args.push('--poolmetadatasize', @resource[:poolmetadatasize])
@@ -197,11 +197,6 @@ def size=(new_size)
197197
fail( "Decreasing the size requires manual intervention (#{new_size} < #{current_size})" )
198198
end
199199
else
200-
## Check if new size fits the extend blocks
201-
if new_size_bytes * lvm_size_units[new_size_unit] % vg_extent_size != 0
202-
fail( "Cannot extend to size #{new_size} because VG extent size is #{vg_extent_size} KB" )
203-
end
204-
205200
lvextend( '-L', new_size, path) || fail( "Cannot extend to size #{new_size} because lvextend failed." )
206201

207202
unless @resource[:resize_fs] == :false or @resource[:resize_fs] == false or @resource[:resize_fs] == 'false'

spec/unit/puppet/provider/logical_volume/lvm_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
LV VG Attr LSize Pool Origin Data% Meta% Move Log Cpy%Sync Convert
1414
lv_root VolGroup -wi-ao---- 18.54g
1515
lv_swap VolGroup -wi-ao---- 992.00m
16-
data data -wi-ao---- 992.00m
16+
data data -wi-ao---- 992.00m
1717
EOS
1818

1919
describe 'self.instances' do
@@ -190,7 +190,7 @@
190190
@provider.create
191191
@provider.expects(:lvs).with('--noheading', '--unit', 'g', '/dev/myvg/mylv').returns(' 1.00g').at_least_once
192192
@provider.expects(:lvs).with('--noheading', '-o', 'vg_extent_size', '--units', 'k', '/dev/myvg/mylv').returns(' 1000.00k')
193-
proc { @provider.size = '1.15g' }.should raise_error(Puppet::Error, /extent/)
193+
proc { @provider.size = '1.15g' }.should raise_error(Puppet::Error)
194194
end
195195
end
196196
end

0 commit comments

Comments
 (0)