openstack/swift
Code Issues Proposed changes

ring-builder: Better format large weights

Browse Source 
Previously, weights over 1000 would mess up the column alignment.

Change-Id: I973ea5b083b34e40b5d61c4e548b6fe3db766dcc
This commit is contained in:
Tim Burke
2022-08-02 12:08:41 -07:00
parent 91cfb0d6d9
commit 1c577fed15
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
swift/cli/ringbuilder.py
View File

@@ -476,6 +476,7 @@ def _make_display_device_table(builder):
rep_ip_width = 14 rep_ip_width = 14
rep_port_width = 4 rep_port_width = 4
ip_ipv6 = rep_ipv6 = False ip_ipv6 = rep_ipv6 = False
weight_width = 6
for dev in builder._iter_devs(): for dev in builder._iter_devs():
if is_valid_ipv6(dev['ip']): if is_valid_ipv6(dev['ip']):
ip_ipv6 = True ip_ipv6 = True
@@ -486,6 +487,8 @@ def _make_display_device_table(builder):
port_width = max(len(str(dev['port'])), port_width) port_width = max(len(str(dev['port'])), port_width)
rep_port_width = max(len(str(dev['replication_port'])), rep_port_width = max(len(str(dev['replication_port'])),
rep_port_width) rep_port_width)
weight_width = max(len('%6.02f' % dev['weight']),
weight_width)
if ip_ipv6: if ip_ipv6:
ip_width += 2 ip_width += 2
if rep_ipv6: if rep_ipv6:
@@ -493,7 +496,7 @@ def _make_display_device_table(builder):
header_line = ('Devices:%5s %6s %4s %' + str(ip_width) header_line = ('Devices:%5s %6s %4s %' + str(ip_width)
+ 's:%-' + str(port_width) + 's %' + + 's:%-' + str(port_width) + 's %' +
str(rep_ip_width) + 's:%-' + str(rep_port_width) + str(rep_ip_width) + 's:%-' + str(rep_port_width) +
's %5s %6s %10s %7s %5s %s') % ( 's %5s %' + str(weight_width) + 's %10s %7s %5s %s') % (
'id', 'region', 'zone', 'ip address', 'id', 'region', 'zone', 'ip address',
'port', 'replication ip', 'port', 'name', 'port', 'replication ip', 'port', 'name',
'weight', 'partitions', 'balance', 'flags', 'weight', 'partitions', 'balance', 'flags',
@@ -511,7 +514,8 @@ def _make_display_device_table(builder):
'%', str(ip_width), 's:%-', '%', str(ip_width), 's:%-',
str(port_width), 'd ', '%', str(port_width), 'd ', '%',
str(rep_ip_width), 's', ':%-', str(rep_ip_width), 's', ':%-',
str(rep_port_width), 'd %5s %6.02f' str(rep_port_width), 'd %5s %',
str(weight_width), '.02f'
' %10s %7.02f %5s %s']) ' %10s %7.02f %5s %s'])
args = (dev['id'], dev['region'], dev['zone'], dev_ip, dev['port'], args = (dev['id'], dev['region'], dev['zone'], dev_ip, dev['port'],
dev_replication_ip, dev['replication_port'], dev['device'], dev_replication_ip, dev['replication_port'], dev['device'],

2
test/unit/cli/test_ipv6_output.stub
View File

@@ -6,5 +6,5 @@ Ring file __RINGFILE__.ring.gz not found, probably it hasn't been written yet
Devices: id region zone ip address:port replication ip:port name weight partitions balance flags meta Devices: id region zone ip address:port replication ip:port name weight partitions balance flags meta
0 0 0 [2001:db8:85a3::8a2e:370:7334]:6200 [2001:db8:85a3::8a2e:370:7334]:6200 sda1 100.00 0 -100.00 some meta data 0 0 0 [2001:db8:85a3::8a2e:370:7334]:6200 [2001:db8:85a3::8a2e:370:7334]:6200 sda1 100.00 0 -100.00 some meta data
1 1 1 127.0.0.1:66201 127.0.0.1:66201 sda2 100.00 0 -100.00 1 1 1 127.0.0.1:66201 127.0.0.1:66201 sda2 100.00 0 -100.00
2 2 2 [2001:db8:85a3::8a2e:370:7336]:6202 127.0.10.127:7070 sdc3 100.00 0 -100.00 2 2 2 [2001:db8:85a3::8a2e:370:7336]:6202 127.0.10.127:7070 sdc3 10000.00 0 -100.00
3 3 3 [2001:db8:85a3::8a2e:370:7337]:6203 [7001:db8:85a3::8a2e:370:7337]:11664 sdd4 100.00 0 -100.00 3 3 3 [2001:db8:85a3::8a2e:370:7337]:6203 [7001:db8:85a3::8a2e:370:7337]:11664 sdd4 100.00 0 -100.00

2
test/unit/cli/test_ringbuilder.py
View File

@@ -2077,7 +2077,7 @@ class TestCommands(unittest.TestCase, RunSwiftRingBuilderMixin):
'port': 66201, 'port': 66201,
'device': 'sda2', 'device': 'sda2',
}) })
ring.add_dev({'weight': 100.0, ring.add_dev({'weight': 10000.0,
'region': 2, 'region': 2,
'zone': 2, 'zone': 2,
'ip': '2001:db8:85a3::8a2e:370:7336', 'ip': '2001:db8:85a3::8a2e:370:7336',