From 7eb60b4cd6a625eb0e16b3e2c35d78dfe6362527 Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Fri, 13 Apr 2018 10:44:35 -0700 Subject: [PATCH] Add shard range state to container-info output Change-Id: I1e1a389e28a4be4c72bf99ebee1227e4661588a7 --- swift/cli/info.py | 5 +++-- test/unit/cli/test_info.py | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/swift/cli/info.py b/swift/cli/info.py index 81858c8b3a..839cca3c95 100644 --- a/swift/cli/info.py +++ b/swift/cli/info.py @@ -307,11 +307,12 @@ def print_db_info_metadata(db_type, info, metadata, drop_prefixes=False): if info.get('shard_ranges'): print('Shard Ranges:') for srange in info['shard_ranges']: - srange = dict(srange) + srange = dict(srange, state_text=srange.state_text) print(' Name: %(name)s' % srange) print(' lower: %(lower)r, upper: %(upper)r' % srange) print(' Object Count: %(object_count)d, Bytes Used: ' - '%(bytes_used)d' % srange) + '%(bytes_used)d, State: %(state_text)s (%(state)d)' + % srange) print(' Created at: %s (%s)' % (Timestamp(srange['created_at']).isoformat, srange['created_at'])) diff --git a/test/unit/cli/test_info.py b/test/unit/cli/test_info.py index e30e67638d..988cad4141 100644 --- a/test/unit/cli/test_info.py +++ b/test/unit/cli/test_info.py @@ -199,6 +199,8 @@ Sharding Metadata: created_at=utils.Timestamp(i), lower='%da' % i, upper='%dz' % i, object_count=i, bytes_used=i, meta_timestamp=utils.Timestamp(i)) for i in range(1, 4)] + shard_ranges[0].state = utils.ShardRange.CLEAVED + shard_ranges[1].state = utils.ShardRange.CREATED info = dict( account='acct', @@ -248,17 +250,17 @@ Sharding Metadata: Shard Ranges: Name: .sharded_a/shard_range_1 lower: '1a', upper: '1z' - Object Count: 1, Bytes Used: 1 + Object Count: 1, Bytes Used: 1, State: cleaved (2) Created at: 1970-01-01T00:00:01.000000 (0000000001.00000) Meta Timestamp: 1970-01-01T00:00:01.000000 (0000000001.00000) Name: .sharded_a/shard_range_2 lower: '2a', upper: '2z' - Object Count: 2, Bytes Used: 2 + Object Count: 2, Bytes Used: 2, State: created (1) Created at: 1970-01-01T00:00:02.000000 (0000000002.00000) Meta Timestamp: 1970-01-01T00:00:02.000000 (0000000002.00000) Name: .sharded_a/shard_range_3 lower: '3a', upper: '3z' - Object Count: 3, Bytes Used: 3 + Object Count: 3, Bytes Used: 3, State: found (0) Created at: 1970-01-01T00:00:03.000000 (0000000003.00000) Meta Timestamp: 1970-01-01T00:00:03.000000 (0000000003.00000)''' %\ POLICIES[0].name