From 5972eab181b3537db2f0d4c3fc9cc96bac9977e3 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 23 Jan 2019 10:19:42 -0500 Subject: [PATCH] test/rgw: check_bucket_eq() uses bucket.list_versions() get_all_versions() is documented as a lower-level api that doesn't handle paging, ands suggests list_versions() instead. also caches the results to avoid listing each bucket twice Signed-off-by: Casey Bodley (cherry picked from commit 22d1da72405cbfb522ac661139abf6a22722980c) --- src/test/rgw/rgw_multi/zone_rados.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/test/rgw/rgw_multi/zone_rados.py b/src/test/rgw/rgw_multi/zone_rados.py index d559ef0850a..99cc84edb7c 100644 --- a/src/test/rgw/rgw_multi/zone_rados.py +++ b/src/test/rgw/rgw_multi/zone_rados.py @@ -62,14 +62,17 @@ class RadosZone(Zone): b1 = self.get_bucket(bucket_name) b2 = zone_conn.get_bucket(bucket_name) + b1_versions = b1.list_versions() log.debug('bucket1 objects:') - for o in b1.get_all_versions(): + for o in b1_versions: log.debug('o=%s', o.name) + + b2_versions = b2.list_versions() log.debug('bucket2 objects:') - for o in b2.get_all_versions(): + for o in b2_versions: log.debug('o=%s', o.name) - for k1, k2 in zip_longest(b1.get_all_versions(), b2.get_all_versions()): + for k1, k2 in zip_longest(b1_versions, b2_versions): if k1 is None: log.critical('key=%s is missing from zone=%s', k2.name, self.name) assert False -- 2.47.3