fixup! rgw: break the coupling of olh epoch and epochs of olh ops, and make the epoch...

Signed-off-by: Jane Zhu <jzhu116@bloomberg.net>

diff --git a/src/test/rgw/rgw_multi/tests.py b/src/test/rgw/rgw_multi/tests.py
index be3b12d5bef4eeaba06f3451e1f43f1e4977ad6f..52d81e3d6841b8b9f004f7eb6c961b9b769276ab 100644 (file)
--- a/src/test/rgw/rgw_multi/tests.py
+++ b/src/test/rgw/rgw_multi/tests.py
@@ -1749,7 +1749,7 @@ def test_versioned_bucket_sync_disable_enable_object_delete():
 
     # Delete the second object version
     cmd = ['object', 'rm', '--bucket', bucket.name, '--object', obj, '--object-version', version_id_2]
-    secondary.zone.cluster.admin(cmd)
+    secondary.zone.cluster.admin(cmd + secondary.zone.zone_args())
 
     log.debug(f"Enabling bucket sync for bucket:{bucket.name}")
     enable_bucket_sync(realm.meta_master_zone(), bucket.name)
@@ -1764,7 +1764,7 @@ def test_versioned_bucket_sync_disable_enable_object_delete():
 
     # Delete the fourth object version
     cmd = ['object', 'rm', '--bucket', bucket.name, '--object', obj, '--object-version', version_id_4]
-    secondary.zone.cluster.admin(cmd)
+    secondary.zone.cluster.admin(cmd + secondary.zone.zone_args())
 
     log.debug(f"Enabling bucket sync for bucket:{bucket.name}")
     enable_bucket_sync(realm.meta_master_zone(), bucket.name)
@@ -1779,13 +1779,13 @@ def test_versioned_bucket_sync_disable_enable_object_delete():
 
     # Delete all object versions
     cmd = ['object', 'rm', '--bucket', bucket.name, '--object', obj, '--object-version', version_id_1]
-    secondary.zone.cluster.admin(cmd)
+    secondary.zone.cluster.admin(cmd + secondary.zone.zone_args())
     cmd = ['object', 'rm', '--bucket', bucket.name, '--object', obj, '--object-version', version_id_2]
-    secondary.zone.cluster.admin(cmd)
+    secondary.zone.cluster.admin(cmd + secondary.zone.zone_args())
     cmd = ['object', 'rm', '--bucket', bucket.name, '--object', obj, '--object-version', version_id_3]
-    secondary.zone.cluster.admin(cmd)
+    secondary.zone.cluster.admin(cmd + secondary.zone.zone_args())
     cmd = ['object', 'rm', '--bucket', bucket.name, '--object', obj, '--object-version', version_id_4]
-    secondary.zone.cluster.admin(cmd)
+    secondary.zone.cluster.admin(cmd + secondary.zone.zone_args())
 
     log.debug(f"Enabling bucket sync for bucket:{bucket.name}")
     enable_bucket_sync(realm.meta_master_zone(), bucket.name)
@@ -2108,14 +2108,14 @@ def test_bucket_log_trim_after_delete_bucket_secondary_reshard():
     secondary.zone.cluster.admin(['bucket', 'reshard',
         '--bucket', test_bucket.name,
         '--num-shards', '13',
-        '--yes-i-really-mean-it'])
+        '--yes-i-really-mean-it'] + secondary.zone.zone_args())
 
     # Delete the objects
     for obj in ('a', 'b', 'c', 'd'):
         cmd = ['object', 'rm'] + primary.zone.zone_args()
         cmd += ['--bucket', test_bucket.name]
         cmd += ['--object', obj]
-        primary.zone.cluster.admin(cmd)
+        primary.zone.cluster.admin(cmd + primary.zone.zone_args())
 
     # delete bucket and test bilog autotrim
     primary.s3_client.delete_bucket(Bucket=test_bucket.name)