From 5dabd2be1bfc1bb2c4c48fb9f6fbae09d60da0f6 Mon Sep 17 00:00:00 2001 From: Yuval Lifshitz Date: Thu, 9 May 2024 13:11:15 +0000 Subject: [PATCH] test/rgw/notification: prevent flooding the http server in tests that require retries Signed-off-by: Yuval Lifshitz (cherry picked from commit 1f509da3068c26731eb802ff0ba6d175373be98b) --- src/test/rgw/bucket_notification/test_bn.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/test/rgw/bucket_notification/test_bn.py b/src/test/rgw/bucket_notification/test_bn.py index bb99f89f853..4fd05a56579 100644 --- a/src/test/rgw/bucket_notification/test_bn.py +++ b/src/test/rgw/bucket_notification/test_bn.py @@ -3121,7 +3121,8 @@ def test_ps_s3_persistent_topic_stats(): # create s3 topic endpoint_address = 'http://'+host+':'+str(port) - endpoint_args = 'push-endpoint='+endpoint_address+'&persistent=true' + endpoint_args = 'push-endpoint='+endpoint_address+'&persistent=true'+ \ + '&retry_sleep_duration=1' topic_conf = PSTopicS3(conn, topic_name, zonegroup, endpoint_args=endpoint_args) topic_arn = topic_conf.set_config() # create s3 notification @@ -3758,11 +3759,13 @@ def test_ps_s3_persistent_multiple_endpoints(): # create two s3 topics endpoint_address = 'http://'+host+':'+str(port) - endpoint_args = 'push-endpoint='+endpoint_address+'&persistent=true' + endpoint_args = 'push-endpoint='+endpoint_address+'&persistent=true'+ \ + '&retry_sleep_duration=1' topic_conf1 = PSTopicS3(conn, topic_name+'_1', zonegroup, endpoint_args=endpoint_args) topic_arn1 = topic_conf1.set_config() endpoint_address = 'http://kaboom:9999' - endpoint_args = 'push-endpoint='+endpoint_address+'&persistent=true' + endpoint_args = 'push-endpoint='+endpoint_address+'&persistent=true'+ \ + '&retry_sleep_duration=1' topic_conf2 = PSTopicS3(conn, topic_name+'_2', zonegroup, endpoint_args=endpoint_args) topic_arn2 = topic_conf2.set_config() @@ -4669,7 +4672,8 @@ def test_persistent_ps_s3_reload(): # create s3 topics endpoint_address = 'http://'+host+':'+str(http_port) - endpoint_args = 'push-endpoint='+endpoint_address+'&persistent=true' + endpoint_args = 'push-endpoint='+endpoint_address+'&persistent=true'+ \ + '&retry_sleep_duration=1' topic_conf1 = PSTopicS3(conn, topic_name1, zonegroup, endpoint_args=endpoint_args) topic_arn1 = topic_conf1.set_config() # 2nd topic is unused @@ -4776,7 +4780,8 @@ def test_persistent_ps_s3_data_path_v2_migration(): # create s3 topic endpoint_address = 'http://'+host+':'+str(http_port) - endpoint_args = 'push-endpoint='+endpoint_address+'&persistent=true' + endpoint_args = 'push-endpoint='+endpoint_address+'&persistent=true'+ \ + '&retry_sleep_duration=1' topic_conf = PSTopicS3(conn, topic_name, zonegroup, endpoint_args=endpoint_args) topic_arn = topic_conf.set_config() # create s3 notification -- 2.39.5