Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[v22.2.x] Backport of #6244, 6488 #7483

Merged
merged 2 commits into from
Nov 24, 2022
Merged

[v22.2.x] Backport of #6244, 6488 #7483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8423c84
tests/end_to_end: fixed enabling si in end to end test
mmaslankaprv Aug 26, 2022
8abb268
tests: fixed setting si settings in read replica tests
mmaslankaprv Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion tests/rptest/tests/end_to_end.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ def __init__(self,
self.records_consumed = []
self.last_consumed_offsets = {}
self.redpanda: Optional[RedpandaService] = None
self.si_settings = si_settings
self.topic = None
self._client = None

Expand All @@ -82,7 +83,9 @@ def start_redpanda(self,
si_settings=None,
environment=None,
install_opts: Optional[InstallOptions] = None):
self.si_settings = si_settings
if si_settings is not None:
self.si_settings = si_settings

if self.si_settings:
self.si_settings.load_context(self.logger, self.test_context)

Expand Down
39 changes: 20 additions & 19 deletions tests/rptest/tests/read_replica_e2e_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,27 +38,28 @@ class BucketUsage(NamedTuple):
class TestReadReplicaService(EndToEndTest):
log_segment_size = 1048576 # 5MB
topic_name = "panda-topic"
si_settings = SISettings(
cloud_storage_reconciliation_interval_ms=500,
cloud_storage_max_connections=5,
log_segment_size=log_segment_size,
cloud_storage_readreplica_manifest_sync_timeout_ms=500,
cloud_storage_segment_max_upload_interval_sec=5)

# Read reaplica shouldn't have it's own bucket.
# We're adding 'none' as a bucket name without creating
# an actual bucket with such name.
rr_settings = SISettings(
cloud_storage_bucket='none',
bypass_bucket_creation=True,
cloud_storage_reconciliation_interval_ms=500,
cloud_storage_max_connections=5,
log_segment_size=log_segment_size,
cloud_storage_readreplica_manifest_sync_timeout_ms=500,
cloud_storage_segment_max_upload_interval_sec=5)

def __init__(self, test_context: TestContext):
super(TestReadReplicaService, self).__init__(test_context=test_context)
super(TestReadReplicaService, self).__init__(
test_context=test_context,
si_settings=SISettings(
cloud_storage_reconciliation_interval_ms=500,
cloud_storage_max_connections=5,
log_segment_size=TestReadReplicaService.log_segment_size,
cloud_storage_readreplica_manifest_sync_timeout_ms=500,
cloud_storage_segment_max_upload_interval_sec=5))

# Read reaplica shouldn't have it's own bucket.
# We're adding 'none' as a bucket name without creating
# an actual bucket with such name.
self.rr_settings = SISettings(
cloud_storage_bucket='none',
bypass_bucket_creation=True,
cloud_storage_reconciliation_interval_ms=500,
cloud_storage_max_connections=5,
log_segment_size=TestReadReplicaService.log_segment_size,
cloud_storage_readreplica_manifest_sync_timeout_ms=500,
cloud_storage_segment_max_upload_interval_sec=5)
self.second_cluster = None

def start_second_cluster(self) -> None:
Expand Down