openstack/puppet-swift
Code Issues Proposed changes

Add swift-ring-builder multi region support

Browse Source 
Since Swift 1.8.0, there is the region layer of topology above zones.
swift-ring-builder supports this natively and this commit allows a user to
specify a region when creating devices.
We maintain backwards compatibility by defaulting to region '1'.
The coverage of the ring builder spec tests were also improved as part of
this commit.

Change-Id: I67cbe6b87c84778f71df59cf00f2c5175342bc1b
This commit is contained in:
David Moreau Simard
2014-05-09 13:54:54 -04:00
parent 9874edd265
commit bb3007615f
6 changed files with 131 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -60,6 +60,7 @@ class { 'swift::storage::all':
} }
@@ring_object_device { "${ipaddress_eth0}:6000/1": @@ring_object_device { "${ipaddress_eth0}:6000/1":
region => 1, # optional, defaults to 1
zone => 1, zone => 1,
weight => 1, weight => 1,
} }
@@ -73,14 +74,17 @@ class { 'swift::storage::all':
} }
@@ring_object_device { "${ipaddress_eth0}:6000/2": @@ring_object_device { "${ipaddress_eth0}:6000/2":
region => 2,
zone => 1, zone => 1,
weight => 1, weight => 1,
} }
@@ring_container_device { "${ipaddress_eth0}:6001/2": @@ring_container_device { "${ipaddress_eth0}:6001/2":
region => 2,
zone => 1, zone => 1,
weight => 1, weight => 1,
} }
@@ring_account_device { "${ipaddress_eth0}:6002/2": @@ring_account_device { "${ipaddress_eth0}:6002/2":
region => 2,
zone => 1, zone => 1,
weight => 1, weight => 1,
} }

65
lib/puppet/provider/swift_ring_builder.rb
View File

@@ -28,33 +28,36 @@ class Puppet::Provider::SwiftRingBuilder < Puppet::Provider
# Devices: id region zone ip address port replication ip replication port name weight partitions balance meta # Devices: id region zone ip address port replication ip replication port name weight partitions balance meta
# 0 1 2 127.0.0.1 6021 127.0.0.1 6021 2 1.00 262144 0.00 # 0 1 2 127.0.0.1 6021 127.0.0.1 6021 2 1.00 262144 0.00
# Swift 1.8+ output example: # Swift 1.8+ output example:
if row =~ /^\s*(\d+)\s+\d+\s+(\d+)\s+(\S+)\s+(\d+)\s+\S+\s+\d+\s+(\S+)\s+(\d+\.\d+)\s+(\d+)\s*((-|\s-?)?\d+\.\d+)\s*(\S*)/ if row =~ /^\s*(\d+)\s+(\d+)\s+(\d+)\s+(\S+)\s+(\d+)\s+\S+\s+\d+\s+(\S+)\s+(\d+\.\d+)\s+(\d+)\s*((-|\s-?)?\d+\.\d+)\s*(\S*)/
object_hash["#{$3}:#{$4}/#{$5}"] = { object_hash["#{$4}:#{$5}/#{$6}"] = {
:id => $1, :id => $1,
:zone => $2, :region => $2,
:weight => $6, :zone => $3,
:partitions => $7, :weight => $7,
:balance => $8, :partitions => $8,
:meta => $10 :balance => $9,
:meta => $11
} }
# Swift 1.8.0 output example: # Swift 1.8.0 output example:
elsif row =~ /^\s*(\d+)\s+\d+\s+(\d+)\s+(\S+)\s+(\d+)\s+(\S+)\s+(\d+\.\d+)\s+(\d+)\s*((-|\s-?)?\d+\.\d+)\s*(\S*)/ elsif row =~ /^\s*(\d+)\s+(\d+)\s+(\d+)\s+(\S+)\s+(\d+)\s+(\S+)\s+(\d+\.\d+)\s+(\d+)\s*((-|\s-?)?\d+\.\d+)\s*(\S*)/
object_hash["#{$3}:#{$4}/#{$5}"] = { object_hash["#{$4}:#{$5}/#{$6}"] = {
:id => $1, :id => $1,
:zone => $2, :region => $2,
:weight => $6, :zone => $3,
:partitions => $7, :weight => $7,
:balance => $8, :partitions => $8,
:meta => $10 :balance => $9,
:meta => $11
} }
# This regex is for older swift versions # This regex is for older swift versions
elsif row =~ /^\s+(\d+)\s+(\d+)\s+(\S+)\s+(\d+)\s+(\S+)\s+(\d+\.\d+)\s+(\d+)\s+(-?\d+\.\d+)\s+(\S*)$/ elsif row =~ /^\s+(\d+)\s+(\d+)\s+(\S+)\s+(\d+)\s+(\S+)\s+(\d+\.\d+)\s+(\d+)\s+(-?\d+\.\d+)\s+(\S*)$/
object_hash["#{$3}:#{$4}/#{$5}"] = { object_hash["#{$3}:#{$4}/#{$5}"] = {
:id => $1, :id => $1,
:region => 'none',
:zone => $2, :zone => $2,
:weight => $6, :weight => $6,
:partitions => $7, :partitions => $7,
@@ -87,12 +90,26 @@ class Puppet::Provider::SwiftRingBuilder < Puppet::Provider
[:zone, :weight].each do |param| [:zone, :weight].each do |param|
raise(Puppet::Error, "#{param} is required") unless resource[param] raise(Puppet::Error, "#{param} is required") unless resource[param]
end end
swift_ring_builder(
builder_file_path, if :region == 'none'
'add', # Prior to Swift 1.8.0, regions did not exist.
"z#{resource[:zone]}-#{resource[:name]}", swift_ring_builder(
resource[:weight] builder_file_path,
) 'add',
"z#{resource[:zone]}-#{resource[:name]}",
resource[:weight]
)
else
# Swift 1.8+
# Region defaults to 1 if unspecified
resource[:region] ||= 1
swift_ring_builder(
builder_file_path,
'add',
"r#{resource[:region]}z#{resource[:zone]}-#{resource[:name]}",
resource[:weight]
)
end
end end
def id def id
@@ -103,6 +120,14 @@ class Puppet::Provider::SwiftRingBuilder < Puppet::Provider
raise(Puppet::Error, "Cannot assign id, it is immutable") raise(Puppet::Error, "Cannot assign id, it is immutable")
end end
def region
ring[resource[:name]][:region]
end
def region=(region)
raise(Puppet::Error, "Changing the region of a device is not possible.")
end
def zone def zone
ring[resource[:name]][:zone] ring[resource[:name]][:zone]
end end

2
lib/puppet/type/ring_account_device.rb
View File

@@ -13,6 +13,8 @@ Puppet::Type.newtype(:ring_account_device) do
end end
end end
newproperty(:region)
newproperty(:zone) newproperty(:zone)
newproperty(:weight) do newproperty(:weight) do

2
lib/puppet/type/ring_container_device.rb
View File

@@ -13,6 +13,8 @@ Puppet::Type.newtype(:ring_container_device) do
end end
end end
newproperty(:region)
newproperty(:zone) newproperty(:zone)
newproperty(:weight) do newproperty(:weight) do

2
lib/puppet/type/ring_object_device.rb
View File

@@ -13,6 +13,8 @@ Puppet::Type.newtype(:ring_object_device) do
end end
end end
newproperty(:region)
newproperty(:zone) newproperty(:zone)
newproperty(:weight) do newproperty(:weight) do

89
spec/unit/puppet/provider/swift_ring_builder_spec.rb
View File

@@ -20,17 +20,33 @@ describe provider_class do
262144 partitions, 3 replicas, 3 zones, 3 devices, 0.00 balance 262144 partitions, 3 replicas, 3 zones, 3 devices, 0.00 balance
The minimum number of hours before a partition can be reassigned is 1 The minimum number of hours before a partition can be reassigned is 1
Devices: id region zone ip address port replication ip replication port name weight partitions balance meta Devices: id region zone ip address port replication ip replication port name weight partitions balance meta
1 1 1 192.168.101.13 6002 192.168.101.13 6002 1 1.00 262144 0.00
2 1 2 192.168.101.14 6002 192.168.101.14 6002 1 1.00 262144 200.00 m2 2 1 2 192.168.101.14 6002 192.168.101.14 6002 1 1.00 262144 200.00 m2
0 1 3 192.168.101.15 6002 192.168.101.15 6002 1 1.00 262144-100.00 m2 0 1 3 192.168.101.15 6002 192.168.101.15 6002 1 1.00 262144-100.00 m2
3 1 1 192.168.101.16 6002 192.168.101.16 6002 1 1.00 262144-100.00 3 1 1 192.168.101.16 6002 192.168.101.16 6002 1 1.00 262144-100.00
1 1 1 192.168.101.13 6002 192.168.101.13 6002 1 1.00 262144 0.00
' '
) )
resources = provider_class.lookup_ring.inspect resources = provider_class.lookup_ring
resources['192.168.101.15:6002/1'].should_not be_nil
resources['192.168.101.13:6002/1'].should_not be_nil resources['192.168.101.13:6002/1'].should_not be_nil
resources['192.168.101.14:6002/1'].should_not be_nil resources['192.168.101.14:6002/1'].should_not be_nil
resources['192.168.101.15:6002/1'].should_not be_nil
resources['192.168.101.16:6002/1'].should_not be_nil resources['192.168.101.16:6002/1'].should_not be_nil
resources['192.168.101.13:6002/1'][:id].should eql '1'
resources['192.168.101.13:6002/1'][:region].should eql '1'
resources['192.168.101.13:6002/1'][:zone].should eql '1'
resources['192.168.101.13:6002/1'][:weight].should eql '1.00'
resources['192.168.101.13:6002/1'][:partitions].should eql '262144'
resources['192.168.101.13:6002/1'][:balance].should eql '0.00'
resources['192.168.101.13:6002/1'][:meta].should eql ''
resources['192.168.101.14:6002/1'][:id].should eql '2'
resources['192.168.101.14:6002/1'][:region].should eql '1'
resources['192.168.101.14:6002/1'][:zone].should eql '2'
resources['192.168.101.14:6002/1'][:weight].should eql '1.00'
resources['192.168.101.14:6002/1'][:partitions].should eql '262144'
resources['192.168.101.14:6002/1'][:balance].should eql '200.00'
resources['192.168.101.14:6002/1'][:meta].should eql 'm2'
end end
it 'should be able to lookup the local ring and build an object 1.8.0' do it 'should be able to lookup the local ring and build an object 1.8.0' do
@@ -42,17 +58,33 @@ Devices: id region zone ip address port replication ip replicat
262144 partitions, 3 replicas, 3 zones, 3 devices, 0.00 balance 262144 partitions, 3 replicas, 3 zones, 3 devices, 0.00 balance
The minimum number of hours before a partition can be reassigned is 1 The minimum number of hours before a partition can be reassigned is 1
Devices: id region zone ip address port name weight partitions balance meta Devices: id region zone ip address port name weight partitions balance meta
1 1 1 192.168.101.13 6002 1 1.00 262144 0.00
2 1 2 192.168.101.14 6002 1 1.00 262144 200.00 m2 2 1 2 192.168.101.14 6002 1 1.00 262144 200.00 m2
0 1 3 192.168.101.15 6002 1 1.00 262144-100.00 m2 0 1 3 192.168.101.15 6002 1 1.00 262144-100.00 m2
3 1 1 192.168.101.16 6002 1 1.00 262144-100.00 3 1 1 192.168.101.16 6002 1 1.00 262144-100.00
1 1 1 192.168.101.13 6002 1 1.00 262144 0.00
' '
) )
resources = provider_class.lookup_ring.inspect resources = provider_class.lookup_ring
resources['192.168.101.15:6002/1'].should_not be_nil
resources['192.168.101.13:6002/1'].should_not be_nil resources['192.168.101.13:6002/1'].should_not be_nil
resources['192.168.101.14:6002/1'].should_not be_nil resources['192.168.101.14:6002/1'].should_not be_nil
resources['192.168.101.15:6002/1'].should_not be_nil
resources['192.168.101.16:6002/1'].should_not be_nil resources['192.168.101.16:6002/1'].should_not be_nil
resources['192.168.101.13:6002/1'][:id].should eql '1'
resources['192.168.101.13:6002/1'][:region].should eql '1'
resources['192.168.101.13:6002/1'][:zone].should eql '1'
resources['192.168.101.13:6002/1'][:weight].should eql '1.00'
resources['192.168.101.13:6002/1'][:partitions].should eql '262144'
resources['192.168.101.13:6002/1'][:balance].should eql '0.00'
resources['192.168.101.13:6002/1'][:meta].should eql ''
resources['192.168.101.14:6002/1'][:id].should eql '2'
resources['192.168.101.14:6002/1'][:region].should eql '1'
resources['192.168.101.14:6002/1'][:zone].should eql '2'
resources['192.168.101.14:6002/1'][:weight].should eql '1.00'
resources['192.168.101.14:6002/1'][:partitions].should eql '262144'
resources['192.168.101.14:6002/1'][:balance].should eql '200.00'
resources['192.168.101.14:6002/1'][:meta].should eql 'm2'
end end
it 'should be able to lookup the local ring and build an object 1.7' do it 'should be able to lookup the local ring and build an object 1.7' do
@@ -64,15 +96,31 @@ Devices: id region zone ip address port name weight partitions b
262144 partitions, 3 replicas, 3 zones, 3 devices, 0.00 balance 262144 partitions, 3 replicas, 3 zones, 3 devices, 0.00 balance
The minimum number of hours before a partition can be reassigned is 1 The minimum number of hours before a partition can be reassigned is 1
Devices: id region zone ip address port name weight partitions balance meta Devices: id region zone ip address port name weight partitions balance meta
2 1 2 192.168.101.14 6002 1 1.00 262144 0.00 1 1 1 192.168.101.13 6002 1 1.00 262144 0.00
0 1 3 192.168.101.15 6002 1 1.00 262144 0.00 2 1 2 192.168.101.14 6002 1 1.00 262144 0.00
1 1 1 192.168.101.13 6002 1 1.00 262144 0.00 0 1 3 192.168.101.15 6002 1 1.00 262144 0.00
' '
) )
resources = provider_class.lookup_ring.inspect resources = provider_class.lookup_ring
resources['192.168.101.15:6002/1'].should_not be_nil
resources['192.168.101.13:6002/1'].should_not be_nil resources['192.168.101.13:6002/1'].should_not be_nil
resources['192.168.101.14:6002/1'].should_not be_nil resources['192.168.101.14:6002/1'].should_not be_nil
resources['192.168.101.15:6002/1'].should_not be_nil
resources['192.168.101.13:6002/1'][:id].should eql '1'
resources['192.168.101.13:6002/1'][:region].should eql '1'
resources['192.168.101.13:6002/1'][:zone].should eql '1'
resources['192.168.101.13:6002/1'][:weight].should eql '1.00'
resources['192.168.101.13:6002/1'][:partitions].should eql '262144'
resources['192.168.101.13:6002/1'][:balance].should eql '0.00'
resources['192.168.101.13:6002/1'][:meta].should eql ''
resources['192.168.101.14:6002/1'][:id].should eql '2'
resources['192.168.101.14:6002/1'][:region].should eql '1'
resources['192.168.101.14:6002/1'][:zone].should eql '2'
resources['192.168.101.14:6002/1'][:weight].should eql '1.00'
resources['192.168.101.14:6002/1'][:partitions].should eql '262144'
resources['192.168.101.14:6002/1'][:balance].should eql '0.00'
resources['192.168.101.14:6002/1'][:meta].should eql ''
end end
it 'should be able to lookup the local ring and build an object legacy' do it 'should be able to lookup the local ring and build an object legacy' do
@@ -88,10 +136,25 @@ Devices: id zone ip address port name weight partitions balance m
1 1 192.168.101.13 6002 1 1.00 262144 0.00 1 1 192.168.101.13 6002 1 1.00 262144 0.00
' '
) )
resources = provider_class.lookup_ring.inspect resources = provider_class.lookup_ring
resources['192.168.101.15:6002/1'].should_not be_nil resources['192.168.101.15:6002/1'].should_not be_nil
resources['192.168.101.13:6002/1'].should_not be_nil resources['192.168.101.13:6002/1'].should_not be_nil
resources['192.168.101.14:6002/1'].should_not be_nil resources['192.168.101.14:6002/1'].should_not be_nil
end
resources['192.168.101.13:6002/1'][:id].should eql '1'
resources['192.168.101.13:6002/1'][:region].should eql 'none'
resources['192.168.101.13:6002/1'][:zone].should eql '1'
resources['192.168.101.13:6002/1'][:weight].should eql '1.00'
resources['192.168.101.13:6002/1'][:partitions].should eql '262144'
resources['192.168.101.13:6002/1'][:balance].should eql '0.00'
resources['192.168.101.13:6002/1'][:meta].should eql ''
resources['192.168.101.14:6002/1'][:id].should eql '2'
resources['192.168.101.14:6002/1'][:region].should eql 'none'
resources['192.168.101.14:6002/1'][:zone].should eql '2'
resources['192.168.101.14:6002/1'][:weight].should eql '1.00'
resources['192.168.101.14:6002/1'][:partitions].should eql '262144'
resources['192.168.101.14:6002/1'][:balance].should eql '0.00'
resources['192.168.101.14:6002/1'][:meta].should eql ''
end
end end