Skip to content

Commit 68aaad4

Browse files
committed
Removing the 'extent size' check in logical_volume provider, there are several situations where Puppet will not increase the size of an LV but if you run the equivalent LVM command it will actually work.
minor lint fix
1 parent 31febe1 commit 68aaad4

File tree

3 files changed

+9
-14
lines changed

3 files changed

+9
-14
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])
@@ -194,11 +194,6 @@ def size=(new_size)
194194
fail( "Decreasing the size requires manual intervention (#{new_size} < #{current_size})" )
195195
end
196196
else
197-
## Check if new size fits the extend blocks
198-
if new_size_bytes * lvm_size_units[new_size_unit] % vg_extent_size != 0
199-
fail( "Cannot extend to size #{new_size} because VG extent size is #{vg_extent_size} KB" )
200-
end
201-
202197
lvextend( '-L', new_size, path) || fail( "Cannot extend to size #{new_size} because lvextend failed." )
203198

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

manifests/logical_volume.pp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@
6262
}
6363

6464
if $ensure == 'present' and $createfs {
65-
Logical_volume[$name] ->
66-
Filesystem[$lvm_device_path] ->
67-
Mount[$mount_title]
68-
} elsif $ensure != 'present' and $createfs {
69-
Mount[$mount_title] ->
70-
Filesystem[$lvm_device_path] ->
7165
Logical_volume[$name]
66+
-> Filesystem[$lvm_device_path]
67+
-> Mount[$mount_title]
68+
} elsif $ensure != 'present' and $createfs {
69+
Mount[$mount_title]
70+
-> Filesystem[$lvm_device_path]
71+
-> Logical_volume[$name]
7272
}
7373

7474
logical_volume { $name:

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)